summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/maps/MauvilleCity/map.json24
-rw-r--r--data/maps/MauvilleCity/scripts.inc314
-rw-r--r--include/event_scripts.h2
-rw-r--r--src/field_control_avatar.c2
4 files changed, 171 insertions, 171 deletions
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
index d5dc8ae99..1708008bd 100644
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@@ -45,7 +45,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_EventScript_1DF3B3",
+ "script": "MauvilleCity_EventScript_Boy",
"flag": "0"
},
{
@@ -58,7 +58,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_EventScript_1DF3CE",
+ "script": "MauvilleCity_EventScript_RichBoy",
"flag": "0"
},
{
@@ -71,7 +71,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_EventScript_1DF3BC",
+ "script": "MauvilleCity_EventScript_Maniac",
"flag": "0"
},
{
@@ -84,7 +84,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_EventScript_1DF3C5",
+ "script": "MauvilleCity_EventScript_Woman",
"flag": "0"
},
{
@@ -97,7 +97,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_EventScript_1DF3FB",
+ "script": "MauvilleCity_EventScript_SchoolKidM",
"flag": "0"
},
{
@@ -110,7 +110,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_EventScript_1DF452",
+ "script": "MauvilleCity_EventScript_Wally",
"flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY"
},
{
@@ -123,7 +123,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_EventScript_1DF41D",
+ "script": "MauvilleCity_EventScript_WallysUncle",
"flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE"
},
{
@@ -136,7 +136,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_EventScript_1DF73A",
+ "script": "MauvilleCity_EventScript_Wattson",
"flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON"
},
{
@@ -246,7 +246,7 @@
"y": 6,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_EventScript_1DF3E0"
+ "script": "MauvilleCity_EventScript_GymSign"
},
{
"type": "sign",
@@ -278,7 +278,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_EventScript_1DF3D7"
+ "script": "MauvilleCity_EventScript_CitySign"
},
{
"type": "sign",
@@ -286,7 +286,7 @@
"y": 6,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_EventScript_1DF3E9"
+ "script": "MauvilleCity_EventScript_BikeShopSign"
},
{
"type": "sign",
@@ -294,7 +294,7 @@
"y": 15,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_EventScript_1DF3F2"
+ "script": "MauvilleCity_EventScript_GameCornerSign"
}
]
} \ No newline at end of file
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
index 7b853d596..3410664a1 100644
--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -9,88 +9,88 @@ MauvilleCity_OnTransition: @ 81DF38B
setflag FLAG_SYS_TV_START
clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
setvar VAR_MAUVILLE_GYM_STATE, 0
- call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9
+ call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_MoveWattsonBackToGym
end
-MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
+MauvilleCity_EventScript_MoveWattsonBackToGym:: @ 81DF3A9
clearflag FLAG_HIDE_MAUVILLE_GYM_WATTSON
setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
setflag FLAG_WATTSON_REMATCH_AVAILABLE
return
-MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3
- msgbox MauvilleCity_Text_1E0301, MSGBOX_NPC
+MauvilleCity_EventScript_Boy:: @ 81DF3B3
+ msgbox MauvilleCity_Text_NurseHurtMonBackToHealth, MSGBOX_NPC
end
-MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC
- msgbox MauvilleCity_Text_1E037C, MSGBOX_NPC
+MauvilleCity_EventScript_Maniac:: @ 81DF3BC
+ msgbox MauvilleCity_Text_AllSortsOfPeopleComeThrough, MSGBOX_NPC
end
-MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5
- msgbox MauvilleCity_Text_1E03FB, MSGBOX_NPC
+MauvilleCity_EventScript_Woman:: @ 81DF3C5
+ msgbox MauvilleCity_Text_RydelVeryGenerous, MSGBOX_NPC
end
-MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE
- msgbox MauvilleCity_Text_1E044A, MSGBOX_NPC
+MauvilleCity_EventScript_RichBoy:: @ 81DF3CE
+ msgbox MauvilleCity_Text_PokemonCanJumpYouOnBike, MSGBOX_NPC
end
-MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7
- msgbox MauvilleCity_Text_1E0485, MSGBOX_SIGN
+MauvilleCity_EventScript_CitySign:: @ 81DF3D7
+ msgbox MauvilleCity_Text_CitySign, MSGBOX_SIGN
end
-MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0
- msgbox MauvilleCity_Text_1E04B7, MSGBOX_SIGN
+MauvilleCity_EventScript_GymSign:: @ 81DF3E0
+ msgbox MauvilleCity_Text_GymSign, MSGBOX_SIGN
end
-MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9
- msgbox MauvilleCity_Text_1E0504, MSGBOX_SIGN
+MauvilleCity_EventScript_BikeShopSign:: @ 81DF3E9
+ msgbox MauvilleCity_Text_BikeShopSign, MSGBOX_SIGN
end
-MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2
- msgbox MauvilleCity_Text_1E053C, MSGBOX_SIGN
+MauvilleCity_EventScript_GameCornerSign:: @ 81DF3F2
+ msgbox MauvilleCity_Text_GameCornerSign, MSGBOX_SIGN
end
-MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB
+MauvilleCity_EventScript_SchoolKidM:: @ 81DF3FB
lock
faceplayer
- goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_1DF413
- msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT
+ goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_TVExplained
+ msgbox MauvilleCity_Text_ExplainTV, MSGBOX_DEFAULT
setflag FLAG_TV_EXPLAINED
release
end
-MauvilleCity_EventScript_1DF413:: @ 81DF413
- msgbox MauvilleCity_Text_1E0699, MSGBOX_DEFAULT
+MauvilleCity_EventScript_TVExplained:: @ 81DF413
+ msgbox MauvilleCity_Text_BeenCheckingOutTV, MSGBOX_DEFAULT
release
end
-MauvilleCity_EventScript_1DF41D:: @ 81DF41D
+MauvilleCity_EventScript_WallysUncle:: @ 81DF41D
lock
faceplayer
- goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D
- msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT
+ goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_UncleAskPlayerToBattleWally
+ msgbox MauvilleCity_Text_UncleHesTooPeppy, MSGBOX_DEFAULT
closemessage
applymovement 7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-MauvilleCity_EventScript_1DF43D:: @ 81DF43D
- msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT
+MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: @ 81DF43D
+ msgbox MauvilleCity_Text_UncleCanYouBattleWally, MSGBOX_DEFAULT
closemessage
applymovement 7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-MauvilleCity_EventScript_1DF452:: @ 81DF452
+MauvilleCity_EventScript_Wally:: @ 81DF452
lockall
- goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690
+ goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
- msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT
- msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT
- msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_WallyWantToChallengeGym, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_UncleYourePushingIt, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_WallyWeCanBeatAnyone, MSGBOX_DEFAULT
applymovement 6, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
@@ -98,61 +98,61 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452
waitmovement 0
applymovement 6, Common_Movement_Delay48
waitmovement 0
- msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO
- goto MauvilleCity_EventScript_1DF4AD
+ msgbox MauvilleCity_Text_WallyWillYouBattleMe, MSGBOX_YESNO
+ goto MauvilleCity_EventScript_BattleWallyPrompt
end
-MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD
+MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD
compare VAR_RESULT, YES
- call_if_eq MauvilleCity_EventScript_1DF63A
+ call_if_eq MauvilleCity_EventScript_BattleWally
compare VAR_RESULT, NO
- goto_if_eq MauvilleCity_EventScript_1DF683
+ goto_if_eq MauvilleCity_EventScript_DeclineWallyBattle
closemessage
switch VAR_FACING
- case DIR_NORTH, MauvilleCity_EventScript_1DF4E0
- case DIR_EAST, MauvilleCity_EventScript_1DF53D
+ case DIR_NORTH, MauvilleCity_EventScript_WallyAndUncleExitNorth
+ case DIR_EAST, MauvilleCity_EventScript_WallyAndUncleExitEast
end
-MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
- applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DF
- applymovement 6, MauvilleCity_Movement_1DF6A8
- applymovement 7, MauvilleCity_Movement_1DF6E2
+MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0
+ applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1
+ applymovement 6, MauvilleCity_Movement_WallyExitNorth1
+ applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth1
waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 30
- applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE
- applymovement 7, MauvilleCity_Movement_1DF6F3
+ applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth
+ applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerNorth
waitmovement 0
- msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT
closemessage
- applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6CC
- applymovement 7, MauvilleCity_Movement_1DF6FA
- applymovement 6, MauvilleCity_Movement_1DF6B4
+ applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2
+ applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth2
+ applymovement 6, MauvilleCity_Movement_WallyExitNorth2
waitmovement 0
- goto MauvilleCity_EventScript_1DF593
+ goto MauvilleCity_EventScript_DefeatedWally
end
-MauvilleCity_EventScript_1DF53D:: @ 81DF53D
- applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DC
- applymovement 6, MauvilleCity_Movement_1DF6AE
- applymovement 7, MauvilleCity_Movement_1DF6E8
+MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D
+ applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1
+ applymovement 6, MauvilleCity_Movement_WallyExitEast1
+ applymovement 7, MauvilleCity_Movement_WallysUncleExitEast1
waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 30
- applymovement 7, MauvilleCity_Movement_1DF6F7
+ applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerEast
waitmovement 0
- msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT
closemessage
- applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D0
- applymovement 7, MauvilleCity_Movement_1DF703
- applymovement 6, MauvilleCity_Movement_1DF6C0
+ applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2
+ applymovement 7, MauvilleCity_Movement_WallysUncleExitEast2
+ applymovement 6, MauvilleCity_Movement_WallyExitEast2
waitmovement 0
- goto MauvilleCity_EventScript_1DF593
+ goto MauvilleCity_EventScript_DefeatedWally
end
-MauvilleCity_EventScript_1DF593:: @ 81DF593
+MauvilleCity_EventScript_DefeatedWally:: @ 81DF593
removeobject 6
removeobject 7
clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
@@ -161,75 +161,75 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
setvar VAR_WALLY_CALL_STEP_COUNTER, 0
setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL
compare VAR_FACING, DIR_NORTH
- call_if_eq MauvilleCity_EventScript_1DF5F3
+ call_if_eq MauvilleCity_EventScript_ScottApproachPlayerNorth
compare VAR_FACING, DIR_EAST
- call_if_eq MauvilleCity_EventScript_1DF601
+ call_if_eq MauvilleCity_EventScript_ScottApproachPlayerEast
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
- msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT
closemessage
addvar VAR_SCOTT_STATE, 1
compare VAR_FACING, DIR_NORTH
- call_if_eq MauvilleCity_EventScript_1DF616
+ call_if_eq MauvilleCity_EventScript_ScottExitNorth
compare VAR_FACING, DIR_EAST
- call_if_eq MauvilleCity_EventScript_1DF628
+ call_if_eq MauvilleCity_EventScript_ScottExitEast
removeobject 11
releaseall
end
-MauvilleCity_EventScript_1DF5F3:: @ 81DF5F3
+MauvilleCity_EventScript_ScottApproachPlayerNorth:: @ 81DF5F3
addobject 11
- applymovement 11, MauvilleCity_Movement_1DF70D
+ applymovement 11, MauvilleCity_Movement_ScottApproachPlayerNorth
waitmovement 0
return
-MauvilleCity_EventScript_1DF601:: @ 81DF601
+MauvilleCity_EventScript_ScottApproachPlayerEast:: @ 81DF601
setobjectxyperm 11, 12, 13
addobject 11
- applymovement 11, MauvilleCity_Movement_1DF719
+ applymovement 11, MauvilleCity_Movement_ScottApproachPlayerEast
waitmovement 0
return
-MauvilleCity_EventScript_1DF616:: @ 81DF616
- applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D5
- applymovement 11, MauvilleCity_Movement_1DF725
+MauvilleCity_EventScript_ScottExitNorth:: @ 81DF616
+ applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth
+ applymovement 11, MauvilleCity_Movement_ScottExitNorth
waitmovement 0
return
-MauvilleCity_EventScript_1DF628:: @ 81DF628
- applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D8
- applymovement 11, MauvilleCity_Movement_1DF72F
+MauvilleCity_EventScript_ScottExitEast:: @ 81DF628
+ applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast
+ applymovement 11, MauvilleCity_Movement_ScottExitEast
waitmovement 0
return
-MauvilleCity_EventScript_1DF63A:: @ 81DF63A
- msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT
- trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96
+MauvilleCity_EventScript_BattleWally:: @ 81DF63A
+ msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT
+ trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_WallyDefeat
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
- msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT
applymovement 6, Common_Movement_FacePlayer
waitmovement 0
- msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_ThankYouNotEnoughToBattle, MSGBOX_DEFAULT
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
- msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT
return
-MauvilleCity_EventScript_1DF683:: @ 81DF683
+MauvilleCity_EventScript_DeclineWallyBattle:: @ 81DF683
setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
- msgbox MauvilleCity_Text_1DFA4A, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_WallyMyUncleWontKnowImStrong, MSGBOX_DEFAULT
release
end
-MauvilleCity_EventScript_1DF690:: @ 81DF690
+MauvilleCity_EventScript_WallyRequestBattleAgain:: @ 81DF690
applymovement 6, Common_Movement_FacePlayer
waitmovement 0
- msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO
- goto MauvilleCity_EventScript_1DF4AD
+ msgbox MauvilleCity_Text_WallyPleaseBattleMe, MSGBOX_YESNO
+ goto MauvilleCity_EventScript_BattleWallyPrompt
end
-MauvilleCity_Movement_1DF6A8: @ 81DF6A8
+MauvilleCity_Movement_WallyExitNorth1: @ 81DF6A8
walk_left
walk_left
walk_down
@@ -237,7 +237,7 @@ MauvilleCity_Movement_1DF6A8: @ 81DF6A8
walk_left
step_end
-MauvilleCity_Movement_1DF6AE: @ 81DF6AE
+MauvilleCity_Movement_WallyExitEast1: @ 81DF6AE
walk_down
walk_down
walk_left
@@ -245,7 +245,7 @@ MauvilleCity_Movement_1DF6AE: @ 81DF6AE
walk_left
step_end
-MauvilleCity_Movement_1DF6B4: @ 81DF6B4
+MauvilleCity_Movement_WallyExitNorth2: @ 81DF6B4
delay_16
delay_16
walk_left
@@ -259,7 +259,7 @@ MauvilleCity_Movement_1DF6B4: @ 81DF6B4
delay_8
step_end
-MauvilleCity_Movement_1DF6C0: @ 81DF6C0
+MauvilleCity_Movement_WallyExitEast2: @ 81DF6C0
delay_16
delay_16
walk_left
@@ -273,41 +273,41 @@ MauvilleCity_Movement_1DF6C0: @ 81DF6C0
delay_8
step_end
-MauvilleCity_Movement_1DF6CC: @ 81DF6CC
+MauvilleCity_Movement_PlayerWatchWallyExitNorth2: @ 81DF6CC
delay_16
delay_8
walk_in_place_fastest_left
step_end
-MauvilleCity_Movement_1DF6D0: @ 81DF6D0
+MauvilleCity_Movement_PlayerWatchWallyExitEast2: @ 81DF6D0
delay_16
delay_16
delay_16
walk_in_place_fastest_left
step_end
-MauvilleCity_Movement_1DF6D5: @ 81DF6D5
+MauvilleCity_Movement_PlayerWatchScottExitNorth: @ 81DF6D5
delay_16
walk_in_place_fastest_left
step_end
-MauvilleCity_Movement_1DF6D8: @ 81DF6D8
+MauvilleCity_Movement_PlayerWatchScottExitEast: @ 81DF6D8
delay_16
delay_16
walk_in_place_fastest_left
step_end
-MauvilleCity_Movement_1DF6DC: @ 81DF6DC
+MauvilleCity_Movement_PlayerWatchWallyExitEast1: @ 81DF6DC
delay_16
walk_in_place_fastest_down
step_end
-MauvilleCity_Movement_1DF6DF: @ 81DF6DF
+MauvilleCity_Movement_PlayerWatchWallyExitNorth1: @ 81DF6DF
delay_16
walk_in_place_fastest_left
step_end
-MauvilleCity_Movement_1DF6E2: @ 81DF6E2
+MauvilleCity_Movement_WallysUncleExitNorth1: @ 81DF6E2
walk_left
walk_left
walk_left
@@ -315,7 +315,7 @@ MauvilleCity_Movement_1DF6E2: @ 81DF6E2
walk_down
step_end
-MauvilleCity_Movement_1DF6E8: @ 81DF6E8
+MauvilleCity_Movement_WallysUncleExitEast1: @ 81DF6E8
walk_left
walk_down
walk_down
@@ -323,25 +323,25 @@ MauvilleCity_Movement_1DF6E8: @ 81DF6E8
walk_left
step_end
-MauvilleCity_Movement_1DF6EE: @ 81DF6EE
+MauvilleCity_Movement_PlayerFaceUncleNorth: @ 81DF6EE
delay_16
delay_8
delay_4
walk_in_place_fastest_down
step_end
-MauvilleCity_Movement_1DF6F3: @ 81DF6F3
+MauvilleCity_Movement_WallysUncleApproachPlayerNorth: @ 81DF6F3
walk_right
walk_right
walk_in_place_fastest_up
step_end
-MauvilleCity_Movement_1DF6F7: @ 81DF6F7
+MauvilleCity_Movement_WallysUncleApproachPlayerEast: @ 81DF6F7
walk_right
walk_up
step_end
-MauvilleCity_Movement_1DF6FA: @ 81DF6FA
+MauvilleCity_Movement_WallysUncleExitNorth2: @ 81DF6FA
walk_left
walk_left
walk_left
@@ -352,7 +352,7 @@ MauvilleCity_Movement_1DF6FA: @ 81DF6FA
walk_left
step_end
-MauvilleCity_Movement_1DF703: @ 81DF703
+MauvilleCity_Movement_WallysUncleExitEast2: @ 81DF703
walk_down
walk_left
walk_left
@@ -364,7 +364,7 @@ MauvilleCity_Movement_1DF703: @ 81DF703
walk_left
step_end
-MauvilleCity_Movement_1DF70D: @ 81DF70D
+MauvilleCity_Movement_ScottApproachPlayerNorth: @ 81DF70D
walk_up
walk_up
walk_up
@@ -378,7 +378,7 @@ MauvilleCity_Movement_1DF70D: @ 81DF70D
walk_in_place_fastest_up
step_end
-MauvilleCity_Movement_1DF719: @ 81DF719
+MauvilleCity_Movement_ScottApproachPlayerEast: @ 81DF719
walk_up
walk_up
walk_up
@@ -392,7 +392,7 @@ MauvilleCity_Movement_1DF719: @ 81DF719
walk_up
step_end
-MauvilleCity_Movement_1DF725: @ 81DF725
+MauvilleCity_Movement_ScottExitNorth: @ 81DF725
walk_left
walk_left
walk_left
@@ -404,7 +404,7 @@ MauvilleCity_Movement_1DF725: @ 81DF725
walk_left
step_end
-MauvilleCity_Movement_1DF72F: @ 81DF72F
+MauvilleCity_Movement_ScottExitEast: @ 81DF72F
walk_down
walk_left
walk_left
@@ -417,47 +417,47 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F
walk_left
step_end
-MauvilleCity_EventScript_1DF73A:: @ 81DF73A
+MauvilleCity_EventScript_Wattson:: @ 81DF73A
lock
faceplayer
- goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0
+ goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_ReceivedThunderbolt
compare VAR_NEW_MAUVILLE_STATE, 2
- goto_if_eq MauvilleCity_EventScript_1DF784
- goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A
- msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT
+ goto_if_eq MauvilleCity_EventScript_CompletedNewMauville
+ goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_BegunNewMauville
+ msgbox MauvilleCity_Text_WattsonNeedFavorTakeKey, MSGBOX_DEFAULT
giveitem_std ITEM_BASEMENT_KEY
setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
- msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT
release
end
-MauvilleCity_EventScript_1DF77A:: @ 81DF77A
- msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT
+MauvilleCity_EventScript_BegunNewMauville:: @ 81DF77A
+ msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT
release
end
-MauvilleCity_EventScript_1DF784:: @ 81DF784
- msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT
+MauvilleCity_EventScript_CompletedNewMauville:: @ 81DF784
+ msgbox MauvilleCity_Text_WattsonThanksTakeTM, MSGBOX_DEFAULT
giveitem_std ITEM_TM24
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_GOT_TM24_FROM_WATTSON
- msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT
release
end
-MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0
- msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT
+MauvilleCity_EventScript_ReceivedThunderbolt:: @ 81DF7B0
+ msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT
release
end
-MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA
+MauvilleCity_EventScript_RegisterWallyCall:: @ 81DF7BA
lockall
- pokenavcall MauvilleCity_Text_1DFDFB
+ pokenavcall MauvilleCity_Text_WallyPokenavCall
waitmessage
delay 30
playfanfare MUS_ME_TORE_EYE
- msgbox MauvilleCity_Text_1DFEB4, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_RegisteredWally, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -466,30 +466,30 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA
releaseall
end
-MauvilleCity_Text_1DF7DC: @ 81DF7DC
+MauvilleCity_Text_UncleHesTooPeppy: @ 81DF7DC
.string "UNCLE: It's because of POKéMON that\n"
.string "this boy's got more pep, I suppose…\l"
.string "But he's become a bit too peppy…$"
-MauvilleCity_Text_1DF845: @ 81DF845
+MauvilleCity_Text_WallyWantToChallengeGym: @ 81DF845
.string "WALLY: Aww, UNCLE, please?\p"
.string "I want to challenge this GYM and see\n"
.string "how much better I've become.\p"
.string "Please? May I, please?$"
-MauvilleCity_Text_1DF8B9: @ 81DF8B9
+MauvilleCity_Text_UncleYourePushingIt: @ 81DF8B9
.string "UNCLE: Now hold on, WALLY.\p"
.string "Since you started living with POKéMON,\n"
.string "you have grown quite a lot stronger.\p"
.string "But don't you think you're pushing it\n"
.string "to suddenly challenge a GYM?$"
-MauvilleCity_Text_1DF963: @ 81DF963
+MauvilleCity_Text_WallyWeCanBeatAnyone: @ 81DF963
.string "WALLY: I'm not pushing it.\p"
.string "If I combine forces with RALTS,\n"
.string "we can beat anyone!$"
-MauvilleCity_Text_1DF9B2: @ 81DF9B2
+MauvilleCity_Text_WallyWillYouBattleMe: @ 81DF9B2
.string "WALLY: Oh! Hi, {PLAYER}!\p"
.string "I've gotten a lot stronger since\n"
.string "we met.\p"
@@ -498,43 +498,43 @@ MauvilleCity_Text_1DF9B2: @ 81DF9B2
.string "{PLAYER}, please, will you have\n"
.string "a battle with me?$"
-MauvilleCity_Text_1DFA4A: @ 81DFA4A
+MauvilleCity_Text_WallyMyUncleWontKnowImStrong: @ 81DFA4A
.string "WALLY: Oh… If you won't battle me,\n"
.string "{PLAYER}, my UNCLE won't know that I've\l"
.string "become really strong.$"
-MauvilleCity_Text_1DFAA5: @ 81DFAA5
+MauvilleCity_Text_UncleCanYouBattleWally: @ 81DFAA5
.string "UNCLE: {PLAYER}{KUN}, was it?\n"
.string "On WALLY's behalf, can I ask you to\l"
.string "battle with him just this once?\p"
.string "I don't think he's going to listen to\n"
.string "any reason the way he is now.$"
-MauvilleCity_Text_1DFB42: @ 81DFB42
+MauvilleCity_Text_WallyPleaseBattleMe: @ 81DFB42
.string "WALLY: {PLAYER}, please!\n"
.string "Battle with me, please.$"
-MauvilleCity_Text_1DFB6D: @ 81DFB6D
+MauvilleCity_Text_WallyHereICome: @ 81DFB6D
.string "WALLY: {PLAYER}, thank you.\p"
.string "Okay… Here I come!$"
-MauvilleCity_Text_1DFB96: @ 81DFB96
+MauvilleCity_Text_WallyDefeat: @ 81DFB96
.string "WALLY: … … … … … … …\p"
.string "… … … … … … … …\p"
.string "I lost…$"
-MauvilleCity_Text_1DFBC3: @ 81DFBC3
+MauvilleCity_Text_WallyIllGoBackToVerdanturf: @ 81DFBC3
.string "WALLY: UNCLE…\n"
.string "I'll go back to VERDANTURF…$"
-MauvilleCity_Text_1DFBED: @ 81DFBED
+MauvilleCity_Text_ThankYouNotEnoughToBattle: @ 81DFBED
.string "{PLAYER}, thank you.\n"
.string "Being a TRAINER is tough, isn't it?\p"
.string "It's not enough just to have POKéMON\n"
.string "and make them battle. That isn't what\l"
.string "being a real TRAINER is about.$"
-MauvilleCity_Text_1DFC8A: @ 81DFC8A
+MauvilleCity_Text_UncleNoNeedToBeDown: @ 81DFC8A
.string "UNCLE: WALLY, there's no need to be so\n"
.string "down on yourself.\p"
.string "Why, what's keeping you from becoming\n"
@@ -542,7 +542,7 @@ MauvilleCity_Text_1DFC8A: @ 81DFC8A
.string "Come on, let's go home.\n"
.string "Everyone's waiting for you.$"
-MauvilleCity_Text_1DFD34: @ 81DFD34
+MauvilleCity_Text_UncleVisitUsSometime: @ 81DFD34
.string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n"
.string "that you must be the TRAINER who kept\l"
.string "an eye out for WALLY when he caught\l"
@@ -552,7 +552,7 @@ MauvilleCity_Text_1DFD34: @ 81DFD34
.string "I'm sure WALLY would enjoy it.$"
-MauvilleCity_Text_1DFDFB: @ 81DFDFB
+MauvilleCity_Text_WallyPokenavCall: @ 81DFDFB
.string "… … … … … …\n"
.string "… … … … … Beep!\p"
.string "WALLY: Oh, hello, {PLAYER}!\p"
@@ -563,11 +563,11 @@ MauvilleCity_Text_1DFDFB: @ 81DFDFB
.string "… … … … … …\n"
.string "… … … … … Click!$"
-MauvilleCity_Text_1DFEB4: @ 81DFEB4
+MauvilleCity_Text_RegisteredWally: @ 81DFEB4
.string "Registered WALLY\n"
.string "in the POKéNAV.$"
-MauvilleCity_Text_1DFED5: @ 81DFED5
+MauvilleCity_Text_ScottYouDidntHoldBack: @ 81DFED5
.string "SCOTT: Hehe…\n"
.string "I was watching that match!\p"
.string "You're friends with that boy WALLY,\n"
@@ -580,7 +580,7 @@ MauvilleCity_Text_1DFED5: @ 81DFED5
.string "… … … … … …\n"
.string "I'll be cheering for you!$"
-MauvilleCity_Text_1DFFE4: @ 81DFFE4
+MauvilleCity_Text_WattsonNeedFavorTakeKey: @ 81DFFE4
.string "WATTSON: Oh, {PLAYER}{KUN}!\n"
.string "You look like you have a lot of zip!\l"
.string "That's a good thing, wahahahaha!\p"
@@ -595,7 +595,7 @@ MauvilleCity_Text_1DFFE4: @ 81DFFE4
.string "Here, this is the KEY to get into\n"
.string "NEW MAUVILLE.$"
-MauvilleCity_Text_1E0154: @ 81E0154
+MauvilleCity_Text_WattsonWontBeChallenge: @ 81E0154
.string "WATTSON: Don't you worry about it.\n"
.string "It won't be a challenge to you.\p"
.string "The entrance to NEW MAUVILLE is just\n"
@@ -603,7 +603,7 @@ MauvilleCity_Text_1E0154: @ 81E0154
.string "That's it, then, you have my trust!\n"
.string "Wahahahaha!$"
-MauvilleCity_Text_1E020E: @ 81E020E
+MauvilleCity_Text_WattsonThanksTakeTM: @ 81E020E
.string "WATTSON: Wahahahaha!\p"
.string "I knew it, {PLAYER}{KUN}! I knew I'd made\n"
.string "the right choice asking you!\p"
@@ -611,51 +611,51 @@ MauvilleCity_Text_1E020E: @ 81E020E
.string "THUNDERBOLT!\p"
.string "Go on, you've earned it!$"
-MauvilleCity_Text_1E02AA: @ 81E02AA
+MauvilleCity_Text_WattsonYoungTakeCharge: @ 81E02AA
.string "WATTSON: Wahahahaha!\p"
.string "It pleases me to no end to see\n"
.string "the young step up and take charge!$"
-MauvilleCity_Text_1E0301: @ 81E0301
+MauvilleCity_Text_NurseHurtMonBackToHealth: @ 81E0301
.string "You know, it's cool to have POKéMON\n"
.string "battles and stuff…\p"
.string "But if your POKéMON gets hurt,\n"
.string "you have to nurse it back to health.$"
-MauvilleCity_Text_1E037C: @ 81E037C
+MauvilleCity_Text_AllSortsOfPeopleComeThrough: @ 81E037C
.string "The roads of this town stretch north\n"
.string "and south, and east and west.\p"
.string "Because of that, we get all sorts of\n"
.string "people coming through.$"
-MauvilleCity_Text_1E03FB: @ 81E03FB
+MauvilleCity_Text_RydelVeryGenerous: @ 81E03FB
.string "Have you been to RYDEL'S CYCLES yet?\p"
.string "RYDEL, the owner, is a very generous\n"
.string "man.$"
-MauvilleCity_Text_1E044A: @ 81E044A
+MauvilleCity_Text_PokemonCanJumpYouOnBike: @ 81E044A
.string "Even if you're riding a BIKE,\n"
.string "wild POKéMON could jump you.$"
-MauvilleCity_Text_1E0485: @ 81E0485
+MauvilleCity_Text_CitySign: @ 81E0485
.string "MAUVILLE CITY\n"
.string "“The bright and shiny city of fun!”$"
-MauvilleCity_Text_1E04B7: @ 81E04B7
+MauvilleCity_Text_GymSign: @ 81E04B7
.string "MAUVILLE CITY POKéMON GYM\n"
.string "LEADER: WATTSON\l"
.string "“The cheerfully electrifying man!”$"
-MauvilleCity_Text_1E0504: @ 81E0504
+MauvilleCity_Text_BikeShopSign: @ 81E0504
.string "“Ride in gravel and shake up your\n"
.string "soul!”\l"
.string "RYDEL'S CYCLES$"
-MauvilleCity_Text_1E053C: @ 81E053C
+MauvilleCity_Text_GameCornerSign: @ 81E053C
.string "“The play spot for all!”\n"
.string "MAUVILLE GAME CORNER$"
-MauvilleCity_Text_1E056A: @ 81E056A
+MauvilleCity_Text_ExplainTV: @ 81E056A
.string "Hi, do you check out TV at all?\p"
.string "They've added a bunch of cool new\n"
.string "shows recently.\p"
@@ -667,5 +667,5 @@ MauvilleCity_Text_1E056A: @ 81E056A
.string "That's why I think you should check\n"
.string "out TVs whenever you can.$"
-MauvilleCity_Text_1E0699: @ 81E0699
+MauvilleCity_Text_BeenCheckingOutTV: @ 81E0699
.string "Hi, have you been checking out TVs?$"
diff --git a/include/event_scripts.h b/include/event_scripts.h
index b86c46df0..6410907d7 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -552,7 +552,7 @@ extern const u8 EventScript_FieldPoison[];
extern const u8 EventScript_EggHatch[];
extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[];
extern const u8 IslandCave_EventScript_OpenRegiEntrance[];
-extern const u8 MauvilleCity_EventScript_1DF7BA[];
+extern const u8 MauvilleCity_EventScript_RegisterWallyCall[];
extern const u8 Route119_EventScript_1F49EC[];
extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[];
extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[];
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index bbd2ebda9..0e8b2619f 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -568,7 +568,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
}
if (ShouldDoWallyCall() == TRUE)
{
- ScriptContext1_SetupScript(MauvilleCity_EventScript_1DF7BA);
+ ScriptContext1_SetupScript(MauvilleCity_EventScript_RegisterWallyCall);
return TRUE;
}
if (ShouldDoWinonaCall() == TRUE)
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 16:20:07 +0000