summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/maps/OldaleTown/map.json16
-rw-r--r--data/maps/OldaleTown/scripts.inc203
-rw-r--r--data/maps/OldaleTown_House1/map.json2
-rw-r--r--data/maps/OldaleTown_House1/scripts.inc6
-rw-r--r--data/maps/OldaleTown_House2/map.json4
-rw-r--r--data/maps/OldaleTown_House2/scripts.inc12
-rw-r--r--data/maps/OldaleTown_Mart/map.json6
-rw-r--r--data/maps/OldaleTown_Mart/scripts.inc34
-rw-r--r--data/maps/OldaleTown_PokemonCenter_1F/map.json8
-rw-r--r--data/maps/OldaleTown_PokemonCenter_1F/scripts.inc28
10 files changed, 160 insertions, 159 deletions
diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json
index 5f91e81ed..3e3fb93d3 100644
--- a/data/maps/OldaleTown/map.json
+++ b/data/maps/OldaleTown/map.json
@@ -40,7 +40,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_EventScript_1E8EF3",
+ "script": "OldaleTown_EventScript_Girl",
"flag": "0"
},
{
@@ -53,7 +53,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_EventScript_1E8EFC",
+ "script": "OldaleTown_EventScript_MartEmployee",
"flag": "0"
},
{
@@ -79,7 +79,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_EventScript_1E9070",
+ "script": "OldaleTown_EventScript_Rival",
"flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL"
}
],
@@ -121,7 +121,7 @@
"elevation": 3,
"var": "VAR_OLDALE_TOWN_STATE",
"var_value": "0",
- "script": "OldaleTown_EventScript_1E903F"
+ "script": "OldaleTown_EventScript_BlockedPath"
},
{
"type": "trigger",
@@ -130,7 +130,7 @@
"elevation": 3,
"var": "VAR_OLDALE_RIVAL_STATE",
"var_value": "1",
- "script": "OldaleTown_EventScript_1E9086"
+ "script": "OldaleTown_EventScript_RivalTrigger1"
},
{
"type": "trigger",
@@ -139,7 +139,7 @@
"elevation": 3,
"var": "VAR_OLDALE_RIVAL_STATE",
"var_value": "1",
- "script": "OldaleTown_EventScript_1E90A6"
+ "script": "OldaleTown_EventScript_RivalTrigger2"
},
{
"type": "trigger",
@@ -148,7 +148,7 @@
"elevation": 3,
"var": "VAR_OLDALE_RIVAL_STATE",
"var_value": "1",
- "script": "OldaleTown_EventScript_1E90C6"
+ "script": "OldaleTown_EventScript_RivalTrigger3"
}
],
"bg_events": [
@@ -158,7 +158,7 @@
"y": 9,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "OldaleTown_EventScript_1E8EEA"
+ "script": "OldaleTown_EventScript_CitySign"
},
{
"type": "sign",
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index 8e3950cae..5f9c9d6d5 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -5,92 +5,93 @@ OldaleTown_MapScripts:: @ 81E8EA2
OldaleTown_OnTransition: @ 81E8EA8
call Common_EventScript_SetupRivalGfxId
setflag FLAG_VISITED_OLDALE_TOWN
- call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2
- call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE
- call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ECC
+ call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_BlockWestEntrance
+ call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_MoveMartEmployee
+ call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_SetOldaleState
end
-OldaleTown_EventScript_1E8ECC:: @ 81E8ECC
+@ This script seems pointless because nothing uses VAR_OLDALE_TOWN_STATE
+OldaleTown_EventScript_SetOldaleState:: @ 81E8ECC
setvar VAR_OLDALE_TOWN_STATE, 1
return
-OldaleTown_EventScript_1E8ED2:: @ 81E8ED2
+OldaleTown_EventScript_BlockWestEntrance:: @ 81E8ED2
setobjectxyperm 3, 1, 11
setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT
return
-OldaleTown_EventScript_1E8EDE:: @ 81E8EDE
+OldaleTown_EventScript_MoveMartEmployee:: @ 81E8EDE
setobjectxyperm 2, 13, 14
setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN
return
-OldaleTown_EventScript_1E8EEA:: @ 81E8EEA
- msgbox OldaleTown_Text_1E94DA, MSGBOX_SIGN
+OldaleTown_EventScript_CitySign:: @ 81E8EEA
+ msgbox OldaleTown_Text_CitySign, MSGBOX_SIGN
end
-OldaleTown_EventScript_1E8EF3:: @ 81E8EF3
- msgbox OldaleTown_Text_1E918E, MSGBOX_NPC
+OldaleTown_EventScript_Girl:: @ 81E8EF3
+ msgbox OldaleTown_Text_SavingMyProgress, MSGBOX_NPC
end
-OldaleTown_EventScript_1E8EFC:: @ 81E8EFC
+OldaleTown_EventScript_MartEmployee:: @ 81E8EFC
lock
faceplayer
- goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8FB9
- goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_1E8FB9
+ goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_ExplainPotion
+ goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_ExplainPotion
setflag FLAG_TEMP_1
playbgm MUS_TSURETEK, 0
- msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT
+ msgbox OldaleTown_Text_IWorkAtPokemonMart, MSGBOX_DEFAULT
closemessage
switch VAR_FACING
- case DIR_SOUTH, OldaleTown_EventScript_1E8F47
- case DIR_NORTH, OldaleTown_EventScript_1E8F5E
- case DIR_EAST, OldaleTown_EventScript_1E8F75
+ case DIR_SOUTH, OldaleTown_EventScript_GoToMartSouth
+ case DIR_NORTH, OldaleTown_EventScript_GoToMartNorth
+ case DIR_EAST, OldaleTown_EventScript_GoToMartEast
end
-OldaleTown_EventScript_1E8F47:: @ 81E8F47
- applymovement 2, OldaleTown_Movement_1E8FD7
- applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9001
+OldaleTown_EventScript_GoToMartSouth:: @ 81E8F47
+ applymovement 2, OldaleTown_Movement_EmployeeSouth
+ applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerSouth
waitmovement 0
- goto OldaleTown_EventScript_1E8F8C
+ goto OldaleTown_EventScript_ExplainPokemonMart
end
-OldaleTown_EventScript_1E8F5E:: @ 81E8F5E
- applymovement 2, OldaleTown_Movement_1E8FE2
- applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E900B
+OldaleTown_EventScript_GoToMartNorth:: @ 81E8F5E
+ applymovement 2, OldaleTown_Movement_EmployeeNorth
+ applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerNorth
waitmovement 0
- goto OldaleTown_EventScript_1E8F8C
+ goto OldaleTown_EventScript_ExplainPokemonMart
end
-OldaleTown_EventScript_1E8F75:: @ 81E8F75
- applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E8FF9
- applymovement 2, OldaleTown_Movement_1E8FCE
+OldaleTown_EventScript_GoToMartEast:: @ 81E8F75
+ applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerEast
+ applymovement 2, OldaleTown_Movement_EmployeeEast
waitmovement 0
- goto OldaleTown_EventScript_1E8F8C
+ goto OldaleTown_EventScript_ExplainPokemonMart
end
-OldaleTown_EventScript_1E8F8C:: @ 81E8F8C
- msgbox OldaleTown_Text_1E91FD, MSGBOX_DEFAULT
+OldaleTown_EventScript_ExplainPokemonMart:: @ 81E8F8C
+ msgbox OldaleTown_Text_ThisIsAPokemonMart, MSGBOX_DEFAULT
giveitem_std ITEM_POTION
compare VAR_RESULT, 0
- goto_if_eq OldaleTown_EventScript_1E8FC3
- msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT
+ goto_if_eq OldaleTown_EventScript_BagIsFull
+ msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_POTION_OLDALE
fadedefaultbgm
release
end
-OldaleTown_EventScript_1E8FB9:: @ 81E8FB9
- msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT
+OldaleTown_EventScript_ExplainPotion:: @ 81E8FB9
+ msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT
release
end
-OldaleTown_EventScript_1E8FC3:: @ 81E8FC3
+OldaleTown_EventScript_BagIsFull:: @ 81E8FC3
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
fadedefaultbgm
release
end
-OldaleTown_Movement_1E8FCE: @ 81E8FCE
+OldaleTown_Movement_EmployeeEast: @ 81E8FCE
walk_up
walk_up
walk_up
@@ -101,7 +102,7 @@ OldaleTown_Movement_1E8FCE: @ 81E8FCE
walk_in_place_fastest_down
step_end
-OldaleTown_Movement_1E8FD7: @ 81E8FD7
+OldaleTown_Movement_EmployeeSouth: @ 81E8FD7
walk_left
walk_up
walk_up
@@ -114,7 +115,7 @@ OldaleTown_Movement_1E8FD7: @ 81E8FD7
walk_in_place_fastest_down
step_end
-OldaleTown_Movement_1E8FE2: @ 81E8FE2
+OldaleTown_Movement_EmployeeNorth: @ 81E8FE2
walk_up
walk_up
walk_up
@@ -125,7 +126,7 @@ OldaleTown_Movement_1E8FE2: @ 81E8FE2
walk_in_place_fastest_down
step_end
-OldaleTown_Movement_1E8FEB: @ 81E8FEB
+OldaleTown_Movement_Unknown1: @ 81E8FEB
walk_up
walk_up
walk_right
@@ -141,7 +142,7 @@ OldaleTown_Movement_1E8FEB: @ 81E8FEB
walk_in_place_fastest_down
step_end
-OldaleTown_Movement_1E8FF9: @ 81E8FF9
+OldaleTown_Movement_PlayerEast: @ 81E8FF9
walk_right
walk_up
walk_up
@@ -151,7 +152,7 @@ OldaleTown_Movement_1E8FF9: @ 81E8FF9
walk_up
step_end
-OldaleTown_Movement_1E9001: @ 81E9001
+OldaleTown_Movement_PlayerSouth: @ 81E9001
delay_16
delay_16
delay_16
@@ -163,7 +164,7 @@ OldaleTown_Movement_1E9001: @ 81E9001
walk_up
step_end
-OldaleTown_Movement_1E900B: @ 81E900B
+OldaleTown_Movement_PlayerNorth: @ 81E900B
walk_up
walk_up
walk_up
@@ -173,7 +174,7 @@ OldaleTown_Movement_1E900B: @ 81E900B
walk_up
step_end
-OldaleTown_Movement_1E9013: @ 81E9013
+OldaleTown_Movement_Unknown2: @ 81E9013
walk_left
walk_up
walk_up
@@ -190,94 +191,94 @@ OldaleTown_Movement_1E9013: @ 81E9013
OldaleTown_EventScript_1E901F:: @ 81E901F
lock
faceplayer
- goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066
- msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT
+ goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_NotBlockingPath
+ msgbox OldaleTown_Text_DiscoveredFootprints, MSGBOX_DEFAULT
closemessage
applymovement 3, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-OldaleTown_EventScript_1E903F:: @ 81E903F
+OldaleTown_EventScript_BlockedPath:: @ 81E903F
lockall
- applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9182
- applymovement 3, OldaleTown_Movement_1E9185
+ applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerStepBack
+ applymovement 3, OldaleTown_Movement_BackUp
waitmovement 0
- msgbox OldaleTown_Text_1E9313, MSGBOX_DEFAULT
+ msgbox OldaleTown_Text_WaitDontComeInHere, MSGBOX_DEFAULT
closemessage
- applymovement 3, OldaleTown_Movement_1E918B
+ applymovement 3, OldaleTown_Movement_ReturnToOriginalPosition
waitmovement 0
releaseall
end
-OldaleTown_EventScript_1E9066:: @ 81E9066
- msgbox OldaleTown_Text_1E93F8, MSGBOX_DEFAULT
+OldaleTown_EventScript_NotBlockingPath:: @ 81E9066
+ msgbox OldaleTown_Text_FinishedSketchingFootprints, MSGBOX_DEFAULT
release
end
-OldaleTown_EventScript_1E9070:: @ 81E9070
+OldaleTown_EventScript_Rival:: @ 81E9070
lockall
applymovement 4, Common_Movement_FacePlayer
waitmovement 0
setvar VAR_0x8009, 0
- goto OldaleTown_EventScript_1E90E6
+ goto OldaleTown_EventScript_ShowRivalMessage
end
-OldaleTown_EventScript_1E9086:: @ 81E9086
+OldaleTown_EventScript_RivalTrigger1:: @ 81E9086
lockall
- applymovement 4, OldaleTown_Movement_1E9170
+ applymovement 4, OldaleTown_Movement_RivalApproachPlayer1
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
setvar VAR_0x8009, 1
- goto OldaleTown_EventScript_1E90E6
+ goto OldaleTown_EventScript_ShowRivalMessage
end
-OldaleTown_EventScript_1E90A6:: @ 81E90A6
+OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6
lockall
- applymovement 4, OldaleTown_Movement_1E9173
+ applymovement 4, OldaleTown_Movement_RivalApproachPlayer2
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
setvar VAR_0x8009, 1
- goto OldaleTown_EventScript_1E90E6
+ goto OldaleTown_EventScript_ShowRivalMessage
end
-OldaleTown_EventScript_1E90C6:: @ 81E90C6
+OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6
lockall
- applymovement 4, OldaleTown_Movement_1E9175
+ applymovement 4, OldaleTown_Movement_RivalApproachPlayer3
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
setvar VAR_0x8009, 1
- goto OldaleTown_EventScript_1E90E6
+ goto OldaleTown_EventScript_ShowRivalMessage
end
-OldaleTown_EventScript_1E90E6:: @ 81E90E6
+OldaleTown_EventScript_ShowRivalMessage:: @ 81E90E6
checkplayergender
compare VAR_RESULT, MALE
- goto_if_eq OldaleTown_EventScript_1E90FE
+ goto_if_eq OldaleTown_EventScript_ShowMayMessage
compare VAR_RESULT, FEMALE
- goto_if_eq OldaleTown_EventScript_1E910C
+ goto_if_eq OldaleTown_EventScript_ShowBrendanMessage
end
-OldaleTown_EventScript_1E90FE:: @ 81E90FE
- msgbox OldaleTown_Text_1E9462, MSGBOX_DEFAULT
- goto OldaleTown_EventScript_1E911A
+OldaleTown_EventScript_ShowMayMessage:: @ 81E90FE
+ msgbox OldaleTown_Text_MayLetsGoBack, MSGBOX_DEFAULT
+ goto OldaleTown_EventScript_RivalFinish
end
-OldaleTown_EventScript_1E910C:: @ 81E910C
- msgbox OldaleTown_Text_1E948A, MSGBOX_DEFAULT
- goto OldaleTown_EventScript_1E911A
+OldaleTown_EventScript_ShowBrendanMessage:: @ 81E910C
+ msgbox OldaleTown_Text_BrendanLetsGoBack, MSGBOX_DEFAULT
+ goto OldaleTown_EventScript_RivalFinish
end
-OldaleTown_EventScript_1E911A:: @ 81E911A
+OldaleTown_EventScript_RivalFinish:: @ 81E911A
closemessage
compare VAR_0x8009, 0
- call_if_eq OldaleTown_EventScript_1E9148
+ call_if_eq OldaleTown_EventScript_DoExitMovement1
compare VAR_0x8009, 1
- call_if_eq OldaleTown_EventScript_1E915E
- applymovement 4, OldaleTown_Movement_1E9177
+ call_if_eq OldaleTown_EventScript_DoExitMovement2
+ applymovement 4, OldaleTown_Movement_RivalExit
waitmovement 0
removeobject 4
setvar VAR_OLDALE_RIVAL_STATE, 2
@@ -285,33 +286,33 @@ OldaleTown_EventScript_1E911A:: @ 81E911A
releaseall
end
-OldaleTown_EventScript_1E9148:: @ 81E9148
+OldaleTown_EventScript_DoExitMovement1:: @ 81E9148
compare VAR_FACING, DIR_SOUTH
- goto_if_ne OldaleTown_EventScript_1E915E
- applymovement 4, OldaleTown_Movement_1E9177
+ goto_if_ne OldaleTown_EventScript_DoExitMovement2
+ applymovement 4, OldaleTown_Movement_RivalExit
waitmovement 0
return
-OldaleTown_EventScript_1E915E:: @ 81E915E
- applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E917E
- applymovement 4, OldaleTown_Movement_1E9177
+OldaleTown_EventScript_DoExitMovement2:: @ 81E915E
+ applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_WatchRivalExit
+ applymovement 4, OldaleTown_Movement_RivalExit
waitmovement 0
return
-OldaleTown_Movement_1E9170: @ 81E9170
+OldaleTown_Movement_RivalApproachPlayer1: @ 81E9170
walk_left
walk_left
step_end
-OldaleTown_Movement_1E9173: @ 81E9173
+OldaleTown_Movement_RivalApproachPlayer2: @ 81E9173
walk_left
step_end
-OldaleTown_Movement_1E9175: @ 81E9175
+OldaleTown_Movement_RivalApproachPlayer3: @ 81E9175
face_left
step_end
-OldaleTown_Movement_1E9177: @ 81E9177
+OldaleTown_Movement_RivalExit: @ 81E9177
walk_down
walk_down
walk_down
@@ -320,18 +321,18 @@ OldaleTown_Movement_1E9177: @ 81E9177
walk_down
step_end
-OldaleTown_Movement_1E917E: @ 81E917E
+OldaleTown_Movement_WatchRivalExit: @ 81E917E
delay_8
delay_4
walk_in_place_fastest_down
step_end
-OldaleTown_Movement_1E9182: @ 81E9182
+OldaleTown_Movement_PlayerStepBack: @ 81E9182
delay_8
walk_right
step_end
-OldaleTown_Movement_1E9185: @ 81E9185
+OldaleTown_Movement_BackUp: @ 81E9185
walk_fast_up
walk_in_place_fastest_left
lock_facing_direction
@@ -339,21 +340,21 @@ OldaleTown_Movement_1E9185: @ 81E9185
unlock_facing_direction
step_end
-OldaleTown_Movement_1E918B: @ 81E918B
+OldaleTown_Movement_ReturnToOriginalPosition: @ 81E918B
walk_down
walk_left
step_end
-OldaleTown_Text_1E918E: @ 81E918E
+OldaleTown_Text_SavingMyProgress: @ 81E918E
.string "I want to take a rest, so I'm saving my\n"
.string "progress.$"
-OldaleTown_Text_1E91C0: @ 81E91C0
+OldaleTown_Text_IWorkAtPokemonMart: @ 81E91C0
.string "Hi!\n"
.string "I work at a POKéMON MART.\p"
.string "Can I get you to come with me?$"
-OldaleTown_Text_1E91FD: @ 81E91FD
+OldaleTown_Text_ThisIsAPokemonMart: @ 81E91FD
.string "This is a POKéMON MART.\n"
.string "Just look for our blue roof.\p"
.string "We sell a variety of goods including\n"
@@ -361,12 +362,12 @@ OldaleTown_Text_1E91FD: @ 81E91FD
.string "Here, I'd like you to have this as\n"
.string "a promotional item.$"
-OldaleTown_Text_1E92AF: @ 81E92AF
+OldaleTown_Text_PotionExplanation: @ 81E92AF
.string "A POTION can be used anytime, so it's\n"
.string "even more useful than a POKéMON CENTER\l"
.string "in certain situations.$"
-OldaleTown_Text_1E9313: @ 81E9313
+OldaleTown_Text_WaitDontComeInHere: @ 81E9313
.string "Aaaaah! Wait!\n"
.string "Please don't come in here.\p"
.string "I just discovered the footprints of\n"
@@ -374,29 +375,29 @@ OldaleTown_Text_1E9313: @ 81E9313
.string "Wait until I finish sketching\n"
.string "them, okay?$"
-OldaleTown_Text_1E939A: @ 81E939A
+OldaleTown_Text_DiscoveredFootprints: @ 81E939A
.string "I just discovered the footprints of\n"
.string "a rare POKéMON!\p"
.string "Wait until I finish sketching\n"
.string "them, okay?$"
-OldaleTown_Text_1E93F8: @ 81E93F8
+OldaleTown_Text_FinishedSketchingFootprints: @ 81E93F8
.string "I finished sketching the footprints of\n"
.string "a rare POKéMON.\p"
.string "But it turns out they were only my\n"
.string "own footprints…$"
-OldaleTown_Text_1E9462: @ 81E9462
+OldaleTown_Text_MayLetsGoBack: @ 81E9462
.string "MAY: {PLAYER}{KUN}!\n"
.string "Over here!\l"
.string "Let's hurry home!$"
-OldaleTown_Text_1E948A: @ 81E948A
+OldaleTown_Text_BrendanLetsGoBack: @ 81E948A
.string "BRENDAN: I'm heading back to my dad's\n"
.string "LAB now.\l"
.string "{PLAYER}, you should hustle back, too.$"
-OldaleTown_Text_1E94DA: @ 81E94DA
+OldaleTown_Text_CitySign: @ 81E94DA
.string "OLDALE TOWN\n"
.string "“Where things start off scarce.”$"
diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json
index aa837378c..03155a623 100644
--- a/data/maps/OldaleTown_House1/map.json
+++ b/data/maps/OldaleTown_House1/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_House1_EventScript_1FBE86",
+ "script": "OldaleTown_House1_EventScript_Woman",
"flag": "0"
}
],
diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc
index 71010116e..1cb5622ef 100644
--- a/data/maps/OldaleTown_House1/scripts.inc
+++ b/data/maps/OldaleTown_House1/scripts.inc
@@ -1,11 +1,11 @@
OldaleTown_House1_MapScripts:: @ 81FBE85
.byte 0
-OldaleTown_House1_EventScript_1FBE86:: @ 81FBE86
- msgbox OldaleTown_House1_Text_1FBE8F, MSGBOX_NPC
+OldaleTown_House1_EventScript_Woman:: @ 81FBE86
+ msgbox OldaleTown_House1_Text_LeftPokemonGoesOutFirst, MSGBOX_NPC
end
-OldaleTown_House1_Text_1FBE8F: @ 81FBE8F
+OldaleTown_House1_Text_LeftPokemonGoesOutFirst: @ 81FBE8F
.string "When a POKéMON battle starts, the one\n"
.string "at the left of the list goes out first.\p"
.string "So, when you get more POKéMON in your\n"
diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json
index fbcf968e7..754f98c49 100644
--- a/data/maps/OldaleTown_House2/map.json
+++ b/data/maps/OldaleTown_House2/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_House2_EventScript_1FBF5B",
+ "script": "OldaleTown_House2_EventScript_Woman",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_House2_EventScript_1FBF64",
+ "script": "OldaleTown_House2_EventScript_Man",
"flag": "0"
}
],
diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc
index 74a9a06d3..3259e319c 100644
--- a/data/maps/OldaleTown_House2/scripts.inc
+++ b/data/maps/OldaleTown_House2/scripts.inc
@@ -1,19 +1,19 @@
OldaleTown_House2_MapScripts:: @ 81FBF5A
.byte 0
-OldaleTown_House2_EventScript_1FBF5B:: @ 81FBF5B
- msgbox OldaleTown_House2_Text_1FBF6D, MSGBOX_NPC
+OldaleTown_House2_EventScript_Woman:: @ 81FBF5B
+ msgbox OldaleTown_House2_Text_PokemonLevelUp, MSGBOX_NPC
end
-OldaleTown_House2_EventScript_1FBF64:: @ 81FBF64
- msgbox OldaleTown_House2_Text_1FBFB0, MSGBOX_NPC
+OldaleTown_House2_EventScript_Man:: @ 81FBF64
+ msgbox OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon, MSGBOX_NPC
end
-OldaleTown_House2_Text_1FBF6D: @ 81FBF6D
+OldaleTown_House2_Text_PokemonLevelUp: @ 81FBF6D
.string "When POKéMON battle, they eventually\n"
.string "level up and become stronger.$"
-OldaleTown_House2_Text_1FBFB0: @ 81FBFB0
+OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon: @ 81FBFB0
.string "If the POKéMON with you become\n"
.string "stronger, you'll be able to go farther\l"
.string "away from here.$"
diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json
index 9f1f894ce..a27fad497 100644
--- a/data/maps/OldaleTown_Mart/map.json
+++ b/data/maps/OldaleTown_Mart/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_Mart_EventScript_1FC240",
+ "script": "OldaleTown_Mart_EventScript_Clerk",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_Mart_EventScript_1FC28A",
+ "script": "OldaleTown_Mart_EventScript_Woman",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_Mart_EventScript_1FC2A9",
+ "script": "OldaleTown_Mart_EventScript_Boy",
"flag": "0"
}
],
diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc
index 38b978d45..33d26cbfb 100644
--- a/data/maps/OldaleTown_Mart/scripts.inc
+++ b/data/maps/OldaleTown_Mart/scripts.inc
@@ -1,18 +1,18 @@
OldaleTown_Mart_MapScripts:: @ 81FC23F
.byte 0
-OldaleTown_Mart_EventScript_1FC240:: @ 81FC240
+OldaleTown_Mart_EventScript_Clerk:: @ 81FC240
lock
faceplayer
message gText_HowMayIServeYou
waitmessage
- goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC26C
- pokemart OldaleTown_Mart_Pokemart_1FC260
+ goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_ExpandedItems
+ pokemart OldaleTown_Mart_Pokemart_Basic
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
-OldaleTown_Mart_Pokemart_1FC260: @ 81FC260
+OldaleTown_Mart_Pokemart_Basic: @ 81FC260
.2byte ITEM_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
@@ -21,14 +21,14 @@ OldaleTown_Mart_Pokemart_1FC260: @ 81FC260
release
end
-OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C
- pokemart OldaleTown_Mart_Pokemart_1FC27C
+OldaleTown_Mart_ExpandedItems:: @ 81FC26C
+ pokemart OldaleTown_Mart_Pokemart_Expanded
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
.align 2
-OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C
+OldaleTown_Mart_Pokemart_Expanded: @ 81FC27C
.2byte ITEM_POKE_BALL
.2byte ITEM_POTION
.2byte ITEM_ANTIDOTE
@@ -38,32 +38,32 @@ OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C
release
end
-OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A
+OldaleTown_Mart_EventScript_Woman:: @ 81FC28A
lock
faceplayer
- goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC29F
- msgbox OldaleTown_Mart_Text_1FC2B2, MSGBOX_DEFAULT
+ goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_PokeBallsInStock
+ msgbox OldaleTown_Mart_Text_PokeBallsAreSoldOut, MSGBOX_DEFAULT
release
end
-OldaleTown_Mart_EventScript_1FC29F:: @ 81FC29F
- msgbox OldaleTown_Mart_Text_1FC2F3, MSGBOX_DEFAULT
+OldaleTown_Mart_EventScript_PokeBallsInStock:: @ 81FC29F
+ msgbox OldaleTown_Mart_Text_ImGoingToBuyPokeBalls, MSGBOX_DEFAULT
release
end
-OldaleTown_Mart_EventScript_1FC2A9:: @ 81FC2A9
- msgbox OldaleTown_Mart_Text_1FC338, MSGBOX_NPC
+OldaleTown_Mart_EventScript_Boy:: @ 81FC2A9
+ msgbox OldaleTown_Mart_Text_RestoreHPWithPotion, MSGBOX_NPC
end
-OldaleTown_Mart_Text_1FC2B2: @ 81FC2B2
+OldaleTown_Mart_Text_PokeBallsAreSoldOut: @ 81FC2B2
.string "The clerk says they're all sold out.\n"
.string "I can't buy any POKé BALLS.$"
-OldaleTown_Mart_Text_1FC2F3: @ 81FC2F3
+OldaleTown_Mart_Text_ImGoingToBuyPokeBalls: @ 81FC2F3
.string "I'm going to buy a bunch of POKé BALLS\n"
.string "and catch a bunch of POKéMON!$"
-OldaleTown_Mart_Text_1FC338: @ 81FC338
+OldaleTown_Mart_Text_RestoreHPWithPotion: @ 81FC338
.string "If a POKéMON gets hurt and loses its HP\n"
.string "and faints, it won't be able to battle.\p"
.string "To prevent your POKéMON from fainting,\n"
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json
index 7c9ed89a0..2f92a004c 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/map.json
+++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC01A",
+ "script": "OldaleTown_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC028",
+ "script": "OldaleTown_PokemonCenter_1F_EventScript_Gentleman",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC031",
+ "script": "OldaleTown_PokemonCenter_1F_EventScript_Boy",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC03A",
+ "script": "OldaleTown_PokemonCenter_1F_EventScript_Girl",
"flag": "0"
}
],
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index 9df202d09..4e54cc8e4 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011
call Common_EventScript_UpdateBrineyLocation
end
-OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A
+OldaleTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC01A
setvar VAR_0x800B, 1
call Common_EventScript_PkmnCenterNurse
waitmessage
@@ -16,46 +16,46 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A
release
end
-OldaleTown_PokemonCenter_1F_EventScript_1FC028:: @ 81FC028
- msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, MSGBOX_NPC
+OldaleTown_PokemonCenter_1F_EventScript_Gentleman:: @ 81FC028
+ msgbox OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC, MSGBOX_NPC
end
-OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031
- msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, MSGBOX_NPC
+OldaleTown_PokemonCenter_1F_EventScript_Boy:: @ 81FC031
+ msgbox OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat, MSGBOX_NPC
end
-OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A
+OldaleTown_PokemonCenter_1F_EventScript_Girl:: @ 81FC03A
lock
faceplayer
- goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_1FC04F
- msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, MSGBOX_DEFAULT
+ goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable
+ msgbox OldaleTown_PokemonCenter_1F_Text_WirelessClubNotAvailable, MSGBOX_DEFAULT
release
end
-OldaleTown_PokemonCenter_1F_EventScript_1FC04F:: @ 81FC04F
- msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, MSGBOX_DEFAULT
+OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable:: @ 81FC04F
+ msgbox OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub, MSGBOX_DEFAULT
release
end
-OldaleTown_PokemonCenter_1F_Text_1FC059: @ 81FC059
+OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC: @ 81FC059
.string "That PC in the corner there is\n"
.string "for any POKéMON TRAINER to use.\p"
.string "Naturally, that means you're welcome\n"
.string "to use it, too.$"
-OldaleTown_PokemonCenter_1F_Text_1FC0CD: @ 81FC0CD
+OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat: @ 81FC0CD
.string "POKéMON CENTERS are great!\p"
.string "You can use their services as much\n"
.string "as you like, and it's all for free.\l"
.string "You never have to worry!$"
-OldaleTown_PokemonCenter_1F_Text_1FC148: @ 81FC148
+OldaleTown_PokemonCenter_1F_Text_WirelessClubNotAvailable: @ 81FC148
.string "The POKéMON WIRELESS CLUB on\n"
.string "the second floor was built recently.\p"
.string "But they say they're still making\n"
.string "adjustments.$"
-OldaleTown_PokemonCenter_1F_Text_1FC1B9: @ 81FC1B9
+OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub: @ 81FC1B9
.string "The POKéMON WIRELESS CLUB on\n"
.string "the second floor was built recently.\p"
.string "I traded POKéMON right away.$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-14 11:49:08 +0000