Document Two Island scripts

3 files changed, 81 insertions, 76 deletions

diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json
index d15bc7d3b..baf6a8db0 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/map.json
+++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json
@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_JoyfulGameCorner_EventScript_17155F",
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_JoyfulGameCorner_EventScript_17160C",
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_Lostelle",
       "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "TwoIsland_JoyfulGameCorner_EventScript_171535",
+      "script": "TwoIsland_JoyfulGameCorner_EventScript_InfoMan",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
index 0bbb24423..fcba4720c 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
@@ -1,3 +1,7 @@
+.equ LOCALID_DADDY,    1
+.equ LOCALID_BIKER,    2
+.equ LOCALID_LOSTELLE, 3
+
 TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0
 	map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp
@@ -6,86 +10,86 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0
 	.byte 0
 
 TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5
-	call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1713EF
+	call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos
 	end
 
-EventScript_1713EF:: @ 81713EF
-	setobjectxyperm 1, 6, 2
-	setobjectmovementtype 1, 8
-	setobjectmovementtype 3, 1
+TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos:: @ 81713EF
+	setobjectxyperm LOCALID_DADDY, 6, 2
+	setobjectmovementtype LOCALID_DADDY, MOVEMENT_TYPE_FACE_DOWN
+	setobjectmovementtype LOCALID_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND
 	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
 	return
 
 TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404
-	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416
+	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, EventScript_CheckTurnAttendant
 	.2byte 0
 
-EventScript_171416:: @ 8171416
+TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth:: @ 8171416
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B
-	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F
-	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435
+	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene
+	map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
 	.2byte 0
 
-EventScript_171435:: @ 8171435
+TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: @ 8171435
 	lockall
 	textcolor 0
-	msgbox gUnknown_81A28B2
+	msgbox TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle
 	textcolor 1
 	special Special_BufferBigGuyOrBigGirlString
-	msgbox gUnknown_81A2931
+	msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy
 	closemessage
-	applymovement 3, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
 	releaseall
 	end
 
-EventScript_17145F:: @ 817145F
+TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F
 	lockall
 	textcolor 0
-	applymovement 1, Movement_171520
+	applymovement LOCALID_DADDY, Movement_171520
 	waitmovement 0
-	msgbox gUnknown_81A2408
+	msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo
 	closemessage
-	applymovement 1, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_DADDY, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, Movement_ExclamationMark
+	applymovement LOCALID_DADDY, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, Movement_Delay48
+	applymovement LOCALID_DADDY, Movement_Delay48
 	waitmovement 0
-	applymovement 1, Movement_171527
+	applymovement LOCALID_DADDY, Movement_171527
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox gUnknown_81A2465
+	msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle
 	closemessage
 	playse SE_DOOR
 	waitse
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_17152C
 	waitmovement 0
 	playbgm MUS_SHOUNEN, 0
-	addobject 2
-	applymovement 2, Movement_17152F
+	addobject LOCALID_BIKER
+	applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround
 	waitmovement 0
-	msgbox gUnknown_81A259A
-	applymovement 2, Movement_WalkInPlaceFastestRight
+	msgbox TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland
+	applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox gUnknown_81A2658
-	msgbox gUnknown_81A26D5
+	msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt
+	msgbox TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing
 	closemessage
-	applymovement 2, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_KAIDAN
-	removeobject 2
+	removeobject LOCALID_BIKER
 	fadedefaultbgm
 	delay 60
-	msgbox gUnknown_81A270C
+	msgbox TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor
 	clearflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER
 	setvar VAR_MAP_SCENE_THREE_ISLAND, 2
 	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1
@@ -113,7 +117,7 @@ Movement_17152C:: @ 817152C
 	walk_in_place_fastest_right
 	step_end
 
-Movement_17152F:: @ 817152F
+TwoIsland_JoyfulGameCorner_Movement_BikerLookAround:: @ 817152F
 	walk_in_place_fastest_left
 	delay_8
 	walk_in_place_fastest_right
@@ -121,72 +125,73 @@ Movement_17152F:: @ 817152F
 	walk_in_place_fastest_up
 	step_end
 
-TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535
+TwoIsland_JoyfulGameCorner_EventScript_InfoMan:: @ 8171535
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
 	goto_if_eq JoyfulGameCorner_EventScript_InfoMan2
-	goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171555
-	msgbox gUnknown_81A285C
+	goto_if_set FLAG_RESCUED_LOSTELLE, TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon
+	msgbox TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday
 	release
 	end
 
-EventScript_171555:: @ 8171555
-	msgbox gUnknown_81A288A
+TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon:: @ 8171555
+	msgbox TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon
 	release
 	end
 
-TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F
+@ Only referred to as Lostelles Daddy in text
+TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy:: @ 817155F
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
 	goto_if_eq JoyfulGameCorner_EventScript_MinigameAttendant
-	goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1715F5
+	goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning
 	compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
-	goto_if_eq EventScript_17158A
-	msgbox gUnknown_81A2743
+	goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite
+	msgbox TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland
 	release
 	end
 
-EventScript_17158A:: @ 817158A
-	goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, EventScript_1715C4
-	msgbox gUnknown_81A296A
+TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A
+	goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone
+	msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsForMe
 	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
 	textcolor 3
 	playfanfare MUS_ME_WAZA
-	message Text_1A29F7
+	message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy
 	waitmessage
 	waitfanfare
 	call EventScript_1A6675
 	removeitem ITEM_METEORITE, 1
-	msgbox gUnknown_81A2A24
-	goto EventScript_1715C4
+	msgbox TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill
+	goto TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone
 	end
 
-EventScript_1715C4:: @ 81715C4
+TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone:: @ 81715C4
 	checkitemspace ITEM_MOON_STONE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1715FF
+	goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone
 	additem ITEM_MOON_STONE
 	setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER
-	msgreceiveditem gUnknown_81A2A9A, ITEM_MOON_STONE
+	msgreceiveditem TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy, ITEM_MOON_STONE
 	release
 	end
 
-EventScript_1715F5:: @ 81715F5
-	msgbox gUnknown_81A2AF5
+TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning:: @ 81715F5
+	msgbox TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning
 	release
 	end
 
-EventScript_1715FF:: @ 81715FF
+TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone:: @ 81715FF
 	setflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE
-	msgbox gUnknown_81A2ACA
+	msgbox TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag
 	release
 	end
 
-TwoIsland_JoyfulGameCorner_EventScript_17160C:: @ 817160C
+TwoIsland_JoyfulGameCorner_EventScript_Lostelle:: @ 817160C
 	lock
 	faceplayer
-	msgbox gUnknown_81A2B53
+	msgbox TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool
 	release
 	end
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/text.inc b/data/maps/TwoIsland_JoyfulGameCorner/text.inc
index 21f6dd8ec..3884e8a32 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/text.inc
+++ b/data/maps/TwoIsland_JoyfulGameCorner/text.inc
@@ -1,10 +1,10 @@
-gUnknown_81A2408:: @ 81A2408
+TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo:: @ 81A2408
     .string "Now, where's LOSTELLE gotten to\n"
     .string "today?\p"
     .string "She always brings me lunch every\n"
     .string "day right about now…$"
 
-gUnknown_81A2465:: @ 81A2465
+TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle:: @ 81A2465
     .string "Hm? You, there!\n"
     .string "Are you a friend of LOSTELLE's?\p"
     .string "Have you seen LOSTELLE around?\n"
@@ -17,7 +17,7 @@ gUnknown_81A2465:: @ 81A2465
     .string "Please, help me find her!\n"
     .string "Please go search THREE ISLAND!$"
 
-gUnknown_81A259A:: @ 81A259A
+TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland:: @ 81A259A
     .string "Hah? What is this GAME CORNER?\n"
     .string "How much sadder can this get?\p"
     .string "Those clowns…\p"
@@ -26,24 +26,24 @@ gUnknown_81A259A:: @ 81A259A
     .string "Hey, you! Is this the only THREE\n"
     .string "ISLAND around here?$"
 
-gUnknown_81A2658:: @ 81A2658
+TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt:: @ 81A2658
     .string "Try waking up before you crawl out\n"
     .string "of bed, you punk.\p"
     .string "This is TWO ISLAND!\p"
     .string "Move it! Get your filthy motorbike\n"
     .string "out of my place!$"
 
-gUnknown_81A26D5:: @ 81A26D5
+TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing:: @ 81A26D5
     .string "Huh…\n"
     .string "Oh, oh, gotcha.\p"
     .string "Tch…\n"
     .string "These islands are confusing…$"
 
-gUnknown_81A270C:: @ 81A270C
+TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor:: @ 81A270C
     .string "Would you look at that?\n"
     .string "That punk scuffed up my floor.$"
 
-gUnknown_81A2743:: @ 81A2743
+TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland:: @ 81A2743
     .string "Hey, but listen! I'm begging you,\n"
     .string "you have to go to THREE ISLAND.\p"
     .string "If anything were to happen to my\n"
@@ -55,26 +55,26 @@ gUnknown_81A2743:: @ 81A2743
     .string "That's why I have to get you to do\n"
     .string "me this big favor.$"
 
-gUnknown_81A285C:: @ 81A285C
+TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday:: @ 81A285C
     .string "I'm sorry.\n"
     .string "We're not running any games today.$"
 
-gUnknown_81A288A:: @ 81A288A
+TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon:: @ 81A288A
     .string "We'll get the games going soon\n"
     .string "for you!$"
 
-gUnknown_81A28B2:: @ 81A28B2
+TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle:: @ 81A28B2
     .string "So you rescued LOSTELLE?\n"
     .string "How can I thank you?\p"
     .string "LOSTELLE, darling, forgive me!\p"
     .string "Daddy didn't know you were scared\n"
     .string "and in trouble!$"
 
-gUnknown_81A2931:: @ 81A2931
+TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy:: @ 81A2931
     .string "LOSTELLE: It's okay, Daddy.\n"
     .string "I got to be friends with {PLAYER}!$"
 
-gUnknown_81A296A:: @ 81A296A
+TwoIsland_JoyfulGameCorner_Text_ThisIsForMe:: @ 81A296A
     .string "Oh, what's that?\n"
     .string "You're saying that this is for me?\p"
     .string "How did you know that I love rare\n"
@@ -82,31 +82,31 @@ gUnknown_81A296A:: @ 81A296A
     .string "You sure know how to make a guy\n"
     .string "happy.$"
 
-Text_1A29F7:: @ 81A29F7
+TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy:: @ 81A29F7
     .string "{PLAYER} handed the METEORITE\n"
     .string "to LOSTELLE's daddy.$"
 
-gUnknown_81A2A24:: @ 81A2A24
+TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill:: @ 81A2A24
     .string "Oh, I see, this is from BILL!\n"
     .string "You have to thank him for me!\p"
     .string "You know, you've been fantastic.\n"
     .string "I want you to have this.$"
 
-gUnknown_81A2A9A:: @ 81A2A9A
+TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy:: @ 81A2A9A
     .string "{PLAYER} received a MOON STONE\n"
     .string "from LOSTELLE's daddy.$"
 
-gUnknown_81A2ACA:: @ 81A2ACA
+TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag:: @ 81A2ACA
     .string "Your BAG's not going to fit another\n"
     .string "thing…$"
 
-gUnknown_81A2AF5:: @ 81A2AF5
+TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning:: @ 81A2AF5
     .string "All right, I'll get the GAME CORNER\n"
     .string "running right away.\p"
     .string "You have to come visit with a\n"
     .string "friend.$"
 
-gUnknown_81A2B53:: @ 81A2B53
+TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool:: @ 81A2B53
     .string "Listen, listen!\p"
     .string "Please show me you being cool\n"
     .string "again!$"