summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-02-28 20:24:19 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-02-28 20:24:19 -0500
commit575e8da6a971d5b6a54835ac370eb57eacc76db4 (patch)
treecfe430adada4d079ca2227fa454f4ed88c4eb511 /data/maps
parent948b695ad436ade56858d76c3cd0d836910936ff (diff)
Document Seven Island scripts
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/SevenIsland/map.json6
-rw-r--r--data/maps/SevenIsland/scripts.inc12
-rw-r--r--data/maps/SevenIsland/text.inc6
-rw-r--r--data/maps/SevenIsland_Harbor/map.json2
-rw-r--r--data/maps/SevenIsland_Harbor/scripts.inc2
-rw-r--r--data/maps/SevenIsland_House_Room1/map.json4
-rw-r--r--data/maps/SevenIsland_House_Room1/scripts.inc138
-rw-r--r--data/maps/SevenIsland_House_Room1/text.inc31
-rw-r--r--data/maps/SevenIsland_House_Room2/scripts.inc28
-rw-r--r--data/maps/SevenIsland_Mart/map.json8
-rw-r--r--data/maps/SevenIsland_Mart/scripts.inc18
-rw-r--r--data/maps/SevenIsland_Mart/text.inc6
-rw-r--r--data/maps/SevenIsland_PokemonCenter_1F/map.json12
-rw-r--r--data/maps/SevenIsland_PokemonCenter_1F/scripts.inc14
-rw-r--r--data/maps/SevenIsland_PokemonCenter_1F/text.inc6
-rw-r--r--data/maps/SevenIsland_SevaultCanyon/map.json20
-rw-r--r--data/maps/SevenIsland_SevaultCanyon/scripts.inc4
-rw-r--r--data/maps/SevenIsland_SevaultCanyon/text.inc56
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_Entrance/map.json14
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc4
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc50
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_House/map.json4
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_House/scripts.inc36
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_House/text.inc12
-rw-r--r--data/maps/SevenIsland_TrainerTower/map.json8
-rw-r--r--data/maps/SevenIsland_TrainerTower/scripts.inc8
-rw-r--r--data/maps/SevenIsland_TrainerTower/text.inc25
27 files changed, 271 insertions, 263 deletions
diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json
index c71782405..e55ba193a 100644
--- a/data/maps/SevenIsland/map.json
+++ b/data/maps/SevenIsland/map.json
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_EventScript_167EC6",
+ "script": "SevenIsland_EventScript_OldWoman",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_EventScript_167ECF",
+ "script": "SevenIsland_EventScript_Scientist",
"flag": "0"
}
],
@@ -103,7 +103,7 @@
"x": 17,
"y": 9,
"elevation": 0,
- "script": "SevenIsland_EventScript_167EBD"
+ "script": "SevenIsland_EventScript_IslandSign"
}
]
}
diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc
index f7debbf02..649c1ea73 100644
--- a/data/maps/SevenIsland/scripts.inc
+++ b/data/maps/SevenIsland/scripts.inc
@@ -6,14 +6,14 @@ SevenIsland_OnTransition:: @ 8167EB9
setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND
end
-SevenIsland_EventScript_167EBD:: @ 8167EBD
- msgbox gUnknown_8183046, MSGBOX_SIGN
+SevenIsland_EventScript_IslandSign:: @ 8167EBD
+ msgbox SevenIsland_Text_IslandSign, MSGBOX_SIGN
end
-SevenIsland_EventScript_167EC6:: @ 8167EC6
- msgbox gUnknown_818306C, MSGBOX_NPC
+SevenIsland_EventScript_OldWoman:: @ 8167EC6
+ msgbox SevenIsland_Text_IslandsMadeInSevenDays, MSGBOX_NPC
end
-SevenIsland_EventScript_167ECF:: @ 8167ECF
- msgbox gUnknown_8183143, MSGBOX_NPC
+SevenIsland_EventScript_Scientist:: @ 8167ECF
+ msgbox SevenIsland_Text_IslandVirtuallyUntouched, MSGBOX_NPC
end
diff --git a/data/maps/SevenIsland/text.inc b/data/maps/SevenIsland/text.inc
index 995752422..8b0e98818 100644
--- a/data/maps/SevenIsland/text.inc
+++ b/data/maps/SevenIsland/text.inc
@@ -17,11 +17,11 @@ Text_SwordsDanceTaught:: @ 818300D
.string "If only we could keep getting\n"
.string "stronger and stronger, eh?$"
-gUnknown_8183046:: @ 8183046
+SevenIsland_Text_IslandSign:: @ 8183046
.string "SEVEN ISLAND\n"
.string "Quest Island of Infinity$"
-gUnknown_818306C:: @ 818306C
+SevenIsland_Text_IslandsMadeInSevenDays:: @ 818306C
.string "These islands are called the SEVII\n"
.string "ISLANDS because there are seven.\p"
.string "…Or at least that's what the young\n"
@@ -30,7 +30,7 @@ gUnknown_818306C:: @ 818306C
.string "named because they are said to\l"
.string "have been made in seven days.$"
-gUnknown_8183143:: @ 8183143
+SevenIsland_Text_IslandVirtuallyUntouched:: @ 8183143
.string "This island has been left virtually\n"
.string "untouched in its natural state.\p"
.string "It could be a little difficult to\n"
diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json
index 5c1a8726a..61f41a9f3 100644
--- a/data/maps/SevenIsland_Harbor/map.json
+++ b/data/maps/SevenIsland_Harbor/map.json
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_Harbor_EventScript_170BE5",
+ "script": "SevenIsland_Harbor_EventScript_Sailor",
"flag": "0"
}
],
diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc
index f042ca668..fb51c905c 100644
--- a/data/maps/SevenIsland_Harbor/scripts.inc
+++ b/data/maps/SevenIsland_Harbor/scripts.inc
@@ -1,7 +1,7 @@
SevenIsland_Harbor_MapScripts:: @ 8170BE4
.byte 0
-SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5
+SevenIsland_Harbor_EventScript_Sailor:: @ 8170BE5
lock
faceplayer
message Text_WhereDoYouWantToSail
diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json
index 052d7fa31..b2f5611b1 100644
--- a/data/maps/SevenIsland_House_Room1/map.json
+++ b/data/maps/SevenIsland_House_Room1/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_House_Room1_EventScript_170958",
+ "script": "SevenIsland_House_Room1_EventScript_OldWoman",
"flag": "0"
}
],
@@ -52,7 +52,7 @@
"x": 4,
"y": 1,
"elevation": 0,
- "script": "SevenIsland_House_Room1_EventScript_170A75"
+ "script": "SevenIsland_House_Room1_EventScript_Box"
}
]
}
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc
index 8875211f8..63e8a7250 100644
--- a/data/maps/SevenIsland_House_Room1/scripts.inc
+++ b/data/maps/SevenIsland_House_Room1/scripts.inc
@@ -1,3 +1,7 @@
+.equ LOCALID_OLD_WOMAN, 1
+
+.equ TRAINER_VISITING, VAR_TEMP_1
+
SevenIsland_House_Room1_MapScripts:: @ 817088A
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room1_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room1_OnFrame
@@ -6,178 +10,178 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A
SevenIsland_House_Room1_OnTransition:: @ 8170895
special ValidateEReaderTrainer
compare VAR_RESULT, 0
- call_if_eq EventScript_1708AF
+ call_if_eq SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout
compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0
- call_if_ne EventScript_1708C3
+ call_if_ne SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor
end
-EventScript_1708AF:: @ 81708AF
- setvar VAR_TEMP_1, 1
- setobjectxyperm 1, 4, 2
- setobjectmovementtype 1, 8
+SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout:: @ 81708AF
+ setvar TRAINER_VISITING, TRUE
+ setobjectxyperm LOCALID_OLD_WOMAN, 4, 2
+ setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN
setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN
return
-EventScript_1708C3:: @ 81708C3
- setobjectxyperm 1, 3, 2
- setobjectmovementtype 1, 10
+SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor:: @ 81708C3
+ setobjectxyperm LOCALID_OLD_WOMAN, 3, 2
+ setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_RIGHT
return
SevenIsland_House_Room1_OnFrame:: @ 81708CF
- map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, EventScript_1708E9
- map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, EventScript_1708E9
- map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, EventScript_1708E9
+ map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle
+ map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle
+ map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle
.2byte 0
-EventScript_1708E9:: @ 1708E9
+SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: @ 1708E9
lockall
textcolor 1
- applymovement OBJ_EVENT_ID_PLAYER, Movement_170953
+ applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom
waitmovement 0
- applymovement 1, Movement_170955
+ applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer
waitmovement 0
- moveobjectoffscreen 1
+ moveobjectoffscreen LOCALID_OLD_WOMAN
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
- call_if_eq EventScript_170938
+ call_if_eq SevenIsland_House_Room1_EventScript_BattleWonComment
compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
- call_if_eq EventScript_170941
+ call_if_eq SevenIsland_House_Room1_EventScript_BattleLostComment
compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3
- call_if_eq EventScript_17094A
+ call_if_eq SevenIsland_House_Room1_EventScript_BattleTiedComment
special LoadPlayerParty
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0
releaseall
end
-EventScript_170938:: @ 8170938
- msgbox gUnknown_81A088C
+SevenIsland_House_Room1_EventScript_BattleWonComment:: @ 8170938
+ msgbox SevenIsland_House_Room1_Text_AstoundingBattle
return
-EventScript_170941:: @ 8170941
- msgbox gUnknown_81A0971
+SevenIsland_House_Room1_EventScript_BattleLostComment:: @ 8170941
+ msgbox SevenIsland_House_Room1_Text_FeelYourDisappointment
return
-EventScript_17094A:: @ 817094A
- msgbox gUnknown_81A0807
+SevenIsland_House_Room1_EventScript_BattleTiedComment:: @ 817094A
+ msgbox SevenIsland_House_Room1_Text_DrawWasIt
return
-Movement_170953:: @ 8170953
+SevenIsland_House_Room1_Movement_PlayerReEnterRoom:: @ 8170953
walk_down
step_end
-Movement_170955:: @ 8170955
+SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer:: @ 8170955
walk_right
walk_in_place_fastest_down
step_end
-SevenIsland_House_Room1_EventScript_170958:: @ 8170958
+SevenIsland_House_Room1_EventScript_OldWoman:: @ 8170958
lock
faceplayer
special ValidateEReaderTrainer
compare VAR_RESULT, 1
- call_if_eq EventScript_17097D
- compare VAR_TEMP_1, 1
- goto_if_eq EventScript_170987
- msgbox gUnknown_81A049B
+ call_if_eq SevenIsland_House_Room1_EventScript_InvalidVisitingTrainer
+ compare TRAINER_VISITING, TRUE
+ goto_if_eq SevenIsland_House_Room1_EventScript_TrainerVisiting
+ msgbox SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles
release
end
-EventScript_17097D:: @ 817097D
- msgbox gUnknown_81A049B
+SevenIsland_House_Room1_EventScript_InvalidVisitingTrainer:: @ 817097D
+ msgbox SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles
release
end
-EventScript_170987:: @ 8170987
+SevenIsland_House_Room1_EventScript_TrainerVisiting:: @ 8170987
special SavePlayerParty
- special Special_BufferEReaderTrainerName5
- msgbox gUnknown_81A0598, MSGBOX_YESNO
+ special BufferEReaderTrainerName
+ msgbox SevenIsland_House_Room1_Text_ChallengeVisitingTrainer, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq EventScript_170A11
- call EventScript_170A1E
+ goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle
+ call SevenIsland_House_Room1_EventScript_ChooseParty
compare VAR_RESULT, 0
- goto_if_eq EventScript_170A11
- msgbox gUnknown_81A0788, MSGBOX_YESNO
+ goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle
+ msgbox SevenIsland_House_Room1_Text_SaveProgressBeforeBattle, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq EventScript_170A11
+ goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle
special LoadPlayerParty
call EventScript_AskSaveGame
compare VAR_RESULT, 0
- goto_if_eq EventScript_170A11
+ goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle
special SavePlayerParty
special ReducePlayerPartyToThree
- msgbox gUnknown_81A07C4
+ msgbox SevenIsland_House_Room1_Text_DontHoldAnythingBack
closemessage
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_170A2D
+ call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_170A3F
+ call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomEast
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_170A51
+ call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomWest
warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1
waitstate
release
end
-EventScript_170A11:: @ 8170A11
+SevenIsland_House_Room1_EventScript_DeclineBattle:: @ 8170A11
special LoadPlayerParty
- msgbox gUnknown_81A064E
+ msgbox SevenIsland_House_Room1_Text_OhYouWontBattle
release
end
-EventScript_170A1E:: @ 8170A1E
- msgbox gUnknown_81A06AB
+SevenIsland_House_Room1_EventScript_ChooseParty:: @ 8170A1E
+ msgbox SevenIsland_House_Room1_Text_LimitThreeMonsPerSide
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
return
-EventScript_170A2D:: @ 8170A2D
- applymovement VAR_LAST_TALKED, Movement_170A6F
- applymovement OBJ_EVENT_ID_PLAYER, Movement_170A63
+SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth:: @ 8170A2D
+ applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft
+ applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth
waitmovement 0
return
-EventScript_170A3F:: @ 8170A3F
- applymovement VAR_LAST_TALKED, Movement_170A72
- applymovement OBJ_EVENT_ID_PLAYER, Movement_170A67
+SevenIsland_House_Room1_EventScript_EnterBattleRoomEast:: @ 8170A3F
+ applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight
+ applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast
waitmovement 0
return
-EventScript_170A51:: @ 8170A51
- applymovement VAR_LAST_TALKED, Movement_170A6F
- applymovement OBJ_EVENT_ID_PLAYER, Movement_170A6B
+SevenIsland_House_Room1_EventScript_EnterBattleRoomWest:: @ 8170A51
+ applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft
+ applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest
waitmovement 0
return
-Movement_170A63:: @ 8170A63
+SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth:: @ 8170A63
delay_16
walk_up
walk_up
step_end
-Movement_170A67:: @ 8170A67
+SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast:: @ 8170A67
delay_16
walk_right
walk_up
step_end
-Movement_170A6B:: @ 8170A6B
+SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest:: @ 8170A6B
delay_16
walk_left
walk_up
step_end
-Movement_170A6F:: @ 8170A6F
+SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft:: @ 8170A6F
walk_left
walk_in_place_fastest_right
step_end
-Movement_170A72:: @ 8170A72
+SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight:: @ 8170A72
walk_right
walk_in_place_fastest_left
step_end
-SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75
- msgbox gUnknown_81A0567, MSGBOX_SIGN
+SevenIsland_House_Room1_EventScript_Box:: @ 8170A75
+ msgbox SevenIsland_House_Room1_Text_SlightBreezeAroundBox, MSGBOX_SIGN
end
diff --git a/data/maps/SevenIsland_House_Room1/text.inc b/data/maps/SevenIsland_House_Room1/text.inc
index 2e6c7f2f8..d8ddad04e 100644
--- a/data/maps/SevenIsland_House_Room1/text.inc
+++ b/data/maps/SevenIsland_House_Room1/text.inc
@@ -1,4 +1,4 @@
-gUnknown_81A049B:: @ 81A049B
+SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles:: @ 81A049B
.string "I may not look like much now,\n"
.string "but when I was younger…\p"
.string "I flew everywhere, challenging\n"
@@ -7,11 +7,11 @@ gUnknown_81A049B:: @ 81A049B
.string "is reminiscing about the past while\l"
.string "watching battles.$"
-gUnknown_81A0567:: @ 81A0567
+SevenIsland_House_Room1_Text_SlightBreezeAroundBox:: @ 81A0567
.string "There is a slight breeze blowing\n"
.string "around the box.$"
-gUnknown_81A0598:: @ 81A0598
+SevenIsland_House_Room1_Text_ChallengeVisitingTrainer:: @ 81A0598
.string "Ah!\n"
.string "Welcome, my friend!\p"
.string "Let me tell you something. There's\n"
@@ -21,7 +21,7 @@ gUnknown_81A0598:: @ 81A0598
.string "Tell me, you did come to challenge\n"
.string "{STR_VAR_1}, am I right?$"
-gUnknown_81A064E:: @ 81A064E
+SevenIsland_House_Room1_Text_OhYouWontBattle:: @ 81A064E
.string "Oh…\n"
.string "You won't battle…\p"
.string "I see, I see.\n"
@@ -29,7 +29,7 @@ gUnknown_81A064E:: @ 81A064E
.string "Well, perhaps if you change your\n"
.string "mind, do come back.$"
-gUnknown_81A06AB:: @ 81A06AB
+SevenIsland_House_Room1_Text_LimitThreeMonsPerSide:: @ 81A06AB
.string "Ah!\n"
.string "You will battle for me?\p"
.string "It was worth my time moving the\n"
@@ -41,31 +41,33 @@ gUnknown_81A06AB:: @ 81A06AB
.string "Can I get you to limit it to\n"
.string "battles of three POKéMON per side?$"
-gUnknown_81A0788:: @ 81A0788
+SevenIsland_House_Room1_Text_SaveProgressBeforeBattle:: @ 81A0788
.string "Fine! Before your battle, would\n"
.string "you like to save your game?$"
-gUnknown_81A07C4:: @ 81A07C4
+SevenIsland_House_Room1_Text_DontHoldAnythingBack:: @ 81A07C4
.string "All right.\n"
.string "Don't hold anything back!$"
-Text_1A07E9:: @ 81A07E9
+@ Unused
+SevenIsland_House_Room1_Text_StrVar1_1:: @ 81A07E9
.string "{STR_VAR_1}$"
-gUnknown_81A07EC:: @ 81A07EC
+SevenIsland_House_Room2_Text_MatchEndedUpDraw:: @ 81A07EC
.string "The match ended up a draw.$"
-gUnknown_81A0807:: @ 81A0807
+SevenIsland_House_Room1_Text_DrawWasIt:: @ 81A0807
.string "A draw, was it?\p"
.string "However, let me say that it was\n"
.string "a worthy spectacle.\p"
.string "I'd say it was a wonderful battle\n"
.string "with a real sense of depth!$"
-Text_1A0889:: @ 81A0889
+@ Unused
+SevenIsland_House_Room1_Text_StrVar1_2:: @ 81A0889
.string "{STR_VAR_1}$"
-gUnknown_81A088C:: @ 81A088C
+SevenIsland_House_Room1_Text_AstoundingBattle:: @ 81A088C
.string "Bravo!\p"
.string "Bravo, indeed!\n"
.string "What an astounding battle!\p"
@@ -77,10 +79,11 @@ gUnknown_81A088C:: @ 81A088C
.string "Yes!\n"
.string "It was sheer magnificence!$"
-Text_1A096E:: @ 81A096E
+@ Unused
+SevenIsland_House_Room1_Text_StrVar1_3:: @ 81A096E
.string "{STR_VAR_1}$"
-gUnknown_81A0971:: @ 81A0971
+SevenIsland_House_Room1_Text_FeelYourDisappointment:: @ 81A0971
.string "Too bad!\n"
.string "I feel your disappointment.\p"
.string "However, that disappointment is\n"
diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc
index 8d0ef3475..311c7200f 100644
--- a/data/maps/SevenIsland_House_Room2/scripts.inc
+++ b/data/maps/SevenIsland_House_Room2/scripts.inc
@@ -8,14 +8,14 @@ SevenIsland_House_Room2_OnTransition:: @ 8170A89
end
SevenIsland_House_Room2_OnFrame:: @ 8170A8D
- map_script_2 VAR_TEMP_1, 0, EventScript_170A97
+ map_script_2 VAR_TEMP_1, 0, SevenIsland_House_Room2_EventScript_BattleVisitingTrainer
.2byte 0
-EventScript_170A97:: @ 8170A97
+SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: @ 8170A97
lockall
- applymovement OBJ_EVENT_ID_PLAYER, Movement_170B22
+ applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerEnterRoom
waitmovement 0
- special PrintEReaderTrainerGreeting
+ special BufferEReaderTrainerGreeting
msgbox gStringVar4
closemessage
setvar VAR_0x8004, 2
@@ -23,14 +23,14 @@ EventScript_170A97:: @ 8170A97
special StartSpecialBattle
waitstate
compare VAR_RESULT, 3
- call_if_eq EventScript_170AFE
+ call_if_eq SevenIsland_House_Room2_EventScript_BattleTie
compare VAR_RESULT, 1
- call_if_eq EventScript_170B0C
+ call_if_eq SevenIsland_House_Room2_EventScript_BattleWon
compare VAR_RESULT, 2
- call_if_eq EventScript_170B17
+ call_if_eq SevenIsland_House_Room2_EventScript_BattleLost
closemessage
special HealPlayerParty
- applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28
+ applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerExitRoom
waitmovement 0
special LoadPlayerParty
setvar VAR_TEMP_1, 1
@@ -39,26 +39,26 @@ EventScript_170A97:: @ 8170A97
releaseall
end
-EventScript_170AFE:: @ 8170AFE
+SevenIsland_House_Room2_EventScript_BattleTie:: @ 8170AFE
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3
- msgbox gUnknown_81A07EC
+ msgbox SevenIsland_House_Room2_Text_MatchEndedUpDraw
return
-EventScript_170B0C:: @ 8170B0C
+SevenIsland_House_Room2_EventScript_BattleWon:: @ 8170B0C
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
special Special_ShowStringVar4AsFieldMessage
waitmessage
waitbuttonpress
return
-EventScript_170B17:: @ 8170B17
+SevenIsland_House_Room2_EventScript_BattleLost:: @ 8170B17
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
special Special_ShowStringVar4AsFieldMessage
waitmessage
waitbuttonpress
return
-Movement_170B22:: @ 8170B22
+SevenIsland_House_Room2_Movement_PlayerEnterRoom:: @ 8170B22
walk_down
walk_down
walk_down
@@ -66,7 +66,7 @@ Movement_170B22:: @ 8170B22
walk_right
step_end
-Movement_170B28:: @ 8170B28
+SevenIsland_House_Room2_Movement_PlayerExitRoom:: @ 8170B28
walk_left
walk_left
walk_up
diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json
index 16ff19533..a3ba4eb37 100644
--- a/data/maps/SevenIsland_Mart/map.json
+++ b/data/maps/SevenIsland_Mart/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_Mart_EventScript_170B31",
+ "script": "SevenIsland_Mart_EventScript_Clerk",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_Mart_EventScript_170B6E",
+ "script": "SevenIsland_Mart_EventScript_Lass",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_Mart_EventScript_170B80",
+ "script": "SevenIsland_Mart_EventScript_Fisher",
"flag": "0"
},
{
@@ -64,7 +64,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_Mart_EventScript_170B77",
+ "script": "SevenIsland_Mart_EventScript_Hiker",
"flag": "0"
}
],
diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc
index 2757fba07..a816cb8b4 100644
--- a/data/maps/SevenIsland_Mart/scripts.inc
+++ b/data/maps/SevenIsland_Mart/scripts.inc
@@ -1,19 +1,19 @@
SevenIsland_Mart_MapScripts:: @ 8170B30
.byte 0
-SevenIsland_Mart_EventScript_170B31:: @ 8170B31
+SevenIsland_Mart_EventScript_Clerk:: @ 8170B31
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
waitmessage
- pokemart Items_170B58
+ pokemart SevenIsland_Mart_Items
msgbox Text_PleaseComeAgain
release
end
.align 2
-Items_170B58:: @ 8170B58
+SevenIsland_Mart_Items:: @ 8170B58
.2byte ITEM_ULTRA_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_FULL_RESTORE
@@ -27,14 +27,14 @@ Items_170B58:: @ 8170B58
release
end
-SevenIsland_Mart_EventScript_170B6E:: @ 8170B6E
- msgbox gUnknown_81A0A4F, MSGBOX_NPC
+SevenIsland_Mart_EventScript_Lass:: @ 8170B6E
+ msgbox SevenIsland_Mart_Text_MonHavePersonalitiesOfTheirOwn, MSGBOX_NPC
end
-SevenIsland_Mart_EventScript_170B77:: @ 8170B77
- msgbox gUnknown_81A0ACC, MSGBOX_NPC
+SevenIsland_Mart_EventScript_Hiker:: @ 8170B77
+ msgbox SevenIsland_Mart_Text_PreparationsCompleteForRuins, MSGBOX_NPC
end
-SevenIsland_Mart_EventScript_170B80:: @ 8170B80
- msgbox gUnknown_81A0B09, MSGBOX_NPC
+SevenIsland_Mart_EventScript_Fisher:: @ 8170B80
+ msgbox SevenIsland_Mart_Text_NeedToFishOnSevenIsland, MSGBOX_NPC
end
diff --git a/data/maps/SevenIsland_Mart/text.inc b/data/maps/SevenIsland_Mart/text.inc
index 9716c2427..ab364c889 100644
--- a/data/maps/SevenIsland_Mart/text.inc
+++ b/data/maps/SevenIsland_Mart/text.inc
@@ -1,14 +1,14 @@
-gUnknown_81A0A4F:: @ 81A0A4F
+SevenIsland_Mart_Text_MonHavePersonalitiesOfTheirOwn:: @ 81A0A4F
.string "POKéMON have personalities of their\n"
.string "own, just like people.\p"
.string "My PIKACHU has a HASTY nature,\n"
.string "so it grew to be a speedy POKéMON.$"
-gUnknown_81A0ACC:: @ 81A0ACC
+SevenIsland_Mart_Text_PreparationsCompleteForRuins:: @ 81A0ACC
.string "Okay, preparations are complete\n"
.string "for me to explore the RUINS.$"
-gUnknown_81A0B09:: @ 81A0B09
+SevenIsland_Mart_Text_NeedToFishOnSevenIsland:: @ 81A0B09
.string "I need to fish on SEVEN ISLAND.\p"
.string "That will complete my fishing tour\n"
.string "of the SEVII ISLANDS.\p"
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json
index 522d68473..40f31f2b8 100644
--- a/data/maps/SevenIsland_PokemonCenter_1F/map.json
+++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_PokemonCenter_1F_EventScript_170B98",
+ "script": "SevenIsland_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_PokemonCenter_1F_EventScript_170BA1",
+ "script": "SevenIsland_PokemonCenter_1F_EventScript_OldMan",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_PokemonCenter_1F_EventScript_170BAA",
+ "script": "SevenIsland_PokemonCenter_1F_EventScript_Sailor",
"flag": "0"
},
{
@@ -64,7 +64,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_PokemonCenter_1F_EventScript_170BB3",
+ "script": "SevenIsland_PokemonCenter_1F_EventScript_Beauty",
"flag": "0"
},
{
@@ -77,7 +77,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4",
+ "script": "SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
@@ -90,7 +90,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4",
+ "script": "SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
index 459806f32..447d9d1e8 100644
--- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
@@ -7,21 +7,21 @@ SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94
setrespawn SPAWN_SEVEN_ISLAND
end
-SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98
+SevenIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8170B98
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
-SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1
- msgbox gUnknown_81A0B98, MSGBOX_NPC
+SevenIsland_PokemonCenter_1F_EventScript_OldMan:: @ 8170BA1
+ msgbox SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections, MSGBOX_NPC
end
-SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA
- msgbox gUnknown_81A0C1F, MSGBOX_NPC
+SevenIsland_PokemonCenter_1F_EventScript_Sailor:: @ 8170BAA
+ msgbox SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere, MSGBOX_NPC
end
-SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3
- msgbox gUnknown_81A0CA5, MSGBOX_NPC
+SevenIsland_PokemonCenter_1F_EventScript_Beauty:: @ 8170BB3
+ msgbox SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower, MSGBOX_NPC
end
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/text.inc b/data/maps/SevenIsland_PokemonCenter_1F/text.inc
index 44e325ca0..feacb5b4d 100644
--- a/data/maps/SevenIsland_PokemonCenter_1F/text.inc
+++ b/data/maps/SevenIsland_PokemonCenter_1F/text.inc
@@ -1,11 +1,11 @@
-gUnknown_81A0B98:: @ 81A0B98
+SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections:: @ 81A0B98
.string "On this island, different events\n"
.string "occur depending on connections.\p"
.string "What are those connections?\p"
.string "They are for you to discover on\n"
.string "your own.$"
-gUnknown_81A0C1F:: @ 81A0C1F
+SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere:: @ 81A0C1F
.string "Did you ride a SEAGALLOP ferry\n"
.string "to get here?\p"
.string "There are at least ten of those\n"
@@ -13,7 +13,7 @@ gUnknown_81A0C1F:: @ 81A0C1F
.string "I don't know where they all go,\n"
.string "though.$"
-gUnknown_81A0CA5:: @ 81A0CA5
+SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower:: @ 81A0CA5
.string "If you're confident, you should\n"
.string "check out TRAINER TOWER.$"
diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json
index b9c1bc77e..a3d196ac3 100644
--- a/data/maps/SevenIsland_SevaultCanyon/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "SevenIsland_SevaultCanyon_EventScript_1ACA4D",
+ "script": "SevenIsland_SevaultCanyon_EventScript_Cyndy",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "SevenIsland_SevaultCanyon_EventScript_1ACA8B",
+ "script": "SevenIsland_SevaultCanyon_EventScript_Evan",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "SevenIsland_SevaultCanyon_EventScript_1ACAC9",
+ "script": "SevenIsland_SevaultCanyon_EventScript_Jackson",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "SevenIsland_SevaultCanyon_EventScript_1ACB07",
+ "script": "SevenIsland_SevaultCanyon_EventScript_Katelyn",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SevenIsland_SevaultCanyon_EventScript_1ACB45",
+ "script": "SevenIsland_SevaultCanyon_EventScript_Leroy",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SevenIsland_SevaultCanyon_EventScript_1ACB83",
+ "script": "SevenIsland_SevaultCanyon_EventScript_Michelle",
"flag": "0"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SevenIsland_SevaultCanyon_EventScript_1ACBC1",
+ "script": "SevenIsland_SevaultCanyon_EventScript_Lex",
"flag": "0"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SevenIsland_SevaultCanyon_EventScript_1ACC07",
+ "script": "SevenIsland_SevaultCanyon_EventScript_Nya",
"flag": "0"
},
{
@@ -283,7 +283,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_SevaultCanyon_EventScript_1ACF95",
+ "script": "SevenIsland_SevaultCanyon_EventScript_BlackBelt",
"flag": "0"
}
],
@@ -320,7 +320,7 @@
"x": 16,
"y": 71,
"elevation": 0,
- "script": "SevenIsland_SevaultCanyon_EventScript_168BFE"
+ "script": "SevenIsland_SevaultCanyon_EventScript_RouteSign"
}
]
}
diff --git a/data/maps/SevenIsland_SevaultCanyon/scripts.inc b/data/maps/SevenIsland_SevaultCanyon/scripts.inc
index 8c906d3f2..0d5b46b87 100644
--- a/data/maps/SevenIsland_SevaultCanyon/scripts.inc
+++ b/data/maps/SevenIsland_SevaultCanyon/scripts.inc
@@ -1,6 +1,6 @@
SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD
.byte 0
-SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE
- msgbox gUnknown_818CF2B, MSGBOX_SIGN
+SevenIsland_SevaultCanyon_EventScript_RouteSign:: @ 8168BFE
+ msgbox SevenIsland_SevaultCanyon_Text_RouteSign, MSGBOX_SIGN
end
diff --git a/data/maps/SevenIsland_SevaultCanyon/text.inc b/data/maps/SevenIsland_SevaultCanyon/text.inc
index 21c87dbc0..4e3dda9d1 100644
--- a/data/maps/SevenIsland_SevaultCanyon/text.inc
+++ b/data/maps/SevenIsland_SevaultCanyon/text.inc
@@ -1,126 +1,126 @@
-Text_18C887:: @ 818C887
+SevenIsland_SevaultCanyon_Text_CyndyIntro:: @ 818C887
.string "My conditioning's in top form!$"
-Text_18C8A6:: @ 818C8A6
+SevenIsland_SevaultCanyon_Text_CyndyDefeat:: @ 818C8A6
.string "Huh?\n"
.string "Something's not right…$"
-Text_18C8C2:: @ 818C8C2
+SevenIsland_SevaultCanyon_Text_CyndyPostBattle:: @ 818C8C2
.string "The way I am now, I may have to\n"
.string "hold off on TRAINER TOWER…$"
-Text_18C8FD:: @ 818C8FD
+SevenIsland_SevaultCanyon_Text_EvanIntro:: @ 818C8FD
.string "It doesn't matter if you happen to\n"
.string "have the strongest POKéMON…\p"
.string "It doesn't mean a thing if you don't\n"
.string "know how to use them properly!$"
-Text_18C980:: @ 818C980
+SevenIsland_SevaultCanyon_Text_EvanDefeat:: @ 818C980
.string "You're a master at this.$"
-Text_18C999:: @ 818C999
+SevenIsland_SevaultCanyon_Text_EvanPostBattle:: @ 818C999
.string "You see them every so often,\n"
.string "TRAINERS with awesome POKéMON\l"
.string "who have no idea what to do.\p"
.string "Before training POKéMON, TRAINERS\n"
.string "themselves need to grow up.$"
-Text_18CA2F:: @ 818CA2F
+SevenIsland_SevaultCanyon_Text_JacksonIntro:: @ 818CA2F
.string "I work to protect the environment.\n"
.string "In turn, nature protects me!$"
-Text_18CA6F:: @ 818CA6F
+SevenIsland_SevaultCanyon_Text_JacksonDefeat:: @ 818CA6F
.string "Whoa! You're tough!\n"
.string "How about protecting me?$"
-Text_18CA9C:: @ 818CA9C
+SevenIsland_SevaultCanyon_Text_JacksonPostBattle:: @ 818CA9C
.string "From far out among the stars, our\n"
.string "planet is just a drop of water.\p"
.string "But we want to protect that drop\n"
.string "of water for everyone.$"
-Text_18CB16:: @ 818CB16
+SevenIsland_SevaultCanyon_Text_KatelynIntro:: @ 818CB16
.string "Those shoes you have are pretty\n"
.string "snazzy.$"
-Text_18CB3E:: @ 818CB3E
+SevenIsland_SevaultCanyon_Text_KatelynDefeat:: @ 818CB3E
.string "You're hot stuff in spite of your\n"
.string "cute looks.$"
-Text_18CB6C:: @ 818CB6C
+SevenIsland_SevaultCanyon_Text_KatelynPostBattle:: @ 818CB6C
.string "Your mom bought those snazzy\n"
.string "RUNNING SHOES for you?\p"
.string "She must adore you.$"
-Text_18CBB4:: @ 818CBB4
+SevenIsland_SevaultCanyon_Text_LeroyIntro:: @ 818CBB4
.string "You look strong.\n"
.string "Let me battle you, please!$"
-Text_18CBE0:: @ 818CBE0
+SevenIsland_SevaultCanyon_Text_LeroyDefeat:: @ 818CBE0
.string "I knew it!\n"
.string "You're as tough as I thought!$"
-Text_18CC09:: @ 818CC09
+SevenIsland_SevaultCanyon_Text_LeroyPostBattle:: @ 818CC09
.string "The way you battle has given me\n"
.string "a lot of useful data.\p"
.string "Thanks so much!$"
-Text_18CC4F:: @ 818CC4F
+SevenIsland_SevaultCanyon_Text_MichelleIntro:: @ 818CC4F
.string "I was given the best possible\n"
.string "education to become this strong.\p"
.string "I don't want to lose to anyone!$"
-Text_18CCAE:: @ 818CCAE
+SevenIsland_SevaultCanyon_Text_MichelleDefeat:: @ 818CCAE
.string "Thank you. I feel like I've been\n"
.string "set free by losing to you.$"
-Text_18CCEA:: @ 818CCEA
+SevenIsland_SevaultCanyon_Text_MichellePostBattle:: @ 818CCEA
.string "For some reason, I get furious\n"
.string "over the slightest thing.\p"
.string "I'll calm myself by breathing\n"
.string "deeply.$"
-Text_18CD49:: @ 818CD49
+SevenIsland_SevaultCanyon_Text_LexIntro:: @ 818CD49
.string "LEX: My darling NYA, together\n"
.string "we could win!$"
-Text_18CD75:: @ 818CD75
+SevenIsland_SevaultCanyon_Text_LexDefeat:: @ 818CD75
.string "LEX: I seem to have been too\n"
.string "careless…$"
-Text_18CD9C:: @ 818CD9C
+SevenIsland_SevaultCanyon_Text_LexPostBattle:: @ 818CD9C
.string "LEX: I think it was a good\n"
.string "experience for NYA.\p"
.string "You have my gratitude.$"
-Text_18CDE2:: @ 818CDE2
+SevenIsland_SevaultCanyon_Text_LexNotEnoughMons:: @ 818CDE2
.string "LEX: May I ask you to battle the\n"
.string "both of us at the same time?$"
-Text_18CE20:: @ 818CE20
+SevenIsland_SevaultCanyon_Text_NyaIntro:: @ 818CE20
.string "NYA: I'll do my best so I won't\n"
.string "drag down my mentor, LEX!$"
-Text_18CE5A:: @ 818CE5A
+SevenIsland_SevaultCanyon_Text_NyaDefeat:: @ 818CE5A
.string "NYA: Oh, no…\n"
.string "I'm so sorry, I…$"
-Text_18CE78:: @ 818CE78
+SevenIsland_SevaultCanyon_Text_NyaPostBattle:: @ 818CE78
.string "NYA: I think I'm going to need\n"
.string "much more seasoning and tutoring\l"
.string "under LEX…\p"
.string "…So, LEX, please, may I stay with\n"
.string "you like this?$"
-Text_18CEF4:: @ 818CEF4
+SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons:: @ 818CEF4
.string "NYA: I'm sorry, but may we battle\n"
.string "in two-on-two style?$"
-gUnknown_818CF2B:: @ 818CF2B
+SevenIsland_SevaultCanyon_Text_RouteSign:: @ 818CF2B
.string "SEVAULT CANYON\n"
.string "TANOBY RUINS AHEAD$"
-Text_18CF4D:: @ 818CF4D
+SevenIsland_SevaultCanyon_Text_BrunoTrainedWithBrawly:: @ 818CF4D
.string "Training by oneself is certainly\n"
.string "not a bad thing.\p"
.string "But it's also not bad to aim for\n"
diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
index 75c09cc6f..6939e8dfc 100644
--- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9",
+ "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Miah",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907",
+ "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Eve",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D",
+ "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Jon",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1",
+ "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Nicolas",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F",
+ "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Madeline",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993",
+ "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Mason",
"flag": "0"
},
{
@@ -137,7 +137,7 @@
"x": 14,
"y": 26,
"elevation": 0,
- "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4"
+ "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_RouteSign"
}
]
}
diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc
index 617055d66..b032d990b 100644
--- a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc
@@ -1,6 +1,6 @@
SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3
.byte 0
-SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4
- msgbox gUnknown_818C82D, MSGBOX_SIGN
+SevenIsland_SevaultCanyon_Entrance_EventScript_RouteSign:: @ 8168BF4
+ msgbox SevenIsland_SevaultCanyon_Entrance_Text_RouteSign, MSGBOX_SIGN
end
diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc
index 86ade1dbd..3ab590e41 100644
--- a/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc
@@ -1,100 +1,92 @@
-Text_18C384:: @ 818C384
- .string "トレーナータワーには\n"
- .string "いまは はいれない みたい‥$"
-
-Text_18C39E:: @ 818C39E
- .string "トレーナータワーが あいてる!\n"
- .string "さっそく はいってみよう!$"
-
-Text_18C3BC:: @ 818C3BC
+SevenIsland_SevaultCanyon_Entrance_Text_MiahIntro:: @ 818C3BC
.string "Kyahaha!\n"
.string "I'll flick you away effortlessly!$"
-Text_18C3E7:: @ 818C3E7
+SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat:: @ 818C3E7
.string "Tch!\n"
.string "Too strong for me!$"
-Text_18C3FF:: @ 818C3FF
+SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle:: @ 818C3FF
.string "What's that?\n"
.string "I don't act the way I look?\p"
.string "Heh, that's a part of my strategy!$"
-Text_18C44B:: @ 818C44B
+SevenIsland_SevaultCanyon_Entrance_Text_MasonIntro:: @ 818C44B
.string "Howdy!\n"
.string "Are you a member of my fan club?$"
-Text_18C473:: @ 818C473
+SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat:: @ 818C473
.string "Oh, so you're not a fan…\p"
.string "Well, I can change that.\n"
.string "Let me sing for you!$"
-Text_18C4BA:: @ 818C4BA
+SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle:: @ 818C4BA
.string "Lalalah…\n"
.string "My POKéMON, I send them out,\l"
.string "all the girls scream and shout!$"
-Text_18C500:: @ 818C500
+SevenIsland_SevaultCanyon_Entrance_Text_NicolasIntro:: @ 818C500
.string "This island is too spread out…\n"
.string "It's not easy patrolling the place.$"
-Text_18C543:: @ 818C543
+SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat:: @ 818C543
.string "Uh-huh…$"
-Text_18C54B:: @ 818C54B
+SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle:: @ 818C54B
.string "TRAINERS like you from cities,\n"
.string "they sure are tough.\p"
.string "You'll be headed for the TOWER,\n"
.string "won't you?$"
-Text_18C5AA:: @ 818C5AA
+SevenIsland_SevaultCanyon_Entrance_Text_MadelineIntro:: @ 818C5AA
.string "I punish people who abuse\n"
.string "POKéMON!$"
-Text_18C5CD:: @ 818C5CD
+SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat:: @ 818C5CD
.string "You don't seem to be a problem\n"
.string "TRAINER.$"
-Text_18C5F5:: @ 818C5F5
+SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle:: @ 818C5F5
.string "If you treat your POKéMON with\n"
.string "kindness, they'll understand.$"
-Text_18C632:: @ 818C632
+SevenIsland_SevaultCanyon_Entrance_Text_EveIntro:: @ 818C632
.string "EVE: I'll team up with JON and\n"
.string "battle together.$"
-Text_18C662:: @ 818C662
+SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat:: @ 818C662
.string "EVE: Me and JON, we lost.\n"
.string "Ehehe.$"
-Text_18C683:: @ 818C683
+SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle:: @ 818C683
.string "EVE: I'm going to work harder with\n"
.string "JON.$"
-Text_18C6AB:: @ 818C6AB
+SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons:: @ 818C6AB
.string "EVE: I want to team up with JON\n"
.string "when I battle you.\p"
.string "Come back with two POKéMON, okay?$"
-Text_18C700:: @ 818C700
+SevenIsland_SevaultCanyon_Entrance_Text_JonIntro:: @ 818C700
.string "JON: When I'm with EVE, it feels\n"
.string "like we could never lose.$"
-Text_18C73B:: @ 818C73B
+SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat:: @ 818C73B
.string "JON: When I'm with EVE,\n"
.string "it doesn't feel like I've lost!$"
-Text_18C773:: @ 818C773
+SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle:: @ 818C773
.string "JON: When I'm with EVE, I feel\n"
.string "giddy whether I win or lose.\p"
.string "It's magical!$"
-Text_18C7BD:: @ 818C7BD
+SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons:: @ 818C7BD
.string "JON: If it's with EVE, I'll be\n"
.string "happy to battle with you.\p"
.string "So, I'd like to make it a\n"
.string "two-on-two battle, if I may.$"
-gUnknown_818C82D:: @ 818C82D
+SevenIsland_SevaultCanyon_Entrance_Text_RouteSign:: @ 818C82D
.string "SEVAULT CANYON ENTRANCE\p"
.string "TRAINERS are asked to refrain from\n"
.string "damaging plants in the CANYON.$"
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json
index 9dd436790..bee4a1a86 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_SevaultCanyon_House_EventScript_172183",
+ "script": "SevenIsland_SevaultCanyon_House_EventScript_BaldingMan",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SevenIsland_SevaultCanyon_House_EventScript_172242",
+ "script": "SevenIsland_SevaultCanyon_House_EventScript_Chansey",
"flag": "0"
},
{
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
index 975444645..3d0bb73ea 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
@@ -1,57 +1,57 @@
SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182
.byte 0
-SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
+SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183
lock
- goto_if_set FLAG_TEMP_2, EventScript_172211
+ goto_if_set FLAG_TEMP_2, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced
playbgm MUS_P_SCHOOL, 0
- applymovement 1, Movement_172231
+ applymovement 1, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance
waitmovement 0
fadedefaultbgm
delay 30
applymovement 1, Movement_FacePlayer
waitmovement 0
- msgbox gUnknown_81A4D72
+ msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn
textcolor 3
- msgbox gUnknown_81A4DAF, MSGBOX_YESNO
+ msgbox SevenIsland_SevaultCanyon_House_Text_WouldYouLikeToDance, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq EventScript_172225
- msgbox gUnknown_81A4DD8
+ goto_if_eq SevenIsland_SevaultCanyon_House_EventScript_DeclineDance
+ msgbox SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance
closemessage
call EventScript_1A6675
compare VAR_FACING, DIR_SOUTH
- call_if_ne EventScript_172206
+ call_if_ne SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown
delay 30
playbgm MUS_P_SCHOOL, 0
- applymovement OBJ_EVENT_ID_PLAYER, Movement_172231
+ applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance
waitmovement 0
fadedefaultbgm
delay 30
call EventScript_OutOfCenterPartyHeal
- msgbox gUnknown_81A4DF5
+ msgbox SevenIsland_SevaultCanyon_House_Text_YoureAllChipperNow
setflag FLAG_TEMP_2
release
end
-EventScript_172206:: @ 8172206
+SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown:: @ 8172206
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
-EventScript_172211:: @ 8172211
+SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced:: @ 8172211
applymovement 1, Movement_FacePlayer
waitmovement 0
- msgbox gUnknown_81A4D72
+ msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn
release
end
-EventScript_172225:: @ 8172225
+SevenIsland_SevaultCanyon_House_EventScript_DeclineDance:: @ 8172225
textcolor 0
- msgbox gUnknown_81A4DC8
+ msgbox SevenIsland_SevaultCanyon_House_Text_ComeOnDance
release
end
-Movement_172231:: @ 8172231
+SevenIsland_SevaultCanyon_House_Movement_ChanseyDance:: @ 8172231
walk_in_place_down
delay_16
walk_in_place_down
@@ -70,12 +70,12 @@ Movement_172231:: @ 8172231
delay_4
step_end
-SevenIsland_SevaultCanyon_House_EventScript_172242:: @ 8172242
+SevenIsland_SevaultCanyon_House_EventScript_Chansey:: @ 8172242
lock
faceplayer
waitse
playmoncry SPECIES_CHANSEY, 0
- msgbox gUnknown_81A4E26
+ msgbox SevenIsland_SevaultCanyon_House_Text_Chansey
waitmoncry
release
end
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/text.inc b/data/maps/SevenIsland_SevaultCanyon_House/text.inc
index 0602136b9..478107036 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/text.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_House/text.inc
@@ -1,22 +1,22 @@
-gUnknown_81A4D72:: @ 81A4D72
+SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn:: @ 81A4D72
.string "Dance, dance!\n"
.string "CHANSEY Dance!\p"
.string "You join in, too!\n"
.string "Dance, dance!$"
-gUnknown_81A4DAF:: @ 81A4DAF
+SevenIsland_SevaultCanyon_House_Text_WouldYouLikeToDance:: @ 81A4DAF
.string "Would you like to dance?$"
-gUnknown_81A4DC8:: @ 81A4DC8
+SevenIsland_SevaultCanyon_House_Text_ComeOnDance:: @ 81A4DC8
.string "Come on, dance!$"
-gUnknown_81A4DD8:: @ 81A4DD8
+SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance:: @ 81A4DD8
.string "{PLAYER} danced the CHANSEY Dance!$"
-gUnknown_81A4DF5:: @ 81A4DF5
+SevenIsland_SevaultCanyon_House_Text_YoureAllChipperNow:: @ 81A4DF5
.string "Ahahahaha!\p"
.string "There, you're all chipper now!\n"
.string "Lucky!$"
-gUnknown_81A4E26:: @ 81A4E26
+SevenIsland_SevaultCanyon_House_Text_Chansey:: @ 81A4E26
.string "CHANSEY: Chansi! Chansi!$"
diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json
index 29095ad7e..f7a3a7402 100644
--- a/data/maps/SevenIsland_TrainerTower/map.json
+++ b/data/maps/SevenIsland_TrainerTower/map.json
@@ -31,7 +31,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SevenIsland_TrainerTower_EventScript_1AC84D",
+ "script": "SevenIsland_TrainerTower_EventScript_Dario",
"flag": "0"
},
{
@@ -44,7 +44,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SevenIsland_TrainerTower_EventScript_1AC88B",
+ "script": "SevenIsland_TrainerTower_EventScript_Rodette",
"flag": "0"
}
],
@@ -94,14 +94,14 @@
"x": 56,
"y": 8,
"elevation": 0,
- "script": "SevenIsland_TrainerTower_EventScript_168BE1"
+ "script": "SevenIsland_TrainerTower_EventScript_TrainerTowerSign"
},
{
"type": "bg_event_type_0",
"x": 50,
"y": 30,
"elevation": 0,
- "script": "SevenIsland_TrainerTower_EventScript_168BEA"
+ "script": "SevenIsland_TrainerTower_EventScript_TrainerTowerAheadSign"
}
]
}
diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc
index 56716493a..6e9daea9f 100644
--- a/data/maps/SevenIsland_TrainerTower/scripts.inc
+++ b/data/maps/SevenIsland_TrainerTower/scripts.inc
@@ -6,10 +6,10 @@ SevenIsland_TrainerTower_OnTransition:: @ 8168BDB
setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
end
-SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1
- msgbox gUnknown_818C338, MSGBOX_SIGN
+SevenIsland_TrainerTower_EventScript_TrainerTowerSign:: @ 8168BE1
+ msgbox SevenIsland_TrainerTower_Text_TrainerTowerSign, MSGBOX_SIGN
end
-SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA
- msgbox gUnknown_818C370, MSGBOX_SIGN
+SevenIsland_TrainerTower_EventScript_TrainerTowerAheadSign:: @ 8168BEA
+ msgbox SevenIsland_TrainerTower_Text_TrainerTowerAhead, MSGBOX_SIGN
end
diff --git a/data/maps/SevenIsland_TrainerTower/text.inc b/data/maps/SevenIsland_TrainerTower/text.inc
index d0d8554b1..92fa81605 100644
--- a/data/maps/SevenIsland_TrainerTower/text.inc
+++ b/data/maps/SevenIsland_TrainerTower/text.inc
@@ -1,32 +1,41 @@
-Text_18C1ED:: @ 818C1ED
+SevenIsland_TrainerTower_Text_DarioIntro:: @ 818C1ED
.string "I sensed your approach.$"
-Text_18C205:: @ 818C205
+SevenIsland_TrainerTower_Text_DarioDefeat:: @ 818C205
.string "Give up…$"
-Text_18C20E:: @ 818C20E
+SevenIsland_TrainerTower_Text_DarioPostBattle:: @ 818C20E
.string "In your future, I sense that you\n"
.string "will meet many others.\p"
.string "I think you will be linked to each\n"
.string "other by a strange power.$"
-Text_18C283:: @ 818C283
+SevenIsland_TrainerTower_Text_RodetteIntro:: @ 818C283
.string "Somewhere on this island, peculiar\n"
.string "POKéMON are sleeping.$"
-Text_18C2BC:: @ 818C2BC
+SevenIsland_TrainerTower_Text_RodetteDefeat:: @ 818C2BC
.string "What an amazing TRAINER!$"
-Text_18C2D5:: @ 818C2D5
+SevenIsland_TrainerTower_Text_RodettePostBattle:: @ 818C2D5
.string "Somewhere on this island, peculiar\n"
.string "POKéMON are sleeping.\p"
.string "Could it be that they're waiting\n"
.string "for you?$"
-gUnknown_818C338:: @ 818C338
+SevenIsland_TrainerTower_Text_TrainerTowerSign:: @ 818C338
.string "TRAINER TOWER ENTRANCE\n"
.string "Rise to the Challenge, TRAINERS!$"
-gUnknown_818C370:: @ 818C370
+SevenIsland_TrainerTower_Text_TrainerTowerAhead:: @ 818C370
.string "TRAINER TOWER AHEAD$"
+@ Unused text perhaps indicating Trainer Tower was planned to be unlocked by something
+SevenIsland_TrainerTower_Text_LooksLikeTrainerTowerIsClosed:: @ 818C384
+ .string "トレーナータワーには\n"
+ .string "いまは はいれない みたい‥$"
+
+SevenIsland_TrainerTower_Text_TrainerTowerIsOpenLetsGoIn:: @ 818C39E
+ .string "トレーナータワーが あいてる!\n"
+ .string "さっそく はいってみよう!$"
+