summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-02 02:19:44 -0400
committerhuderlem <huderlem@gmail.com>2019-11-02 16:32:58 -0500
commite4fe21786e79be877dc2c183204c7f8c0a9a158e (patch)
tree84ae4d7aeae978799ec74265a059212c40b9c7d2
parent390d594e21067be8c24447ca5e51689327b8ce04 (diff)
Document misc special houses
-rw-r--r--data/maps/FallarborTown_CozmosHouse/map.json4
-rw-r--r--data/maps/FallarborTown_CozmosHouse/scripts.inc76
-rw-r--r--data/maps/MauvilleCity_BikeShop/map.json8
-rw-r--r--data/maps/MauvilleCity_BikeShop/scripts.inc217
-rw-r--r--data/maps/Route104_MrBrineysHouse/map.json4
-rw-r--r--data/maps/Route104_MrBrineysHouse/scripts.inc88
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/map.json4
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc328
8 files changed, 365 insertions, 364 deletions
diff --git a/data/maps/FallarborTown_CozmosHouse/map.json b/data/maps/FallarborTown_CozmosHouse/map.json
index 4895efed4..a31c1c5bf 100644
--- a/data/maps/FallarborTown_CozmosHouse/map.json
+++ b/data/maps/FallarborTown_CozmosHouse/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FallarborTown_CozmosHouse_EventScript_200F13",
+ "script": "FallarborTown_CozmosHouse_EventScript_ProfCozmo",
"flag": "FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FallarborTown_CozmosHouse_EventScript_200FBC",
+ "script": "FallarborTown_CozmosHouse_EventScript_CozmosWife",
"flag": "0"
}
],
diff --git a/data/maps/FallarborTown_CozmosHouse/scripts.inc b/data/maps/FallarborTown_CozmosHouse/scripts.inc
index a2578bf3f..310cc7200 100644
--- a/data/maps/FallarborTown_CozmosHouse/scripts.inc
+++ b/data/maps/FallarborTown_CozmosHouse/scripts.inc
@@ -1,73 +1,73 @@
FallarborTown_CozmosHouse_MapScripts:: @ 8200F12
.byte 0
-FallarborTown_CozmosHouse_EventScript_200F13:: @ 8200F13
+FallarborTown_CozmosHouse_EventScript_ProfCozmo:: @ 8200F13
lock
faceplayer
- goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_200FB2
+ goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_GaveMeteorite
checkitem ITEM_METEORITE, 1
- compare VAR_RESULT, 1
- goto_if_eq FallarborTown_CozmosHouse_EventScript_200F38
- msgbox FallarborTown_CozmosHouse_Text_200FEE, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite
+ msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT
release
end
-FallarborTown_CozmosHouse_EventScript_200F38:: @ 8200F38
- call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_200F8B
- call_if_set FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_200F9C
+FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38
+ call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_NoticeMeteorite
+ call_if_set FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_AskForMeteorite
compare VAR_RESULT, 0
- goto_if_eq FallarborTown_CozmosHouse_EventScript_200FA5
- msgbox FallarborTown_CozmosHouse_Text_201159, MSGBOX_DEFAULT
+ goto_if_eq FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite
+ msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT
giveitem_std ITEM_TM27
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setvar VAR_0x8004, ITEM_METEORITE
call Common_EventScript_PlayerHandedOverTheItem
setflag FLAG_RECEIVED_TM27
- msgbox FallarborTown_CozmosHouse_Text_2011A5, MSGBOX_DEFAULT
+ msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT
release
end
-FallarborTown_CozmosHouse_EventScript_200F8B:: @ 8200F8B
- msgbox FallarborTown_CozmosHouse_Text_200FEE, MSGBOX_DEFAULT
- msgbox FallarborTown_CozmosHouse_Text_2010A2, MSGBOX_YESNO
+FallarborTown_CozmosHouse_EventScript_NoticeMeteorite:: @ 8200F8B
+ msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT
+ msgbox FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt, MSGBOX_YESNO
return
-FallarborTown_CozmosHouse_EventScript_200F9C:: @ 8200F9C
- msgbox FallarborTown_CozmosHouse_Text_201249, MSGBOX_YESNO
+FallarborTown_CozmosHouse_EventScript_AskForMeteorite:: @ 8200F9C
+ msgbox FallarborTown_CozmosHouse_Text_MayIHaveMeteorite, MSGBOX_YESNO
return
-FallarborTown_CozmosHouse_EventScript_200FA5:: @ 8200FA5
+FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite:: @ 8200FA5
setflag FLAG_TEMP_2
- msgbox FallarborTown_CozmosHouse_Text_201212, MSGBOX_DEFAULT
+ msgbox FallarborTown_CozmosHouse_Text_CrushedWithDisappointment, MSGBOX_DEFAULT
release
end
-FallarborTown_CozmosHouse_EventScript_200FB2:: @ 8200FB2
- msgbox FallarborTown_CozmosHouse_Text_2011A5, MSGBOX_DEFAULT
+FallarborTown_CozmosHouse_EventScript_GaveMeteorite:: @ 8200FB2
+ msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT
release
end
-FallarborTown_CozmosHouse_EventScript_200FBC:: @ 8200FBC
+FallarborTown_CozmosHouse_EventScript_CozmosWife:: @ 8200FBC
lock
faceplayer
- goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_200FE4
- goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_CozmosHouse_EventScript_200FDA
- msgbox FallarborTown_CozmosHouse_Text_2012BC, MSGBOX_DEFAULT
+ goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_CozmoIsHappy
+ goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_CozmosHouse_EventScript_CozmoIsSad
+ msgbox FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls, MSGBOX_DEFAULT
release
end
-FallarborTown_CozmosHouse_EventScript_200FDA:: @ 8200FDA
- msgbox FallarborTown_CozmosHouse_Text_201310, MSGBOX_DEFAULT
+FallarborTown_CozmosHouse_EventScript_CozmoIsSad:: @ 8200FDA
+ msgbox FallarborTown_CozmosHouse_Text_FeelSorryForCozmo, MSGBOX_DEFAULT
release
end
-FallarborTown_CozmosHouse_EventScript_200FE4:: @ 8200FE4
- msgbox FallarborTown_CozmosHouse_Text_20134B, MSGBOX_DEFAULT
+FallarborTown_CozmosHouse_EventScript_CozmoIsHappy:: @ 8200FE4
+ msgbox FallarborTown_CozmosHouse_Text_CozmoIsSoHappy, MSGBOX_DEFAULT
release
end
-FallarborTown_CozmosHouse_Text_200FEE: @ 8200FEE
+FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow: @ 8200FEE
.string "PROF. COZMO: Oh…\n"
.string "I never should have let myself be\l"
.string "conned into telling TEAM MAGMA where\l"
@@ -75,7 +75,7 @@ FallarborTown_CozmosHouse_Text_200FEE: @ 8200FEE
.string "That METEORITE from METEOR FALLS…\n"
.string "It's never going to be mine now…$"
-FallarborTown_CozmosHouse_Text_2010A2: @ 82010A2
+FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt: @ 82010A2
.string "Oh!\n"
.string "Hah?\p"
.string "That item…\p"
@@ -86,36 +86,36 @@ FallarborTown_CozmosHouse_Text_2010A2: @ 82010A2
.string "I'm not asking for it for free.\n"
.string "How about in exchange for this TM?$"
-FallarborTown_CozmosHouse_Text_201159: @ 8201159
+FallarborTown_CozmosHouse_Text_PleaseUseThisTM: @ 8201159
.string "PROF. COZMO: This TM, it represents\n"
.string "my feeling of gratitude.\l"
.string "Please use it!$"
-FallarborTown_CozmosHouse_Text_2011A5: @ 82011A5
+FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch: @ 82011A5
.string "PROF. COZMO: Oh, I can't believe it.\n"
.string "This is really, really great!\p"
.string "This is really going to help my research!$"
-FallarborTown_CozmosHouse_Text_201212: @ 8201212
+FallarborTown_CozmosHouse_Text_CrushedWithDisappointment: @ 8201212
.string "PROF. COZMO: Oh, but…\n"
.string "I'm crushed with disappointment…$"
-FallarborTown_CozmosHouse_Text_201249: @ 8201249
+FallarborTown_CozmosHouse_Text_MayIHaveMeteorite: @ 8201249
.string "PROF. COZMO: Please, may I have that\n"
.string "METEORITE?\p"
.string "I'm not asking for it for free.\n"
.string "How about in exchange for this TM?$"
-FallarborTown_CozmosHouse_Text_2012BC: @ 82012BC
+FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls: @ 82012BC
.string "PROF. COZMO went off to METEOR FALLS\n"
.string "on ROUTE 114 with some people from\l"
.string "TEAM MAGMA.$"
-FallarborTown_CozmosHouse_Text_201310: @ 8201310
+FallarborTown_CozmosHouse_Text_FeelSorryForCozmo: @ 8201310
.string "Poor PROF. COZMO…\n"
.string "He's so depressed… I feel sorry for him.$"
-FallarborTown_CozmosHouse_Text_20134B: @ 820134B
+FallarborTown_CozmosHouse_Text_CozmoIsSoHappy: @ 820134B
.string "Look at PROF. COZMO…\n"
.string "He's so happy! I think it's cute.$"
diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json
index 98c1fcee1..488ab5a4e 100644
--- a/data/maps/MauvilleCity_BikeShop/map.json
+++ b/data/maps/MauvilleCity_BikeShop/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_BikeShop_EventScript_20EBBC",
+ "script": "MauvilleCity_BikeShop_EventScript_Rydel",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_BikeShop_EventScript_20ED31",
+ "script": "MauvilleCity_BikeShop_EventScript_Assistant",
"flag": "0"
}
],
@@ -65,7 +65,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_BikeShop_EventScript_20ED3A"
+ "script": "MauvilleCity_BikeShop_EventScript_MachBikeHandbook"
},
{
"type": "sign",
@@ -73,7 +73,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_BikeShop_EventScript_20EDAE"
+ "script": "MauvilleCity_BikeShop_EventScript_AcroBikeHandbook"
}
]
} \ No newline at end of file
diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc
index 4c4afd8e2..f1444e20d 100644
--- a/data/maps/MauvilleCity_BikeShop/scripts.inc
+++ b/data/maps/MauvilleCity_BikeShop/scripts.inc
@@ -1,203 +1,204 @@
MauvilleCity_BikeShop_MapScripts:: @ 820EBBB
.byte 0
-MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC
+MauvilleCity_BikeShop_EventScript_Rydel:: @ 820EBBC
lock
faceplayer
- goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_20EC94
- goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_20EBF7
- msgbox MauvilleCity_BikeShop_Text_20EE22, MSGBOX_DEFAULT
- msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO
+ goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_AskSwitchBikes
+ goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_SkipGreeting
+ msgbox MauvilleCity_BikeShop_Text_RydelGreeting, MSGBOX_DEFAULT
+ msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq MauvilleCity_BikeShop_EventScript_20EC4A
+ goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_BikeShop_EventScript_20EC3D
+ goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar
end
-MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7
- msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO
+MauvilleCity_BikeShop_EventScript_SkipGreeting:: @ 820EBF7
+ msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq MauvilleCity_BikeShop_EventScript_20EC4A
+ goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_BikeShop_EventScript_20EC3D
+ goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar
end
-MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16
- message MauvilleCity_BikeShop_Text_20EF32
+MauvilleCity_BikeShop_EventScript_ChooseBike:: @ 820EC16
+ message MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne
waitmessage
multichoice 21, 8, MULTI_BIKE, 1
switch VAR_RESULT
- case 0, MauvilleCity_BikeShop_EventScript_20EC53
- case 1, MauvilleCity_BikeShop_EventScript_20EC6D
+ case 0, MauvilleCity_BikeShop_EventScript_GetMachBike
+ case 1, MauvilleCity_BikeShop_EventScript_GetAcroBike
end
-MauvilleCity_BikeShop_EventScript_20EC3D:: @ 820EC3D
+MauvilleCity_BikeShop_EventScript_NotFar:: @ 820EC3D
setflag FLAG_DECLINED_BIKE
- msgbox MauvilleCity_BikeShop_Text_20EEE8, MSGBOX_DEFAULT
+ msgbox MauvilleCity_BikeShop_Text_GuessYouDontNeedBike, MSGBOX_DEFAULT
release
end
-MauvilleCity_BikeShop_EventScript_20EC4A:: @ 820EC4A
+MauvilleCity_BikeShop_EventScript_YesFar:: @ 820EC4A
setflag FLAG_RECEIVED_BIKE
- goto MauvilleCity_BikeShop_EventScript_20EC16
+ goto MauvilleCity_BikeShop_EventScript_ChooseBike
end
-MauvilleCity_BikeShop_EventScript_20EC53:: @ 820EC53
- msgbox MauvilleCity_BikeShop_Text_20F18D, MSGBOX_DEFAULT
+MauvilleCity_BikeShop_EventScript_GetMachBike:: @ 820EC53
+ msgbox MauvilleCity_BikeShop_Text_ChoseMachBike, MSGBOX_DEFAULT
giveitem_std ITEM_MACH_BIKE
- goto MauvilleCity_BikeShop_EventScript_20EC87
+ goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
end
-MauvilleCity_BikeShop_EventScript_20EC6D:: @ 820EC6D
- msgbox MauvilleCity_BikeShop_Text_20F1A5, MSGBOX_DEFAULT
+MauvilleCity_BikeShop_EventScript_GetAcroBike:: @ 820EC6D
+ msgbox MauvilleCity_BikeShop_Text_ChoseAcroBike, MSGBOX_DEFAULT
giveitem_std ITEM_ACRO_BIKE
- goto MauvilleCity_BikeShop_EventScript_20EC87
+ goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
end
-MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87
- msgbox MauvilleCity_BikeShop_Text_20F1BD, MSGBOX_DEFAULT
+MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes:: @ 820EC87
+ msgbox MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes, MSGBOX_DEFAULT
special SwapRegisteredBike
release
end
-MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94
- msgbox MauvilleCity_BikeShop_Text_20F1FB, MSGBOX_YESNO
+MauvilleCity_BikeShop_EventScript_AskSwitchBikes:: @ 820EC94
+ msgbox MauvilleCity_BikeShop_Text_WantToSwitchBikes, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq MauvilleCity_BikeShop_EventScript_20ECB3
+ goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchBikes
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_BikeShop_EventScript_20ECE5
+ goto_if_eq MauvilleCity_BikeShop_EventScript_KeepBike
end
-MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3
- msgbox MauvilleCity_BikeShop_Text_20F22F, MSGBOX_DEFAULT
+@ If the player does not have a bike on them Rydel assumes its stored in the PC
+MauvilleCity_BikeShop_EventScript_SwitchBikes:: @ 820ECB3
+ msgbox MauvilleCity_BikeShop_Text_IllSwitchBikes, MSGBOX_DEFAULT
checkitem ITEM_ACRO_BIKE, 1
- compare VAR_RESULT, 1
- goto_if_eq MauvilleCity_BikeShop_EventScript_20ECEF
+ compare VAR_RESULT, TRUE
+ goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchAcroForMach
checkitem ITEM_MACH_BIKE, 1
- compare VAR_RESULT, 1
- goto_if_eq MauvilleCity_BikeShop_EventScript_20ED10
- msgbox MauvilleCity_BikeShop_Text_20F2F3, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchMachForAcro
+ msgbox MauvilleCity_BikeShop_Text_OhYourBikeIsInPC, MSGBOX_DEFAULT
release
end
-MauvilleCity_BikeShop_EventScript_20ECE5:: @ 820ECE5
- msgbox MauvilleCity_BikeShop_Text_20F2C4, MSGBOX_DEFAULT
+MauvilleCity_BikeShop_EventScript_KeepBike:: @ 820ECE5
+ msgbox MauvilleCity_BikeShop_Text_HappyYouLikeIt, MSGBOX_DEFAULT
release
end
-MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF
+MauvilleCity_BikeShop_EventScript_SwitchAcroForMach:: @ 820ECEF
incrementgamestat GAME_STAT_TRADED_BIKES
- msgbox MauvilleCity_BikeShop_Text_20F294, MSGBOX_DEFAULT
+ msgbox MauvilleCity_BikeShop_Text_ExchangedAcroForMach, MSGBOX_DEFAULT
takeitem ITEM_ACRO_BIKE, 1
giveitem_std ITEM_MACH_BIKE
- goto MauvilleCity_BikeShop_EventScript_20EC87
+ goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
end
-MauvilleCity_BikeShop_EventScript_20ED10:: @ 820ED10
+MauvilleCity_BikeShop_EventScript_SwitchMachForAcro:: @ 820ED10
incrementgamestat GAME_STAT_TRADED_BIKES
- msgbox MauvilleCity_BikeShop_Text_20F263, MSGBOX_DEFAULT
+ msgbox MauvilleCity_BikeShop_Text_ExchangedMachForAcro, MSGBOX_DEFAULT
takeitem ITEM_MACH_BIKE, 1
giveitem_std ITEM_ACRO_BIKE
- goto MauvilleCity_BikeShop_EventScript_20EC87
+ goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
end
-MauvilleCity_BikeShop_EventScript_20ED31:: @ 820ED31
- msgbox MauvilleCity_BikeShop_Text_20F3C3, MSGBOX_NPC
+MauvilleCity_BikeShop_EventScript_Assistant:: @ 820ED31
+ msgbox MauvilleCity_BikeShop_Text_HandbooksAreInBack, MSGBOX_NPC
end
-MauvilleCity_BikeShop_EventScript_20ED3A:: @ 820ED3A
- message MauvilleCity_BikeShop_Text_20F445
+MauvilleCity_BikeShop_EventScript_MachBikeHandbook:: @ 820ED3A
+ message MauvilleCity_BikeShop_Text_MachHandbookWhichPage
waitmessage
- goto MauvilleCity_BikeShop_EventScript_20ED46
+ goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
end
-MauvilleCity_BikeShop_EventScript_20ED46:: @ 820ED46
+MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage:: @ 820ED46
multichoice 0, 0, MULTI_MACH_BIKE_INFO, 0
switch VAR_RESULT
- case 0, MauvilleCity_BikeShop_EventScript_20ED88
- case 1, MauvilleCity_BikeShop_EventScript_20ED94
- case 2, MauvilleCity_BikeShop_EventScript_20EDA0
- case 3, MauvilleCity_BikeShop_EventScript_20EDAC
- case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_20EDAC
+ case 0, MauvilleCity_BikeShop_EventScript_HowToRide
+ case 1, MauvilleCity_BikeShop_EventScript_HowToTurn
+ case 2, MauvilleCity_BikeShop_EventScript_SandySlopes
+ case 3, MauvilleCity_BikeShop_EventScript_ExitMachHandbook
+ case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_ExitMachHandbook
end
-MauvilleCity_BikeShop_EventScript_20ED88:: @ 820ED88
- message MauvilleCity_BikeShop_Text_20F487
+MauvilleCity_BikeShop_EventScript_HowToRide:: @ 820ED88
+ message MauvilleCity_BikeShop_Text_HowToRideMachBike
waitmessage
- goto MauvilleCity_BikeShop_EventScript_20ED46
+ goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
end
-MauvilleCity_BikeShop_EventScript_20ED94:: @ 820ED94
- message MauvilleCity_BikeShop_Text_20F550
+MauvilleCity_BikeShop_EventScript_HowToTurn:: @ 820ED94
+ message MauvilleCity_BikeShop_Text_HowToTurnMachBike
waitmessage
- goto MauvilleCity_BikeShop_EventScript_20ED46
+ goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
end
-MauvilleCity_BikeShop_EventScript_20EDA0:: @ 820EDA0
- message MauvilleCity_BikeShop_Text_20F61A
+MauvilleCity_BikeShop_EventScript_SandySlopes:: @ 820EDA0
+ message MauvilleCity_BikeShop_Text_SandySlopes
waitmessage
- goto MauvilleCity_BikeShop_EventScript_20ED46
+ goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
end
-MauvilleCity_BikeShop_EventScript_20EDAC:: @ 820EDAC
+MauvilleCity_BikeShop_EventScript_ExitMachHandbook:: @ 820EDAC
release
end
-MauvilleCity_BikeShop_EventScript_20EDAE:: @ 820EDAE
- message MauvilleCity_BikeShop_Text_20F6ED
+MauvilleCity_BikeShop_EventScript_AcroBikeHandbook:: @ 820EDAE
+ message MauvilleCity_BikeShop_Text_AcroHandbookWhichPage
waitmessage
- goto MauvilleCity_BikeShop_EventScript_20EDBA
+ goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
end
-MauvilleCity_BikeShop_EventScript_20EDBA:: @ 820EDBA
+MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage:: @ 820EDBA
multichoice 0, 0, MULTI_ACRO_BIKE_INFO, 0
switch VAR_RESULT
- case 0, MauvilleCity_BikeShop_EventScript_20EDFC
- case 1, MauvilleCity_BikeShop_EventScript_20EE08
- case 2, MauvilleCity_BikeShop_EventScript_20EE14
- case 3, MauvilleCity_BikeShop_EventScript_20EE20
- case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_20EE20
+ case 0, MauvilleCity_BikeShop_EventScript_Wheelies
+ case 1, MauvilleCity_BikeShop_EventScript_BunnyHops
+ case 2, MauvilleCity_BikeShop_EventScript_Jumps
+ case 3, MauvilleCity_BikeShop_EventScript_ExitAcroHandbook
+ case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_ExitAcroHandbook
end
-MauvilleCity_BikeShop_EventScript_20EDFC:: @ 820EDFC
- message MauvilleCity_BikeShop_Text_20F72F
+MauvilleCity_BikeShop_EventScript_Wheelies:: @ 820EDFC
+ message MauvilleCity_BikeShop_Text_Wheelies
waitmessage
- goto MauvilleCity_BikeShop_EventScript_20EDBA
+ goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
end
-MauvilleCity_BikeShop_EventScript_20EE08:: @ 820EE08
- message MauvilleCity_BikeShop_Text_20F7F5
+MauvilleCity_BikeShop_EventScript_BunnyHops:: @ 820EE08
+ message MauvilleCity_BikeShop_Text_BunnyHops
waitmessage
- goto MauvilleCity_BikeShop_EventScript_20EDBA
+ goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
end
-MauvilleCity_BikeShop_EventScript_20EE14:: @ 820EE14
- message MauvilleCity_BikeShop_Text_20F898
+MauvilleCity_BikeShop_EventScript_Jumps:: @ 820EE14
+ message MauvilleCity_BikeShop_Text_Jumps
waitmessage
- goto MauvilleCity_BikeShop_EventScript_20EDBA
+ goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
end
-MauvilleCity_BikeShop_EventScript_20EE20:: @ 820EE20
+MauvilleCity_BikeShop_EventScript_ExitAcroHandbook:: @ 820EE20
release
end
-MauvilleCity_BikeShop_Text_20EE22: @ 820EE22
+MauvilleCity_BikeShop_Text_RydelGreeting: @ 820EE22
.string "Well, well, what have we here?\n"
.string "A most energetic customer!\p"
.string "Me? You may call me RYDEL.\n"
.string "I'm the owner of this cycle shop.$"
-MauvilleCity_BikeShop_Text_20EE99: @ 820EE99
+MauvilleCity_BikeShop_Text_DidYouComeFromFarAway: @ 820EE99
.string "RYDEL: Your RUNNING SHOES…\n"
.string "They're awfully filthy.\p"
.string "Did you come from far away?$"
-MauvilleCity_BikeShop_Text_20EEE8: @ 820EEE8
+MauvilleCity_BikeShop_Text_GuessYouDontNeedBike: @ 820EEE8
.string "RYDEL: Is that right?\p"
.string "Then, I guess you have no need for\n"
.string "any of my BIKES.$"
-MauvilleCity_BikeShop_Text_20EF32: @ 820EF32
+MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne: @ 820EF32
.string "RYDEL: Hm, hm… … … … …\p"
.string "You're saying that you came all this\n"
.string "way from LITTLEROOT?\p"
@@ -221,37 +222,37 @@ MauvilleCity_BikeShop_Text_20EF32: @ 820EF32
.string "have whichever one you like!\p"
.string "Which one will you choose?$"
-MauvilleCity_BikeShop_Text_20F18D: @ 820F18D
+MauvilleCity_BikeShop_Text_ChoseMachBike: @ 820F18D
.string "{PLAYER} chose the MACH BIKE.$"
-MauvilleCity_BikeShop_Text_20F1A5: @ 820F1A5
+MauvilleCity_BikeShop_Text_ChoseAcroBike: @ 820F1A5
.string "{PLAYER} chose the ACRO BIKE.$"
-MauvilleCity_BikeShop_Text_20F1BD: @ 820F1BD
+MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes: @ 820F1BD
.string "RYDEL: If you get the urge to switch\n"
.string "BIKES, just come see me!$"
-MauvilleCity_BikeShop_Text_20F1FB: @ 820F1FB
+MauvilleCity_BikeShop_Text_WantToSwitchBikes: @ 820F1FB
.string "RYDEL: Oh? Were you thinking about\n"
.string "switching BIKES?$"
-MauvilleCity_BikeShop_Text_20F22F: @ 820F22F
+MauvilleCity_BikeShop_Text_IllSwitchBikes: @ 820F22F
.string "RYDEL: Okay, no problem!\n"
.string "I'll switch BIKES for you!$"
-MauvilleCity_BikeShop_Text_20F263: @ 820F263
+MauvilleCity_BikeShop_Text_ExchangedMachForAcro: @ 820F263
.string "{PLAYER} got the MACH BIKE exchanged\n"
.string "for an ACRO BIKE.$"
-MauvilleCity_BikeShop_Text_20F294: @ 820F294
+MauvilleCity_BikeShop_Text_ExchangedAcroForMach: @ 820F294
.string "{PLAYER} got the ACRO BIKE exchanged\n"
.string "for a MACH BIKE.$"
-MauvilleCity_BikeShop_Text_20F2C4: @ 820F2C4
+MauvilleCity_BikeShop_Text_HappyYouLikeIt: @ 820F2C4
.string "RYDEL: Good, good!\n"
.string "I'm happy that you like it!$"
-MauvilleCity_BikeShop_Text_20F2F3: @ 820F2F3
+MauvilleCity_BikeShop_Text_OhYourBikeIsInPC: @ 820F2F3
.string "Oh? What happened to that BIKE\n"
.string "I gave you?\p"
.string "Oh, I get it, you stored it using your PC.\p"
@@ -260,18 +261,18 @@ MauvilleCity_BikeShop_Text_20F2F3: @ 820F2F3
.string "May the wind always be at your back\n"
.string "on your adventure!$"
-MauvilleCity_BikeShop_Text_20F3C3: @ 820F3C3
+MauvilleCity_BikeShop_Text_HandbooksAreInBack: @ 820F3C3
.string "I'm learning about BIKES while\n"
.string "I work here.\p"
.string "If you need advice on how to ride your\n"
.string "BIKE, there're a couple handbooks in\l"
.string "the back.$"
-MauvilleCity_BikeShop_Text_20F445: @ 820F445
+MauvilleCity_BikeShop_Text_MachHandbookWhichPage: @ 820F445
.string "It's a handbook on the MACH BIKE.\p"
.string "Which page do you want to read?$"
-MauvilleCity_BikeShop_Text_20F487: @ 820F487
+MauvilleCity_BikeShop_Text_HowToRideMachBike: @ 820F487
.string "A BIKE moves in the direction that\n"
.string "the + Control Pad is pressed.\p"
.string "It will speed up once it gets rolling.\p"
@@ -279,7 +280,7 @@ MauvilleCity_BikeShop_Text_20F487: @ 820F487
.string "The BIKE will slow to a stop.\p"
.string "Want to read a different page?$"
-MauvilleCity_BikeShop_Text_20F550: @ 820F550
+MauvilleCity_BikeShop_Text_HowToTurnMachBike: @ 820F550
.string "A MACH BIKE is speedy, but it can't\n"
.string "stop very quickly.\p"
.string "It gets a little tricky to get around\n"
@@ -288,7 +289,7 @@ MauvilleCity_BikeShop_Text_20F550: @ 820F550
.string "before the corner and slow down.\p"
.string "Want to read a different page?$"
-MauvilleCity_BikeShop_Text_20F61A: @ 820F61A
+MauvilleCity_BikeShop_Text_SandySlopes: @ 820F61A
.string "There are small sandy slopes\n"
.string "throughout the HOENN region.\p"
.string "The loose, crumbly sand makes it\n"
@@ -297,11 +298,11 @@ MauvilleCity_BikeShop_Text_20F61A: @ 820F61A
.string "zip up a sandy slope.\p"
.string "Want to read a different page?$"
-MauvilleCity_BikeShop_Text_20F6ED: @ 820F6ED
+MauvilleCity_BikeShop_Text_AcroHandbookWhichPage: @ 820F6ED
.string "It's a handbook on the ACRO BIKE.\p"
.string "Which page do you want to read?$"
-MauvilleCity_BikeShop_Text_20F72F: @ 820F72F
+MauvilleCity_BikeShop_Text_Wheelies: @ 820F72F
.string "Press the B Button while riding,\n"
.string "and the front wheel lifts up.\p"
.string "You can zip around with the front\n"
@@ -309,14 +310,14 @@ MauvilleCity_BikeShop_Text_20F72F: @ 820F72F
.string "This technique is called a wheelie.\p"
.string "Want to read a different page?$"
-MauvilleCity_BikeShop_Text_20F7F5: @ 820F7F5
+MauvilleCity_BikeShop_Text_BunnyHops: @ 820F7F5
.string "Keeping the B Button pressed,\n"
.string "your BIKE can hop on the spot.\p"
.string "This technique is called a bunny hop.\p"
.string "You can ride while hopping, too.\p"
.string "Want to read a different page?$"
-MauvilleCity_BikeShop_Text_20F898: @ 820F898
+MauvilleCity_BikeShop_Text_Jumps: @ 820F898
.string "Press the B Button and the + Control\n"
.string "Pad at the same time to jump.\p"
.string "Press the + Control Pad to the side\n"
diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json
index 438d56b30..dc6c0ab4d 100644
--- a/data/maps/Route104_MrBrineysHouse/map.json
+++ b/data/maps/Route104_MrBrineysHouse/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 3,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route104_MrBrineysHouse_EventScript_229D67",
+ "script": "Route104_MrBrineysHouse_EventScript_Briney",
"flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 3,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route104_MrBrineysHouse_EventScript_229E5D",
+ "script": "Route104_MrBrineysHouse_EventScript_Peeko",
"flag": "FLAG_HIDE_BRINEYS_HOUSE_PEEKO"
}
],
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index 68fe98ffd..50cc3dd7e 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -5,75 +5,75 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
Route104_MrBrineysHouse_OnTransition: @ 8229D34
setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
compare VAR_BRINEY_HOUSE_STATE, 1
- call_if_eq Route104_MrBrineysHouse_EventScript_229D50
- call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_229D4C
+ call_if_eq Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos
+ call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_HideRustboroRival
end
-Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C
+Route104_MrBrineysHouse_EventScript_HideRustboroRival:: @ 8229D4C
setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
return
-Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50
+Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos:: @ 8229D50
setobjectxyperm 1, 9, 3
setobjectmovementtype 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
setobjectxyperm 2, 9, 6
setobjectmovementtype 2, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
return
-Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67
+Route104_MrBrineysHouse_EventScript_Briney:: @ 8229D67
lock
faceplayer
- call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_229D8A
- goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_229DE1
- goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_229DFA
- goto Route104_MrBrineysHouse_EventScript_229DAE
+ call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_SailingIntro
+ goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_SailBothDeliveries
+ goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_SailDeliverPackage
+ goto Route104_MrBrineysHouse_EventScript_WhereAreWeBound
end
-Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A
+Route104_MrBrineysHouse_EventScript_SailingIntro:: @ 8229D8A
setflag FLAG_MR_BRINEY_SAILING_INTRO
- msgbox Route104_MrBrineysHouse_Text_229E70, MSGBOX_DEFAULT
- msgbox Route104_MrBrineysHouse_Text_229E9B, MSGBOX_YESNO
+ msgbox Route104_MrBrineysHouse_Text_WaitUpPeeko, MSGBOX_DEFAULT
+ msgbox Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq Route104_MrBrineysHouse_EventScript_229E13
- goto Route104_MrBrineysHouse_EventScript_229E27
+ goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
+ goto Route104_MrBrineysHouse_EventScript_SailToDewford
end
-Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE
- message Route104_MrBrineysHouse_Text_22A268
+Route104_MrBrineysHouse_EventScript_WhereAreWeBound:: @ 8229DAE
+ message Route104_MrBrineysHouse_Text_WhereAreWeBound
waitmessage
multichoicedefault 20, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0
switch VAR_RESULT
- case 0, Route104_MrBrineysHouse_EventScript_229E27
- case 1, Route104_MrBrineysHouse_EventScript_229E1D
- case MULTI_B_PRESSED, Route104_MrBrineysHouse_EventScript_229E1D
+ case 0, Route104_MrBrineysHouse_EventScript_SailToDewford
+ case 1, Route104_MrBrineysHouse_EventScript_DeclineSailing
+ case MULTI_B_PRESSED, Route104_MrBrineysHouse_EventScript_DeclineSailing
end
-Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1
- msgbox Route104_MrBrineysHouse_Text_22A0AD, MSGBOX_YESNO
+Route104_MrBrineysHouse_EventScript_SailBothDeliveries:: @ 8229DE1
+ msgbox Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq Route104_MrBrineysHouse_EventScript_229E13
- goto Route104_MrBrineysHouse_EventScript_229E27
+ goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
+ goto Route104_MrBrineysHouse_EventScript_SailToDewford
end
-Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA
- msgbox Route104_MrBrineysHouse_Text_22A18F, MSGBOX_YESNO
+Route104_MrBrineysHouse_EventScript_SailDeliverPackage:: @ 8229DFA
+ msgbox Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq Route104_MrBrineysHouse_EventScript_229E13
- goto Route104_MrBrineysHouse_EventScript_229E27
+ goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
+ goto Route104_MrBrineysHouse_EventScript_SailToDewford
end
-Route104_MrBrineysHouse_EventScript_229E13:: @ 8229E13
- msgbox Route104_MrBrineysHouse_Text_22A041, MSGBOX_DEFAULT
+Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing:: @ 8229E13
+ msgbox Route104_MrBrineysHouse_Text_DeclineDeliverySail, MSGBOX_DEFAULT
release
end
-Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D
- msgbox Route104_MrBrineysHouse_Text_22A2C3, MSGBOX_DEFAULT
+Route104_MrBrineysHouse_EventScript_DeclineSailing:: @ 8229E1D
+ msgbox Route104_MrBrineysHouse_Text_TellMeWheneverYouWantToSail, MSGBOX_DEFAULT
release
end
-Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
- msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT
+Route104_MrBrineysHouse_EventScript_SailToDewford:: @ 8229E27
+ msgbox Route104_MrBrineysHouse_Text_SetSailForDewford, MSGBOX_DEFAULT
call EventScript_BackupMrBrineyLocation
setvar VAR_BOARD_BRINEY_BOAT_STATE, 1
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY
@@ -88,21 +88,21 @@ Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
releaseall
end
-Route104_MrBrineysHouse_EventScript_229E5D:: @ 8229E5D
+Route104_MrBrineysHouse_EventScript_Peeko:: @ 8229E5D
lock
faceplayer
waitse
playmoncry SPECIES_WINGULL, 0
- msgbox Route104_MrBrineysHouse_Text_22A337, MSGBOX_DEFAULT
+ msgbox Route104_MrBrineysHouse_Text_Peeko, MSGBOX_DEFAULT
waitmoncry
release
end
-Route104_MrBrineysHouse_Text_229E70: @ 8229E70
+Route104_MrBrineysHouse_Text_WaitUpPeeko: @ 8229E70
.string "MR. BRINEY: Hold on, lass!\n"
.string "Wait up, PEEKO!$"
-Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B
+Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford: @ 8229E9B
.string "Hm? You're {PLAYER}{KUN}!\n"
.string "You saved my darling PEEKO!\l"
.string "We owe so much to you!\p"
@@ -117,18 +117,18 @@ Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B
.string "You've come to the right man!\n"
.string "We'll set sail for DEWFORD.$"
-Route104_MrBrineysHouse_Text_229FE9: @ 8229FE9
+Route104_MrBrineysHouse_Text_SetSailForDewford: @ 8229FE9
.string "MR. BRINEY: DEWFORD it is, then!\p"
.string "Anchors aweigh!\n"
.string "PEEKO, we're setting sail, my darling!$"
-Route104_MrBrineysHouse_Text_22A041: @ 822A041
+Route104_MrBrineysHouse_Text_DeclineDeliverySail: @ 822A041
.string "MR. BRINEY: Is that so?\n"
.string "Your deliveries can wait?\p"
.string "You just go on and tell me whenever\n"
.string "you want to set sail!$"
-Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD
+Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford: @ 822A0AD
.string "MR. BRINEY: Ahoy!\n"
.string "I know exactly what you want to say!\p"
.string "You're to deliver a LETTER to DEWFORD\n"
@@ -137,7 +137,7 @@ Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD
.string "at all--I'm the man for the job!\p"
.string "First, we'll set sail for DEWFORD.$"
-Route104_MrBrineysHouse_Text_22A18F: @ 822A18F
+Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford: @ 822A18F
.string "MR. BRINEY: Ahoy!\n"
.string "I know exactly what you want to say!\p"
.string "You're to deliver a package to\n"
@@ -146,17 +146,17 @@ Route104_MrBrineysHouse_Text_22A18F: @ 822A18F
.string "at all--I'm the man for the job!\p"
.string "First, we'll set sail for DEWFORD.$"
-Route104_MrBrineysHouse_Text_22A268: @ 822A268
+Route104_MrBrineysHouse_Text_WhereAreWeBound: @ 822A268
.string "MR. BRINEY: Ahoy!\n"
.string "For you, I'll go out to sea anytime!\p"
.string "Now, my friend, where are we bound?$"
-Route104_MrBrineysHouse_Text_22A2C3: @ 822A2C3
+Route104_MrBrineysHouse_Text_TellMeWheneverYouWantToSail: @ 822A2C3
.string "MR. BRINEY: Is that so?\n"
.string "Well, PEEKO owes her life to you.\p"
.string "You just go on and tell me whenever\n"
.string "you want to set sail!$"
-Route104_MrBrineysHouse_Text_22A337: @ 822A337
+Route104_MrBrineysHouse_Text_Peeko: @ 822A337
.string "PEEKO: Pii piihyoro!$"
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json
index 2b61cd6fa..c8ec142f2 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route124_DivingTreasureHuntersHouse_EventScript_270A32",
+ "script": "Route124_DivingTreasureHuntersHouse_EventScript_TreasureHunter",
"flag": "0"
}
],
@@ -52,7 +52,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "Route124_DivingTreasureHuntersHouse_EventScript_270F63"
+ "script": "Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard"
}
]
} \ No newline at end of file
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index 0fa59783d..c605c7df8 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
@@ -6,338 +6,338 @@ Route124_DivingTreasureHuntersHouse_OnTransition: @ 8270A2E
setflag FLAG_LANDMARK_HUNTERS_HOUSE
end
-Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32
+Route124_DivingTreasureHuntersHouse_EventScript_TreasureHunter:: @ 8270A32
lock
faceplayer
- goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_270A4E
- msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, MSGBOX_DEFAULT
+ goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_SkipGreeting
+ msgbox Route124_DivingTreasureHuntersHouse_Text_Greeting, MSGBOX_DEFAULT
setflag FLAG_MET_DIVING_TREASURE_HUNTER
- goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C
+ goto Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard
end
-Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E
- msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, MSGBOX_DEFAULT
- goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C
+Route124_DivingTreasureHuntersHouse_EventScript_SkipGreeting:: @ 8270A4E
+ msgbox Route124_DivingTreasureHuntersHouse_Text_HaveYouSeenAnyShards, MSGBOX_DEFAULT
+ goto Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard
end
-Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C
- call Route124_DivingTreasureHuntersHouse_EventScript_270A72
+Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard:: @ 8270A5C
+ call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards
compare VAR_TEMP_1, 0
- goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57
- goto Route124_DivingTreasureHuntersHouse_EventScript_270AD0
+ goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_NoShards
+ goto Route124_DivingTreasureHuntersHouse_EventScript_HasShard
end
-Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72
+Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards:: @ 8270A72
setvar VAR_TEMP_1, 0
checkitem ITEM_RED_SHARD, 1
- compare VAR_RESULT, 1
- call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270AB8
+ compare VAR_RESULT, TRUE
+ call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard
checkitem ITEM_YELLOW_SHARD, 1
- compare VAR_RESULT, 1
- call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ABE
+ compare VAR_RESULT, TRUE
+ call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasYellowShard
checkitem ITEM_BLUE_SHARD, 1
- compare VAR_RESULT, 1
- call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270AC4
+ compare VAR_RESULT, TRUE
+ call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasBlueShard
checkitem ITEM_GREEN_SHARD, 1
- compare VAR_RESULT, 1
- call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ACA
+ compare VAR_RESULT, TRUE
+ call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard
return
-Route124_DivingTreasureHuntersHouse_EventScript_270AB8:: @ 8270AB8
+Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard:: @ 8270AB8
addvar VAR_TEMP_1, 1
return
-Route124_DivingTreasureHuntersHouse_EventScript_270ABE:: @ 8270ABE
+Route124_DivingTreasureHuntersHouse_EventScript_HasYellowShard:: @ 8270ABE
addvar VAR_TEMP_1, 2
return
-Route124_DivingTreasureHuntersHouse_EventScript_270AC4:: @ 8270AC4
+Route124_DivingTreasureHuntersHouse_EventScript_HasBlueShard:: @ 8270AC4
addvar VAR_TEMP_1, 4
return
-Route124_DivingTreasureHuntersHouse_EventScript_270ACA:: @ 8270ACA
+Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard:: @ 8270ACA
addvar VAR_TEMP_1, 8
return
-Route124_DivingTreasureHuntersHouse_EventScript_270AD0:: @ 8270AD0
- msgbox Route124_DivingTreasureHuntersHouse_Text_271098, MSGBOX_DEFAULT
- goto Route124_DivingTreasureHuntersHouse_EventScript_270ADE
+Route124_DivingTreasureHuntersHouse_EventScript_HasShard:: @ 8270AD0
+ msgbox Route124_DivingTreasureHuntersHouse_Text_ThatsAShardIllTradeYou, MSGBOX_DEFAULT
+ goto Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions
end
-Route124_DivingTreasureHuntersHouse_EventScript_270ADE:: @ 8270ADE
- message Route124_DivingTreasureHuntersHouse_Text_271117
+Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions:: @ 8270ADE
+ message Route124_DivingTreasureHuntersHouse_Text_WhatDoYouWantToTrade
waitmessage
switch VAR_TEMP_1
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270B8F
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270BB5
- case 3, Route124_DivingTreasureHuntersHouse_EventScript_270BDB
- case 4, Route124_DivingTreasureHuntersHouse_EventScript_270C0C
- case 5, Route124_DivingTreasureHuntersHouse_EventScript_270C32
- case 6, Route124_DivingTreasureHuntersHouse_EventScript_270C63
- case 7, Route124_DivingTreasureHuntersHouse_EventScript_270C94
- case 8, Route124_DivingTreasureHuntersHouse_EventScript_270CD0
- case 9, Route124_DivingTreasureHuntersHouse_EventScript_270CF6
- case 10, Route124_DivingTreasureHuntersHouse_EventScript_270D27
- case 11, Route124_DivingTreasureHuntersHouse_EventScript_270D58
- case 12, Route124_DivingTreasureHuntersHouse_EventScript_270D94
- case 13, Route124_DivingTreasureHuntersHouse_EventScript_270DC5
- case 14, Route124_DivingTreasureHuntersHouse_EventScript_270E01
- case 15, Route124_DivingTreasureHuntersHouse_EventScript_270E3D
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY
+ case 3, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY
+ case 4, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB
+ case 5, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB
+ case 6, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB
+ case 7, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB
+ case 8, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG
+ case 9, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG
+ case 10, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG
+ case 11, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG
+ case 12, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG
+ case 13, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG
+ case 14, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG
+ case 15, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG
end
-Route124_DivingTreasureHuntersHouse_EventScript_270B8F:: @ 8270B8F
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR:: @ 8270B8F
multichoice 0, 0, MULTI_SHARDS_R, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270BB5:: @ 8270BB5
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY:: @ 8270BB5
multichoice 0, 0, MULTI_SHARDS_Y, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270BDB:: @ 8270BDB
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY:: @ 8270BDB
multichoice 0, 0, MULTI_SHARDS_RY, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270C0C:: @ 8270C0C
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB:: @ 8270C0C
multichoice 0, 0, MULTI_SHARDS_B, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270C32:: @ 8270C32
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB:: @ 8270C32
multichoice 0, 0, MULTI_SHARDS_RB, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270C63:: @ 8270C63
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB:: @ 8270C63
multichoice 0, 0, MULTI_SHARDS_YB, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270C94:: @ 8270C94
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB:: @ 8270C94
multichoice 0, 0, MULTI_SHARDS_RYB, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
- case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+ case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270CD0:: @ 8270CD0
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG:: @ 8270CD0
multichoice 0, 0, MULTI_SHARDS_G, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270CF6:: @ 8270CF6
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG:: @ 8270CF6
multichoice 0, 0, MULTI_SHARDS_RG, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270D27:: @ 8270D27
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG:: @ 8270D27
multichoice 0, 0, MULTI_SHARDS_YG, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270D58:: @ 8270D58
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG:: @ 8270D58
multichoice 0, 0, MULTI_SHARDS_RYG, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
- case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+ case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270D94:: @ 8270D94
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG:: @ 8270D94
multichoice 0, 0, MULTI_SHARDS_BG, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270DC5:: @ 8270DC5
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG:: @ 8270DC5
multichoice 0, 0, MULTI_SHARDS_RBG, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
- case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+ case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270E01:: @ 8270E01
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG:: @ 8270E01
multichoice 0, 0, MULTI_SHARDS_YBG, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
- case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+ case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270E3D:: @ 8270E3D
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG:: @ 8270E3D
multichoice 0, 0, MULTI_SHARDS_RYBG, 0
switch VAR_RESULT
- case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84
- case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93
- case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EA2
- case 3, Route124_DivingTreasureHuntersHouse_EventScript_270EB1
- case 4, Route124_DivingTreasureHuntersHouse_EventScript_270F4D
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
+ case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
+ case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
+ case 3, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
+ case 4, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270E84:: @ 8270E84
+Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard:: @ 8270E84
setvar VAR_0x8008, ITEM_RED_SHARD
setvar VAR_0x8009, ITEM_FIRE_STONE
- goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
+ goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
-Route124_DivingTreasureHuntersHouse_EventScript_270E93:: @ 8270E93
+Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard:: @ 8270E93
setvar VAR_0x8008, ITEM_YELLOW_SHARD
setvar VAR_0x8009, ITEM_THUNDER_STONE
- goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
+ goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
-Route124_DivingTreasureHuntersHouse_EventScript_270EA2:: @ 8270EA2
+Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard:: @ 8270EA2
setvar VAR_0x8008, ITEM_BLUE_SHARD
setvar VAR_0x8009, ITEM_WATER_STONE
- goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
+ goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
-Route124_DivingTreasureHuntersHouse_EventScript_270EB1:: @ 8270EB1
+Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard:: @ 8270EB1
setvar VAR_0x8008, ITEM_GREEN_SHARD
setvar VAR_0x8009, ITEM_LEAF_STONE
- goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0
+ goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
-Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0
+Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard:: @ 8270EC0
bufferitemname 0, VAR_0x8008
bufferitemname 1, VAR_0x8009
- msgbox Route124_DivingTreasureHuntersHouse_Text_271132, MSGBOX_YESNO
+ msgbox Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
checkitemspace VAR_0x8009, 1
- compare VAR_RESULT, 1
- goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_TradeShard
checkitem VAR_0x8008, 2
- compare VAR_RESULT, 0
- goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F43
+ compare VAR_RESULT, FALSE
+ goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_TradeShard
+ goto Route124_DivingTreasureHuntersHouse_EventScript_BagFull
end
-Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01
+Route124_DivingTreasureHuntersHouse_EventScript_TradeShard:: @ 8270F01
takeitem VAR_0x8008, 1
giveitem_std VAR_0x8009
- msgbox Route124_DivingTreasureHuntersHouse_Text_271158, MSGBOX_DEFAULT
- call Route124_DivingTreasureHuntersHouse_EventScript_270A72
+ msgbox Route124_DivingTreasureHuntersHouse_Text_ItsADeal, MSGBOX_DEFAULT
+ call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards
compare VAR_TEMP_1, 0
- goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61
- msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, MSGBOX_YESNO
+ goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_EndTrade
+ msgbox Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE
- goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D
+ goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions
+ goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
end
-Route124_DivingTreasureHuntersHouse_EventScript_270F43:: @ 8270F43
- msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, MSGBOX_DEFAULT
+Route124_DivingTreasureHuntersHouse_EventScript_BagFull:: @ 8270F43
+ msgbox Route124_DivingTreasureHuntersHouse_Text_BagFull, MSGBOX_DEFAULT
release
end
-Route124_DivingTreasureHuntersHouse_EventScript_270F4D:: @ 8270F4D
- msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, MSGBOX_DEFAULT
+Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade:: @ 8270F4D
+ msgbox Route124_DivingTreasureHuntersHouse_Text_ComeBackIfYouChangeMind, MSGBOX_DEFAULT
release
end
-Route124_DivingTreasureHuntersHouse_EventScript_270F57:: @ 8270F57
- msgbox Route124_DivingTreasureHuntersHouse_Text_271027, MSGBOX_DEFAULT
+Route124_DivingTreasureHuntersHouse_EventScript_NoShards:: @ 8270F57
+ msgbox Route124_DivingTreasureHuntersHouse_Text_YouHaventGotAnyShards, MSGBOX_DEFAULT
release
end
-Route124_DivingTreasureHuntersHouse_EventScript_270F61:: @ 8270F61
+Route124_DivingTreasureHuntersHouse_EventScript_EndTrade:: @ 8270F61
release
end
-Route124_DivingTreasureHuntersHouse_EventScript_270F63:: @ 8270F63
- msgbox Route124_DivingTreasureHuntersHouse_Text_271217, MSGBOX_SIGN
+Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard:: @ 8270F63
+ msgbox Route124_DivingTreasureHuntersHouse_Text_ShardTradeBoard, MSGBOX_SIGN
end
-Route124_DivingTreasureHuntersHouse_Text_270F6C: @ 8270F6C
+Route124_DivingTreasureHuntersHouse_Text_Greeting: @ 8270F6C
.string "I'm the DIVING TREASURE HUNTER!\p"
.string "I'm the awesome dude who makes\n"
.string "deep-sea dives to gather treasures\l"
.string "resting at the bottom.$"
-Route124_DivingTreasureHuntersHouse_Text_270FE5: @ 8270FE5
+Route124_DivingTreasureHuntersHouse_Text_HaveYouSeenAnyShards: @ 8270FE5
.string "Tell me, have you seen any SHARDS of\n"
.string "tools made in ancient times?$"
-Route124_DivingTreasureHuntersHouse_Text_271027: @ 8271027
+Route124_DivingTreasureHuntersHouse_Text_YouHaventGotAnyShards: @ 8271027
.string "You haven't got any treasures\n"
.string "for me…\p"
.string "If you see any SHARDS, like the RED\n"
.string "SHARD, you've got to trade it with me!$"
-Route124_DivingTreasureHuntersHouse_Text_271098: @ 8271098
+Route124_DivingTreasureHuntersHouse_Text_ThatsAShardIllTradeYou: @ 8271098
.string "Oh, hey! That…\n"
.string "That's a SHARD! I'm looking for those!\p"
.string "Oh, man, you've got to trade that\n"
.string "with me! I'll give you something good!$"
-Route124_DivingTreasureHuntersHouse_Text_271117: @ 8271117
+Route124_DivingTreasureHuntersHouse_Text_WhatDoYouWantToTrade: @ 8271117
.string "What do you want to trade?$"
-Route124_DivingTreasureHuntersHouse_Text_271132: @ 8271132
+Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone: @ 8271132
.string "You'll trade your {STR_VAR_1} for\n"
.string "my {STR_VAR_2}, then?$"
-Route124_DivingTreasureHuntersHouse_Text_271158: @ 8271158
+Route124_DivingTreasureHuntersHouse_Text_ItsADeal: @ 8271158
.string "It's a done deal!\n"
.string "Use that wisely!$"
-Route124_DivingTreasureHuntersHouse_Text_27117B: @ 827117B
+Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse: @ 827117B
.string "Do you want to trade something else?$"
-Route124_DivingTreasureHuntersHouse_Text_2711A0: @ 82711A0
+Route124_DivingTreasureHuntersHouse_Text_BagFull: @ 82711A0
.string "Whoops, your BAG's full.\n"
.string "Get rid of some items, friend!$"
-Route124_DivingTreasureHuntersHouse_Text_2711D8: @ 82711D8
+Route124_DivingTreasureHuntersHouse_Text_ComeBackIfYouChangeMind: @ 82711D8
.string "No? That's a downer.\n"
.string "Well, if you change your mind, come back.$"
-Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217
+Route124_DivingTreasureHuntersHouse_Text_ShardTradeBoard: @ 8271217
.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
.string "{CLEAR_TO 0x0f}RED SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x7b}FIRE STONE{CLEAR_TO 0xc8}\p"
.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"