summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/maps/LavaridgeTown/map.json26
-rw-r--r--data/maps/LavaridgeTown/scripts.inc218
-rw-r--r--data/maps/LavaridgeTown_Gym_1F/scripts.inc2
-rw-r--r--data/maps/LavaridgeTown_HerbShop/map.json6
-rw-r--r--data/maps/LavaridgeTown_HerbShop/scripts.inc30
-rw-r--r--data/maps/LavaridgeTown_House/map.json4
-rw-r--r--data/maps/LavaridgeTown_House/scripts.inc12
-rw-r--r--data/scripts/field_poison.inc2
-rw-r--r--data/scripts/new_game.inc4
-rw-r--r--include/constants/flags.h6
10 files changed, 155 insertions, 155 deletions
diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json
index 65a6a25d3..1212f3354 100644
--- a/data/maps/LavaridgeTown/map.json
+++ b/data/maps/LavaridgeTown/map.json
@@ -30,7 +30,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_EventScript_1EA73B",
+ "script": "LavaridgeTown_EventScript_ExpertF",
"flag": "0"
},
{
@@ -43,7 +43,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_EventScript_1EA70E",
+ "script": "LavaridgeTown_EventScript_ExpertM",
"flag": "0"
},
{
@@ -56,7 +56,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_EventScript_1EA717",
+ "script": "LavaridgeTown_EventScript_OldMan",
"flag": "0"
},
{
@@ -69,7 +69,7 @@
"movement_range_y": 2,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_EventScript_1EA720",
+ "script": "LavaridgeTown_EventScript_Twin",
"flag": "0"
},
{
@@ -82,7 +82,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_EventScript_1EA729",
+ "script": "LavaridgeTown_EventScript_HotSpringsOldWoman1",
"flag": "0"
},
{
@@ -95,7 +95,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_EventScript_1EA732",
+ "script": "LavaridgeTown_EventScript_HotSpringsOldWoman2",
"flag": "0"
},
{
@@ -109,7 +109,7 @@
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
- "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2"
+ "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
@@ -122,7 +122,7 @@
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
- "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1"
+ "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
@@ -134,7 +134,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_EventScript_1EA744",
+ "script": "LavaridgeTown_EventScript_EggWoman",
"flag": "0"
}
],
@@ -190,7 +190,7 @@
"elevation": 3,
"var": "0",
"var_value": "0",
- "script": "LavaridgeTown_EventScript_1EA6FA"
+ "script": "LavaridgeTown_EventScript_HotSpringsTrigger"
}
],
"bg_events": [
@@ -200,7 +200,7 @@
"y": 16,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LavaridgeTown_EventScript_1EA7B7"
+ "script": "LavaridgeTown_EventScript_HerbShopSign"
},
{
"type": "sign",
@@ -208,7 +208,7 @@
"y": 15,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LavaridgeTown_EventScript_1EA7AE"
+ "script": "LavaridgeTown_EventScript_GymSign"
},
{
"type": "sign",
@@ -224,7 +224,7 @@
"y": 8,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LavaridgeTown_EventScript_1EA7A5"
+ "script": "LavaridgeTown_EventScript_TownSign"
},
{
"type": "sign",
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
index a964d42e5..dc45f94d4 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -1,98 +1,98 @@
LavaridgeTown_MapScripts:: @ 81EA4D3
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition
- map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_OnFrame
.byte 0
LavaridgeTown_OnTransition: @ 81EA4DE
setflag FLAG_VISITED_LAVARIDGE_TOWN
- call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514
- call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F
+ call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, LavaridgeTown_EventScript_ClearLavaridgeWhiteOut
+ call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_ShowMtChimneyTrainers
call Common_EventScript_SetupRivalGfxId
call Common_EventScript_SetupRivalOnBikeGfxId
compare VAR_LAVARIDGE_TOWN_STATE, 1
- call_if_eq LavaridgeTown_EventScript_1EA518
+ call_if_eq LavaridgeTown_EventScript_CheckSetRivalPos
compare VAR_LAVARIDGE_TOWN_STATE, 1
- call_if_eq LavaridgeTown_EventScript_1EA543
+ call_if_eq LavaridgeTown_EventScript_HideMapNamePopup
end
-LavaridgeTown_EventScript_1EA514:: @ 81EA514
- clearflag FLAG_FLANNERY_GIVES_BADGE_INFO
+LavaridgeTown_EventScript_ClearLavaridgeWhiteOut:: @ 81EA514
+ clearflag FLAG_WHITEOUT_TO_LAVARIDGE
return
-LavaridgeTown_EventScript_1EA518:: @ 81EA518
+LavaridgeTown_EventScript_CheckSetRivalPos:: @ 81EA518
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 9
- goto_if_eq LavaridgeTown_EventScript_1EA529
+ goto_if_eq LavaridgeTown_EventScript_SetRivalPos
return
-LavaridgeTown_EventScript_1EA529:: @ 81EA529
+LavaridgeTown_EventScript_SetRivalPos:: @ 81EA529
setobjectxyperm 8, 11, 9
setobjectxyperm 7, 9, 8
setobjectmovementtype 7, MOVEMENT_TYPE_FACE_UP
- clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
+ clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
return
-LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
+LavaridgeTown_EventScript_ShowMtChimneyTrainers:: @ 81EA53F
clearflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
return
-LavaridgeTown_EventScript_1EA543:: @ 81EA543
+LavaridgeTown_EventScript_HideMapNamePopup:: @ 81EA543
setflag FLAG_HIDE_MAP_NAME_POPUP
return
-LavaridgeTown_MapScript2_1EA547: @ 81EA547
- map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_1EA551
+LavaridgeTown_OnFrame: @ 81EA547
+ map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_RivalGiveGoGoggles
.2byte 0
-LavaridgeTown_EventScript_1EA551:: @ 81EA551
+LavaridgeTown_EventScript_RivalGiveGoGoggles:: @ 81EA551
lockall
getplayerxy VAR_0x8008, VAR_0x8009
compare VAR_0x8008, 9
- call_if_eq LavaridgeTown_EventScript_1EA63A
+ call_if_eq LavaridgeTown_EventScript_RivalNoticePlayer
compare VAR_0x8008, 9
- call_if_ne LavaridgeTown_EventScript_1EA65C
+ call_if_ne LavaridgeTown_EventScript_RivalExitHerbShop
delay 20
checkplayergender
compare VAR_RESULT, MALE
- call_if_eq LavaridgeTown_EventScript_1EA630
+ call_if_eq LavaridgeTown_EventScript_PlayMayMusic
compare VAR_RESULT, FEMALE
- call_if_eq LavaridgeTown_EventScript_1EA635
+ call_if_eq LavaridgeTown_EventScript_PlayBrendanMusic
compare VAR_0x8008, 9
- call_if_eq LavaridgeTown_EventScript_1EA6A1
+ call_if_eq LavaridgeTown_EventScript_RivalApproachPlayer1
compare VAR_0x8008, 9
- call_if_ne LavaridgeTown_EventScript_1EA6AC
+ call_if_ne LavaridgeTown_EventScript_RivalApproachPlayer2
checkplayergender
compare VAR_RESULT, MALE
- goto_if_eq LavaridgeTown_EventScript_1EA5B5
+ goto_if_eq LavaridgeTown_EventScript_MayGiveGoGoggles
compare VAR_RESULT, FEMALE
- goto_if_eq LavaridgeTown_EventScript_1EA5DA
+ goto_if_eq LavaridgeTown_EventScript_BrendanGiveGoGoggles
end
-LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5
- msgbox LavaridgeTown_Text_1EA7C0, MSGBOX_DEFAULT
+LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5
+ msgbox LavaridgeTown_Text_MayNiceBadgesTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_GO_GOGGLES
setflag FLAG_RECEIVED_GO_GOGGLES
- msgbox LavaridgeTown_Text_1EA897, MSGBOX_DEFAULT
- goto LavaridgeTown_EventScript_1EA5FF
+ msgbox LavaridgeTown_Text_MayExplainGoGogglesChallengeDad, MSGBOX_DEFAULT
+ goto LavaridgeTown_EventScript_RivalExit
end
-LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA
- msgbox LavaridgeTown_Text_1EA9A2, MSGBOX_DEFAULT
+LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 81EA5DA
+ msgbox LavaridgeTown_Text_BrendanNiceBadgesTakeThis, MSGBOX_DEFAULT
giveitem_std ITEM_GO_GOGGLES
setflag FLAG_RECEIVED_GO_GOGGLES
- msgbox LavaridgeTown_Text_1EAA2E, MSGBOX_DEFAULT
- goto LavaridgeTown_EventScript_1EA5FF
+ msgbox LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad, MSGBOX_DEFAULT
+ goto LavaridgeTown_EventScript_RivalExit
end
-LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
+LavaridgeTown_EventScript_RivalExit:: @ 81EA5FF
closemessage
removeobject 8
addobject 7
delay 30
compare VAR_0x8008, 9
- call_if_eq LavaridgeTown_EventScript_1EA6B7
+ call_if_eq LavaridgeTown_EventScript_RivalExit1
compare VAR_0x8008, 9
- call_if_ne LavaridgeTown_EventScript_1EA6C9
+ call_if_ne LavaridgeTown_EventScript_RivalExit2
removeobject 7
setvar VAR_LAVARIDGE_TOWN_STATE, 2
clearflag FLAG_HIDE_MAP_NAME_POPUP
@@ -101,15 +101,15 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
releaseall
end
-LavaridgeTown_EventScript_1EA630:: @ 81EA630
+LavaridgeTown_EventScript_PlayMayMusic:: @ 81EA630
playbgm MUS_GIRL_SUP, 1
return
-LavaridgeTown_EventScript_1EA635:: @ 81EA635
+LavaridgeTown_EventScript_PlayBrendanMusic:: @ 81EA635
playbgm MUS_BOY_SUP, 1
return
-LavaridgeTown_EventScript_1EA63A:: @ 81EA63A
+LavaridgeTown_EventScript_RivalNoticePlayer:: @ 81EA63A
applymovement 8, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
playse SE_PIN
@@ -119,11 +119,11 @@ LavaridgeTown_EventScript_1EA63A:: @ 81EA63A
waitmovement 0
return
-LavaridgeTown_EventScript_1EA65C:: @ 81EA65C
+LavaridgeTown_EventScript_RivalExitHerbShop:: @ 81EA65C
opendoor 12, 15
waitdooranim
addobject 8
- applymovement 8, LavaridgeTown_Movement_1EA6F8
+ applymovement 8, LavaridgeTown_Movement_RivalExitHerbShop
waitmovement 0
closedoor 12, 15
waitdooranim
@@ -138,28 +138,28 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C
waitmovement 0
return
-LavaridgeTown_EventScript_1EA6A1:: @ 81EA6A1
- applymovement 8, LavaridgeTown_Movement_1EA6F4
+LavaridgeTown_EventScript_RivalApproachPlayer1:: @ 81EA6A1
+ applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer1
waitmovement 0
return
-LavaridgeTown_EventScript_1EA6AC:: @ 81EA6AC
- applymovement 8, LavaridgeTown_Movement_1EA6ED
+LavaridgeTown_EventScript_RivalApproachPlayer2:: @ 81EA6AC
+ applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer2
waitmovement 0
return
-LavaridgeTown_EventScript_1EA6B7:: @ 81EA6B7
- applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_1EA6DF
- applymovement 7, LavaridgeTown_Movement_1EA6E3
+LavaridgeTown_EventScript_RivalExit1:: @ 81EA6B7
+ applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit
+ applymovement 7, LavaridgeTown_Movement_RivalExit1
waitmovement 0
return
-LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9
- applymovement 7, LavaridgeTown_Movement_1EA6D4
+LavaridgeTown_EventScript_RivalExit2:: @ 81EA6C9
+ applymovement 7, LavaridgeTown_Movement_RivalExit2
waitmovement 0
return
-LavaridgeTown_Movement_1EA6D4: @ 81EA6D4
+LavaridgeTown_Movement_RivalExit2: @ 81EA6D4
walk_fast_right
walk_fast_right
walk_fast_right
@@ -172,13 +172,13 @@ LavaridgeTown_Movement_1EA6D4: @ 81EA6D4
walk_fast_up
step_end
-LavaridgeTown_Movement_1EA6DF: @ 81EA6DF
+LavaridgeTown_Movement_PlayerWatchRivalExit: @ 81EA6DF
delay_16
delay_8
walk_in_place_fastest_right
step_end
-LavaridgeTown_Movement_1EA6E3: @ 81EA6E3
+LavaridgeTown_Movement_RivalExit1: @ 81EA6E3
walk_fast_down
walk_fast_right
walk_fast_right
@@ -190,7 +190,7 @@ LavaridgeTown_Movement_1EA6E3: @ 81EA6E3
walk_fast_right
step_end
-LavaridgeTown_Movement_1EA6ED: @ 81EA6ED
+LavaridgeTown_Movement_RivalApproachPlayer2: @ 81EA6ED
walk_left
walk_left
walk_left
@@ -199,97 +199,97 @@ LavaridgeTown_Movement_1EA6ED: @ 81EA6ED
walk_left
step_end
-LavaridgeTown_Movement_1EA6F4: @ 81EA6F4
+LavaridgeTown_Movement_RivalApproachPlayer1: @ 81EA6F4
walk_left
walk_left
walk_up
step_end
-LavaridgeTown_Movement_1EA6F8: @ 81EA6F8
+LavaridgeTown_Movement_RivalExitHerbShop: @ 81EA6F8
walk_down
step_end
-LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA
+LavaridgeTown_EventScript_HotSpringsTrigger:: @ 81EA6FA
specialvar VAR_RESULT, GetPlayerFacingDirection
- compare VAR_RESULT, 1
- goto_if_eq LavaridgeTown_EventScript_1EA70B
+ compare VAR_RESULT, DIR_SOUTH
+ goto_if_eq LavaridgeTown_EventScript_EnteredHotSprings
end
-LavaridgeTown_EventScript_1EA70B:: @ 81EA70B
+LavaridgeTown_EventScript_EnteredHotSprings:: @ 81EA70B
incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS
end
-LavaridgeTown_EventScript_1EA70E:: @ 81EA70E
- msgbox LavaridgeTown_Text_1EAE03, MSGBOX_NPC
+LavaridgeTown_EventScript_ExpertM:: @ 81EA70E
+ msgbox LavaridgeTown_Text_HotSpringsNeverRunDry, MSGBOX_NPC
end
-LavaridgeTown_EventScript_1EA717:: @ 81EA717
- msgbox LavaridgeTown_Text_1EAEE1, MSGBOX_SIGN
+LavaridgeTown_EventScript_OldMan:: @ 81EA717
+ msgbox LavaridgeTown_Text_PokemonNippedBackside, MSGBOX_SIGN
end
-LavaridgeTown_EventScript_1EA720:: @ 81EA720
- msgbox LavaridgeTown_Text_1EAF9B, MSGBOX_NPC
+LavaridgeTown_EventScript_Twin:: @ 81EA720
+ msgbox LavaridgeTown_Text_BatheInHotSpringsEveryDay, MSGBOX_NPC
end
-LavaridgeTown_EventScript_1EA729:: @ 81EA729
- msgbox LavaridgeTown_Text_1EB003, MSGBOX_NPC
+LavaridgeTown_EventScript_HotSpringsOldWoman1:: @ 81EA729
+ msgbox LavaridgeTown_Text_IfPokemonInHotSprings, MSGBOX_NPC
end
-LavaridgeTown_EventScript_1EA732:: @ 81EA732
- msgbox LavaridgeTown_Text_1EB092, MSGBOX_NPC
+LavaridgeTown_EventScript_HotSpringsOldWoman2:: @ 81EA732
+ msgbox LavaridgeTown_Text_HotSpringsClaims, MSGBOX_NPC
end
-LavaridgeTown_EventScript_1EA73B:: @ 81EA73B
- msgbox LavaridgeTown_Text_1EAF4E, MSGBOX_NPC
+LavaridgeTown_EventScript_ExpertF:: @ 81EA73B
+ msgbox LavaridgeTown_Text_OhYouLikeHotSprings, MSGBOX_NPC
end
-LavaridgeTown_EventScript_1EA744:: @ 81EA744
+LavaridgeTown_EventScript_EggWoman:: @ 81EA744
lock
faceplayer
- goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_1EA787
- msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO
+ goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_ReceivedEgg
+ msgbox LavaridgeTown_Text_HaveEggWillYouTakeIt, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq LavaridgeTown_EventScript_1EA79B
+ goto_if_eq LavaridgeTown_EventScript_DeclineEgg
getpartysize
compare VAR_RESULT, PARTY_SIZE
- goto_if_eq LavaridgeTown_EventScript_1EA791
- msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT
+ goto_if_eq LavaridgeTown_EventScript_NoRoomForEgg
+ msgbox LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_LAVARIDGE_EGG
playfanfare MUS_FANFA4
- message LavaridgeTown_Text_1EACF4
+ message LavaridgeTown_Text_ReceivedTheEgg
waitfanfare
giveegg SPECIES_WYNAUT
release
end
-LavaridgeTown_EventScript_1EA787:: @ 81EA787
- msgbox LavaridgeTown_Text_1EAD9E, MSGBOX_DEFAULT
+LavaridgeTown_EventScript_ReceivedEgg:: @ 81EA787
+ msgbox LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare, MSGBOX_DEFAULT
release
end
-LavaridgeTown_EventScript_1EA791:: @ 81EA791
- msgbox LavaridgeTown_Text_1EAD09, MSGBOX_DEFAULT
+LavaridgeTown_EventScript_NoRoomForEgg:: @ 81EA791
+ msgbox LavaridgeTown_Text_NoRoomForThisEgg, MSGBOX_DEFAULT
release
end
-LavaridgeTown_EventScript_1EA79B:: @ 81EA79B
- msgbox LavaridgeTown_Text_1EAD44, MSGBOX_DEFAULT
+LavaridgeTown_EventScript_DeclineEgg:: @ 81EA79B
+ msgbox LavaridgeTown_Text_AsYouWishThen, MSGBOX_DEFAULT
release
end
-LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5
- msgbox LavaridgeTown_Text_1EB12B, MSGBOX_SIGN
+LavaridgeTown_EventScript_TownSign:: @ 81EA7A5
+ msgbox LavaridgeTown_Text_TownSign, MSGBOX_SIGN
end
-LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE
- msgbox LavaridgeTown_Text_1EB178, MSGBOX_SIGN
+LavaridgeTown_EventScript_GymSign:: @ 81EA7AE
+ msgbox LavaridgeTown_Text_GymSign, MSGBOX_SIGN
end
-LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7
- msgbox LavaridgeTown_Text_1EB1CB, MSGBOX_SIGN
+LavaridgeTown_EventScript_HerbShopSign:: @ 81EA7B7
+ msgbox LavaridgeTown_Text_HerbShopSign, MSGBOX_SIGN
end
-LavaridgeTown_Text_1EA7C0: @ 81EA7C0
+LavaridgeTown_Text_MayNiceBadgesTakeThis: @ 81EA7C0
.string "MAY: {PLAYER}{KUN}! Long time no see!\p"
.string "Oh? While I visited the hot springs,\n"
.string "you got the LAVARIDGE GYM BADGE.\p"
@@ -299,7 +299,7 @@ LavaridgeTown_Text_1EA7C0: @ 81EA7C0
.string "I guess it would be okay for you to\n"
.string "have this.$"
-LavaridgeTown_Text_1EA897: @ 81EA897
+LavaridgeTown_Text_MayExplainGoGogglesChallengeDad: @ 81EA897
.string "MAY: With those GO-GOGGLES, you'll\n"
.string "have no trouble getting through the\l"
.string "desert near ROUTE 111.\p"
@@ -311,7 +311,7 @@ LavaridgeTown_Text_1EA897: @ 81EA897
.string "your dad in PETALBURG GYM.\p"
.string "See you again!$"
-LavaridgeTown_Text_1EA9A2: @ 81EA9A2
+LavaridgeTown_Text_BrendanNiceBadgesTakeThis: @ 81EA9A2
.string "BRENDAN: {PLAYER}, hey, it's been a while.\n"
.string "How's it going?\p"
.string "Hmm…\n"
@@ -319,7 +319,7 @@ LavaridgeTown_Text_1EA9A2: @ 81EA9A2
.string "All right, then.\n"
.string "You may as well have this.$"
-LavaridgeTown_Text_1EAA2E: @ 81EAA2E
+LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad: @ 81EAA2E
.string "BRENDAN: Keep those with you if you're\n"
.string "planning on going into that desert near\l"
.string "ROUTE 111.\p"
@@ -333,7 +333,7 @@ LavaridgeTown_Text_1EAA2E: @ 81EAA2E
.string "he really is tough.\p"
.string "See you around!$"
-LavaridgeTown_Text_1EAB80: @ 81EAB80
+LavaridgeTown_Text_HaveEggWillYouTakeIt: @ 81EAB80
.string "I have here an EGG.\p"
.string "I'd hoped to hatch it by covering it in\n"
.string "hot sand by the hot springs.\l"
@@ -346,28 +346,28 @@ LavaridgeTown_Text_1EAB80: @ 81EAB80
.string "So, what say you?\n"
.string "Will you take this EGG to hatch?$"
-LavaridgeTown_Text_1EACC0: @ 81EACC0
+LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg: @ 81EACC0
.string "Good! I hope you'll walk plenty with\n"
.string "this here EGG!$"
-LavaridgeTown_Text_1EACF4: @ 81EACF4
+LavaridgeTown_Text_ReceivedTheEgg: @ 81EACF4
.string "{PLAYER} received the EGG.$"
-LavaridgeTown_Text_1EAD09: @ 81EAD09
+LavaridgeTown_Text_NoRoomForThisEgg: @ 81EAD09
.string "Oh? You've too many POKéMON.\n"
.string "There's no room for this EGG…$"
-LavaridgeTown_Text_1EAD44: @ 81EAD44
+LavaridgeTown_Text_AsYouWishThen: @ 81EAD44
.string "As you wish, then…\p"
.string "If you have a change of heart about\n"
.string "hatching this EGG, I will be here.$"
-LavaridgeTown_Text_1EAD9E: @ 81EAD9E
+LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare: @ 81EAD9E
.string "Every so often, an EGG will be found at\n"
.string "the POKéMON DAY CARE.\p"
.string "Or at least that's how the rumor goes.$"
-LavaridgeTown_Text_1EAE03: @ 81EAE03
+LavaridgeTown_Text_HotSpringsNeverRunDry: @ 81EAE03
.string "We draw as much hot water as we need,\n"
.string "and yet the hot springs never run dry.\p"
.string "Isn't it magical?\p"
@@ -376,47 +376,47 @@ LavaridgeTown_Text_1EAE03: @ 81EAE03
.string "ground are heated by magma to well up\l"
.string "as hot springs.$"
-LavaridgeTown_Text_1EAEE1: @ 81EAEE1
+LavaridgeTown_Text_PokemonNippedBackside: @ 81EAEE1
.string "Being buried in this hot sand is…\n"
.string "Sigh…\p"
.string "So warm and heavenly…\p"
.string "Eh? Gyaah! Ouch!\p"
.string "A POKéMON nipped my backside!$"
-LavaridgeTown_Text_1EAF4E: @ 81EAF4E
+LavaridgeTown_Text_OhYouLikeHotSprings: @ 81EAF4E
.string "Oh, you like hot springs, do you?\p"
.string "That's surprising for one as young\n"
.string "as you.$"
-LavaridgeTown_Text_1EAF9B: @ 81EAF9B
+LavaridgeTown_Text_BatheInHotSpringsEveryDay: @ 81EAF9B
.string "I bathe in the hot springs every day.\p"
.string "I want to become a beautiful and strong\n"
.string "GYM LEADER like FLANNERY.$"
-LavaridgeTown_Text_1EB003: @ 81EB003
+LavaridgeTown_Text_IfPokemonInHotSprings: @ 81EB003
.string "If people put POKéMON in hot springs,\n"
.string "it might be seriously strange.\p"
.string "Why, it might be an electric bath, or\n"
.string "a bubble bath, or even a lava bath…$"
-LavaridgeTown_Text_1EB092: @ 81EB092
+LavaridgeTown_Text_HotSpringsClaims: @ 81EB092
.string "They're claiming that these hot springs\n"
.string "are good for calming nervous tension,\l"
.string "relieving aching muscles, solving\l"
.string "romantic problems, and attracting\l"
.string "money…$"
-LavaridgeTown_Text_1EB12B: @ 81EB12B
+LavaridgeTown_Text_TownSign: @ 81EB12B
.string "LAVARIDGE TOWN\p"
.string "“POKéMON CENTER HOT SPRINGS\n"
.string "An excellent place for relaxing!”$"
-LavaridgeTown_Text_1EB178: @ 81EB178
+LavaridgeTown_Text_GymSign: @ 81EB178
.string "LAVARIDGE TOWN POKéMON GYM\n"
.string "LEADER: FLANNERY\l"
.string "“One with a fiery passion that burns!”$"
-LavaridgeTown_Text_1EB1CB: @ 81EB1CB
+LavaridgeTown_Text_HerbShopSign: @ 81EB1CB
.string "POKéMON HERB SHOP\n"
.string "“Bitter taste--better cure!”$"
diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index a5dcabf30..b94970e62 100644
--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -66,7 +66,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1
waitmessage
call Common_EventScript_PlayGymBadgeFanfare
msgbox LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis, MSGBOX_DEFAULT
- setflag FLAG_FLANNERY_GIVES_BADGE_INFO
+ setflag FLAG_WHITEOUT_TO_LAVARIDGE
setflag FLAG_DEFEATED_LAVARIDGE_GYM
setflag FLAG_BADGE04_GET
addvar VAR_PETALBURG_GYM_STATE, 1
diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json
index 203812fb2..1e7048b3f 100644
--- a/data/maps/LavaridgeTown_HerbShop/map.json
+++ b/data/maps/LavaridgeTown_HerbShop/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_HerbShop_EventScript_1FE4D7",
+ "script": "LavaridgeTown_HerbShop_EventScript_Clerk",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_HerbShop_EventScript_1FE505",
+ "script": "LavaridgeTown_HerbShop_EventScript_OldMan",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_HerbShop_EventScript_1FE4FC",
+ "script": "LavaridgeTown_HerbShop_EventScript_ExpertM",
"flag": "0"
}
],
diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc
index c7ae5fb9e..c32468589 100644
--- a/data/maps/LavaridgeTown_HerbShop/scripts.inc
+++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc
@@ -1,18 +1,18 @@
LavaridgeTown_HerbShop_MapScripts:: @ 81FE4D6
.byte 0
-LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7
+LavaridgeTown_HerbShop_EventScript_Clerk:: @ 81FE4D7
lock
faceplayer
- message LavaridgeTown_HerbShop_Text_1FE53E
+ message LavaridgeTown_HerbShop_Text_WelcomeToHerbShop
waitmessage
- pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0
+ pokemart LavaridgeTown_HerbShop_Pokemart
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
.align 2
-LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0
+LavaridgeTown_HerbShop_Pokemart: @ 81FE4F0
.2byte ITEM_ENERGY_POWDER
.2byte ITEM_ENERGY_ROOT
.2byte ITEM_HEAL_POWDER
@@ -21,15 +21,15 @@ LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0
release
end
-LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC
- msgbox LavaridgeTown_HerbShop_Text_1FE685, MSGBOX_NPC
+LavaridgeTown_HerbShop_EventScript_ExpertM:: @ 81FE4FC
+ msgbox LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike, MSGBOX_NPC
end
-LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505
+LavaridgeTown_HerbShop_EventScript_OldMan:: @ 81FE505
lock
faceplayer
- goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_1FE534
- msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT
+ goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_ExplainCharcoal
+ msgbox LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine, MSGBOX_DEFAULT
giveitem_std ITEM_CHARCOAL
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
@@ -37,22 +37,22 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505
release
end
-LavaridgeTown_HerbShop_EventScript_1FE534:: @ 81FE534
- msgbox LavaridgeTown_HerbShop_Text_1FE5EB, MSGBOX_DEFAULT
+LavaridgeTown_HerbShop_EventScript_ExplainCharcoal:: @ 81FE534
+ msgbox LavaridgeTown_HerbShop_Text_ExplainCharcoal, MSGBOX_DEFAULT
release
end
-LavaridgeTown_HerbShop_Text_1FE53E: @ 81FE53E
+LavaridgeTown_HerbShop_Text_WelcomeToHerbShop: @ 81FE53E
.string "Welcome to the HERB SHOP, home of\n"
.string "effective and inexpensive medicine!$"
-LavaridgeTown_HerbShop_Text_1FE584: @ 81FE584
+LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine: @ 81FE584
.string "You've come to look at herbal medicine\n"
.string "in LAVARIDGE?\p"
.string "That's rather commendable.\p"
.string "I like you! Take this!$"
-LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB
+LavaridgeTown_HerbShop_Text_ExplainCharcoal: @ 81FE5EB
.string "That CHARCOAL I gave you, it's used\n"
.string "for making herbal medicine.\p"
.string "It also does wonders when held by\n"
@@ -60,7 +60,7 @@ LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB
.string "It intensifies the power of FIRE-type\n"
.string "moves.$"
-LavaridgeTown_HerbShop_Text_1FE685: @ 81FE685
+LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike: @ 81FE685
.string "Herbal medicine works impressively well.\n"
.string "But your POKéMON will dislike you for it.\l"
.string "It must be horribly bitter!$"
diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json
index 83416a7c0..77ebb268e 100644
--- a/data/maps/LavaridgeTown_House/map.json
+++ b/data/maps/LavaridgeTown_House/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_House_EventScript_1FF912",
+ "script": "LavaridgeTown_House_EventScript_OldMan",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_House_EventScript_1FF91B",
+ "script": "LavaridgeTown_House_EventScript_Zigzagoon",
"flag": "0"
},
{
diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc
index 2dc6bc76e..6db5f9ee5 100644
--- a/data/maps/LavaridgeTown_House/scripts.inc
+++ b/data/maps/LavaridgeTown_House/scripts.inc
@@ -1,26 +1,26 @@
LavaridgeTown_House_MapScripts:: @ 81FF911
.byte 0
-LavaridgeTown_House_EventScript_1FF912:: @ 81FF912
- msgbox LavaridgeTown_House_Text_1FF92E, MSGBOX_NPC
+LavaridgeTown_House_EventScript_OldMan:: @ 81FF912
+ msgbox LavaridgeTown_House_Text_WifeWarmingEggInHotSprings, MSGBOX_NPC
end
-LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B
+LavaridgeTown_House_EventScript_Zigzagoon:: @ 81FF91B
lock
faceplayer
waitse
playmoncry SPECIES_ZIGZAGOON, 0
- msgbox LavaridgeTown_House_Text_1FF9BB, MSGBOX_DEFAULT
+ msgbox LavaridgeTown_House_Text_Zigzagoon, MSGBOX_DEFAULT
waitmoncry
release
end
-LavaridgeTown_House_Text_1FF92E: @ 81FF92E
+LavaridgeTown_House_Text_WifeWarmingEggInHotSprings: @ 81FF92E
.string "My wife's warming an EGG in the hot\n"
.string "springs. This is what she told me.\p"
.string "She left two POKéMON with the DAY CARE.\n"
.string "And they discovered that EGG!$"
-LavaridgeTown_House_Text_1FF9BB: @ 81FF9BB
+LavaridgeTown_House_Text_Zigzagoon: @ 81FF9BB
.string "ZIGZAGOON: Pshoo!$"
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index 2ca9c7b06..40b4cf658 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -16,7 +16,7 @@ EventScript_FieldWhiteOut:: @ 82736D9
special Script_FadeOutMapMusic
waitstate
fadescreen 1
- call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter
+ call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter
special SetCB2WhiteOut
waitstate
end
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index e39c6eca6..eaef6d45a 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -199,8 +199,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
setflag FLAG_HIDE_ROUTE_104_RIVAL
setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
- setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
- setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
+ setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
+ setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE
setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
diff --git a/include/constants/flags.h b/include/constants/flags.h
index e76a9d9d7..062ed4771 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -119,7 +119,7 @@
#define FLAG_OCEANIC_MUSEUM_MET_REPORTER 0x69
#define FLAG_RECEIVED_HM04 0x6A
#define FLAG_RECEIVED_HM06 0x6B
-#define FLAG_FLANNERY_GIVES_BADGE_INFO 0x6C
+#define FLAG_WHITEOUT_TO_LAVARIDGE 0x6C // Set after defeating Flannery, so the player cant white out from poison before receiving Go Goggles
#define FLAG_RECEIVED_HM05 0x6D
#define FLAG_RECEIVED_HM02 0x6E
#define FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT 0x6F
@@ -969,8 +969,8 @@
#define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA 0x39E
#define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA 0x39F
#define FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO 0x3A0
-#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 0x3A1
-#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 0x3A2
+#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL 0x3A1
+#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE 0x3A2
#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3
#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4
#define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL 0x3A5
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:19:17 +0000