summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/abnormal_weather.inc (renamed from data/scripts/unusual_weather.inc)176
-rw-r--r--data/scripts/battle_pike.inc103
-rw-r--r--data/scripts/cable_club.inc27
-rw-r--r--data/scripts/day_care.inc4
-rw-r--r--data/scripts/field_poison.inc12
-rw-r--r--data/scripts/mauville_man.inc3
-rw-r--r--data/scripts/obtain_item.inc3
7 files changed, 163 insertions, 165 deletions
diff --git a/data/scripts/unusual_weather.inc b/data/scripts/abnormal_weather.inc
index ad6985ac8..9a900f315 100644
--- a/data/scripts/unusual_weather.inc
+++ b/data/scripts/abnormal_weather.inc
@@ -1,44 +1,44 @@
-UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913
+AbnormalWeather_EventScript_PlaceTilesRoute114North:: @ 8273913
setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1
setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926
+AbnormalWeather_EventScript_PlaceTilesRoute114South:: @ 8273926
setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939
+AbnormalWeather_EventScript_PlaceTilesRoute115West:: @ 8273939
setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C
+AbnormalWeather_EventScript_PlaceTilesRoute115East:: @ 827394C
setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F
+AbnormalWeather_EventScript_PlaceTilesRoute116North:: @ 827395F
setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1
setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972
+AbnormalWeather_EventScript_PlaceTilesRoute116South:: @ 8273972
setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1
setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985
+AbnormalWeather_EventScript_PlaceTilesRoute118East:: @ 8273985
setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1
setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998
+AbnormalWeather_EventScript_PlaceTilesRoute118West:: @ 8273998
setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1
setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
+AbnormalWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
setmetatile 10, 28, METATILE_General_RoughWater, 0
setmetatile 11, 28, METATILE_General_RoughWater, 0
setmetatile 9, 29, METATILE_General_RoughWater, 0
@@ -53,7 +53,7 @@ UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
setmetatile 11, 31, METATILE_General_RoughWater, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
+AbnormalWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
setmetatile 20, 53, METATILE_General_RoughWater, 0
setmetatile 21, 53, METATILE_General_RoughWater, 0
setmetatile 19, 54, METATILE_General_RoughWater, 0
@@ -68,7 +68,7 @@ UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
setmetatile 21, 56, METATILE_General_RoughWater, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
+AbnormalWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
setmetatile 8, 16, METATILE_General_RoughWater, 0
setmetatile 9, 16, METATILE_General_RoughWater, 0
setmetatile 7, 17, METATILE_General_RoughWater, 0
@@ -83,7 +83,7 @@ UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
setmetatile 9, 19, METATILE_General_RoughWater, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
+AbnormalWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
setmetatile 53, 18, METATILE_General_RoughWater, 0
setmetatile 54, 18, METATILE_General_RoughWater, 0
setmetatile 52, 19, METATILE_General_RoughWater, 0
@@ -98,7 +98,7 @@ UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
setmetatile 54, 21, METATILE_General_RoughWater, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
+AbnormalWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
setmetatile 57, 9, METATILE_General_RoughWater, 0
setmetatile 58, 9, METATILE_General_RoughWater, 0
setmetatile 56, 10, METATILE_General_RoughWater, 0
@@ -113,7 +113,7 @@ UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
setmetatile 58, 12, METATILE_General_RoughWater, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
+AbnormalWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
setmetatile 61, 30, METATILE_General_RoughWater, 0
setmetatile 62, 30, METATILE_General_RoughWater, 0
setmetatile 60, 31, METATILE_General_RoughWater, 0
@@ -128,7 +128,7 @@ UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
setmetatile 62, 33, METATILE_General_RoughWater, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
+AbnormalWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
setmetatile 16, 14, METATILE_General_RoughWater, 0
setmetatile 17, 14, METATILE_General_RoughWater, 0
setmetatile 15, 15, METATILE_General_RoughWater, 0
@@ -143,7 +143,7 @@ UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
setmetatile 17, 17, METATILE_General_RoughWater, 0
return
-UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
+AbnormalWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
setmetatile 42, 19, METATILE_General_RoughWater, 0
setmetatile 43, 19, METATILE_General_RoughWater, 0
setmetatile 41, 20, METATILE_General_RoughWater, 0
@@ -158,110 +158,110 @@ UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
setmetatile 43, 22, METATILE_General_RoughWater, 0
return
-UnusualWeather_EventScript_HideMapNamePopup:: @ 8273D13
+AbnormalWeather_EventScript_HideMapNamePopup:: @ 8273D13
setflag FLAG_HIDE_MAP_NAME_POPUP
return
-UnusualWeather_StartKyogreWeather:: @ 8273D17
- setweather WEATHER_RAIN_HEAVY
+AbnormalWeather_StartKyogreWeather:: @ 8273D17
+ setweather WEATHER_DOWNPOUR
return
-UnusualWeather_StartGroudonWeather:: @ 8273D1B
+AbnormalWeather_StartGroudonWeather:: @ 8273D1B
setweather WEATHER_DROUGHT
return
-UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
+AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
lockall
- compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START
- goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage
- goto UnusualWeather_EventScript_ShowSunEndedMessage
+ compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START
+ goto_if_ge AbnormalWeather_EventScript_ShowRainEndedMessage
+ goto AbnormalWeather_EventScript_ShowSunEndedMessage
end
-UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
+AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
closemessage
fadescreenswapbuffers 1
setweather WEATHER_SUNNY
doweather
- call UnusualWeather_EventScript_CleanupMapTiles
+ call AbnormalWeather_EventScript_CleanupMapTiles
special DrawWholeMapView
- setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE
- setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0
+ setvar VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE
+ setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 0
clearflag FLAG_HIDE_MAP_NAME_POPUP
fadescreenswapbuffers 0
releaseall
end
-UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51
- msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT
- goto UnusualWeather_EventScript_EndEventAndCleanup_2
+AbnormalWeather_EventScript_ShowRainEndedMessage:: @ 8273D51
+ msgbox gText_AbnormalWeatherEnded_Rain, MSGBOX_DEFAULT
+ goto AbnormalWeather_EventScript_EndEventAndCleanup_2
end
-UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F
- msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT
- goto UnusualWeather_EventScript_EndEventAndCleanup_2
+AbnormalWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F
+ msgbox gText_AbnormalWeatherEnded_Sun, MSGBOX_DEFAULT
+ goto AbnormalWeather_EventScript_EndEventAndCleanup_2
end
-UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D
- switch VAR_UNUSUAL_WEATHER_LOCATION
- case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North
- case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South
- case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West
- case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East
- case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North
- case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South
- case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East
- case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West
- case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North
- case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South
- case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West
- case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East
- case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North
- case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South
- case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West
- case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East
- return
-
-UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23
+AbnormalWeather_EventScript_CleanupMapTiles:: @ 8273D6D
+ switch VAR_ABNORMAL_WEATHER_LOCATION
+ case ABNORMAL_WEATHER_ROUTE_114_NORTH, AbnormalWeather_EventScript_CleanupRoute114North
+ case ABNORMAL_WEATHER_ROUTE_114_SOUTH, AbnormalWeather_EventScript_CleanupRoute114South
+ case ABNORMAL_WEATHER_ROUTE_115_WEST, AbnormalWeather_EventScript_CleanupRoute115West
+ case ABNORMAL_WEATHER_ROUTE_115_EAST, AbnormalWeather_EventScript_CleanupRoute115East
+ case ABNORMAL_WEATHER_ROUTE_116_NORTH, AbnormalWeather_EventScript_CleanupRoute116North
+ case ABNORMAL_WEATHER_ROUTE_116_SOUTH, AbnormalWeather_EventScript_CleanupRoute116South
+ case ABNORMAL_WEATHER_ROUTE_118_EAST, AbnormalWeather_EventScript_CleanupRoute118East
+ case ABNORMAL_WEATHER_ROUTE_118_WEST, AbnormalWeather_EventScript_CleanupRoute118West
+ case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_EventScript_CleanupRoute105North
+ case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_EventScript_CleanupRoute105South
+ case ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_EventScript_CleanupRoute125West
+ case ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_EventScript_CleanupRoute125East
+ case ABNORMAL_WEATHER_ROUTE_127_NORTH, AbnormalWeather_EventScript_CleanupRoute127North
+ case ABNORMAL_WEATHER_ROUTE_127_SOUTH, AbnormalWeather_EventScript_CleanupRoute127South
+ case ABNORMAL_WEATHER_ROUTE_129_WEST, AbnormalWeather_EventScript_CleanupRoute129West
+ case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_EventScript_CleanupRoute129East
+ return
+
+AbnormalWeather_EventScript_CleanupRoute114North:: @ 8273E23
setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1
setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1
return
-UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36
+AbnormalWeather_EventScript_CleanupRoute114South:: @ 8273E36
setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1
setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1
return
-UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49
+AbnormalWeather_EventScript_CleanupRoute115West:: @ 8273E49
setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1
setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1
return
-UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C
+AbnormalWeather_EventScript_CleanupRoute115East:: @ 8273E5C
setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1
setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1
return
-UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F
+AbnormalWeather_EventScript_CleanupRoute116North:: @ 8273E6F
setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1
setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1
return
-UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82
+AbnormalWeather_EventScript_CleanupRoute116South:: @ 8273E82
setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1
setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1
return
-UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95
+AbnormalWeather_EventScript_CleanupRoute118East:: @ 8273E95
setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1
setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1
return
-UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8
+AbnormalWeather_EventScript_CleanupRoute118West:: @ 8273EA8
setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1
setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1
return
-UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB
+AbnormalWeather_EventScript_CleanupRoute105North:: @ 8273EBB
setmetatile 10, 28, METATILE_General_CalmWater, 0
setmetatile 11, 28, METATILE_General_CalmWater, 0
setmetatile 9, 29, METATILE_General_CalmWater, 0
@@ -276,7 +276,7 @@ UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB
setmetatile 11, 31, METATILE_General_CalmWater, 0
return
-UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28
+AbnormalWeather_EventScript_CleanupRoute105South:: @ 8273F28
setmetatile 20, 53, METATILE_General_CalmWater, 0
setmetatile 21, 53, METATILE_General_CalmWater, 0
setmetatile 19, 54, METATILE_General_CalmWater, 0
@@ -291,7 +291,7 @@ UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28
setmetatile 21, 56, METATILE_General_CalmWater, 0
return
-UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95
+AbnormalWeather_EventScript_CleanupRoute125West:: @ 8273F95
setmetatile 8, 16, METATILE_General_CalmWater, 0
setmetatile 9, 16, METATILE_General_CalmWater, 0
setmetatile 7, 17, METATILE_General_CalmWater, 0
@@ -306,7 +306,7 @@ UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95
setmetatile 9, 19, METATILE_General_CalmWater, 0
return
-UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002
+AbnormalWeather_EventScript_CleanupRoute125East:: @ 8274002
setmetatile 53, 18, METATILE_General_CalmWater, 0
setmetatile 54, 18, METATILE_General_CalmWater, 0
setmetatile 52, 19, METATILE_General_CalmWater, 0
@@ -321,7 +321,7 @@ UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002
setmetatile 54, 21, METATILE_General_CalmWater, 0
return
-UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F
+AbnormalWeather_EventScript_CleanupRoute127North:: @ 827406F
setmetatile 57, 9, METATILE_General_CalmWater, 0
setmetatile 58, 9, METATILE_General_CalmWater, 0
setmetatile 56, 10, METATILE_General_CalmWater, 0
@@ -336,7 +336,7 @@ UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F
setmetatile 58, 12, METATILE_General_CalmWater, 0
return
-UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC
+AbnormalWeather_EventScript_CleanupRoute127South:: @ 82740DC
setmetatile 61, 30, METATILE_General_CalmWater, 0
setmetatile 62, 30, METATILE_General_CalmWater, 0
setmetatile 60, 31, METATILE_General_CalmWater, 0
@@ -351,7 +351,7 @@ UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC
setmetatile 62, 33, METATILE_General_CalmWater, 0
return
-UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149
+AbnormalWeather_EventScript_CleanupRoute129West:: @ 8274149
setmetatile 16, 14, METATILE_General_CalmWater, 0
setmetatile 17, 14, METATILE_General_CalmWater, 0
setmetatile 15, 15, METATILE_General_CalmWater, 0
@@ -366,7 +366,7 @@ UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149
setmetatile 17, 17, METATILE_General_CalmWater, 0
return
-UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6
+AbnormalWeather_EventScript_CleanupRoute129East:: @ 82741B6
setmetatile 42, 19, METATILE_General_CalmWater, 0
setmetatile 43, 19, METATILE_General_CalmWater, 0
setmetatile 41, 20, METATILE_General_CalmWater, 0
@@ -381,46 +381,46 @@ UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6
setmetatile 43, 22, METATILE_General_CalmWater, 0
return
-UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223
- switch VAR_UNUSUAL_WEATHER_LOCATION
- case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North
- case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South
- case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West
- case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East
- case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North
- case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South
- case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West
- case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East
+AbnormalWeather_Underwater_SetupEscapeWarp:: @ 8274223
+ switch VAR_ABNORMAL_WEATHER_LOCATION
+ case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105North
+ case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105South
+ case ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_Underwater_SetupEscapeWarpRoute125West
+ case ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute125East
+ case ABNORMAL_WEATHER_ROUTE_127_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute127North
+ case ABNORMAL_WEATHER_ROUTE_127_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute127South
+ case ABNORMAL_WEATHER_ROUTE_129_WEST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129West
+ case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129East
return
-UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281
+AbnormalWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281
setescapewarp MAP_ROUTE105, 255, 11, 29
return
-UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A
+AbnormalWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A
setescapewarp MAP_ROUTE105, 255, 21, 54
return
-UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293
+AbnormalWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293
setescapewarp MAP_ROUTE125, 255, 9, 17
return
-UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C
+AbnormalWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C
setescapewarp MAP_ROUTE125, 255, 54, 19
return
-UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5
+AbnormalWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5
setescapewarp MAP_ROUTE127, 255, 58, 10
return
-UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE
+AbnormalWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE
setescapewarp MAP_ROUTE127, 255, 62, 31
return
-UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7
+AbnormalWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7
setescapewarp MAP_ROUTE129, 255, 17, 15
return
-UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0
+AbnormalWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0
setescapewarp MAP_ROUTE129, 255, 43, 20
return
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index 81440320c..dd730a644 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -3,74 +3,74 @@ BattleFrontier_BattlePikeRoomNormal_MapScripts_2C3E1B: @ 82C3E1B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25
- battlepike_setroomobjects
- battlepike_getroomtype
+ pike_setroomobjects
+ pike_getroomtype
switch VAR_RESULT
- case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1
- case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1
- case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EC0
- case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2
- case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1
- case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3E93
- case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2
- case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3ECF
+ case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos
+ case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos
+ case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos
+ case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos
+ case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos
+ case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos
+ case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos
+ case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos
end
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3E93:: @ 82C3E93
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos:: @ 82C3E93
setobjectxyperm 1, 2, 5
setobjectxyperm 2, 6, 5
end
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2:: @ 82C3EA2
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos:: @ 82C3EA2
setobjectxyperm 1, 4, 4
setobjectxyperm 2, 3, 4
end
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1:: @ 82C3EB1
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos:: @ 82C3EB1
setobjectxyperm 1, 4, 4
setobjectxyperm 2, 0, 0
end
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EC0:: @ 82C3EC0
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos:: @ 82C3EC0
setobjectxyperm 1, 5, 5
setobjectxyperm 2, 0, 0
end
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3ECF:: @ 82C3ECF
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos:: @ 82C3ECF
setobjectxyperm 1, 4, 3
setobjectxyperm 2, 4, 4
end
BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE
- map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom
+ map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects
.2byte 0
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8
+BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects:: @ 82C3EE8
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST
- battlepike_getroomtype
+ pike_getroomtype
compare VAR_RESULT, PIKE_ROOM_STATUS
- goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35
+ goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom
compare VAR_RESULT, PIKE_ROOM_HARD_BATTLE
- goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35
+ goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom
compare VAR_RESULT, PIKE_ROOM_DOUBLE_BATTLE
- goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35
+ goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom
compare VAR_RESULT, PIKE_ROOM_BRAIN
- goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F
+ goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects
hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35:: @ 82C3F35
+BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom:: @ 82C3F35
setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F:: @ 82C3F3F
+BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects:: @ 82C3F3F
setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
- hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
+ hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @ Pike Queen hidden initially
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp:: @ 82C3F4E
@@ -89,14 +89,14 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp:: @ 82C3F64
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F
- battlepike_getstreak
+ pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
- battlepike_setstreak VAR_RESULT
+ pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
- battlepike_setnextroom
- battlepike_getroomtype
+ pike_setnextroom
+ pike_getroomtype
switch VAR_RESULT
case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom
case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom
@@ -125,12 +125,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049
waitstate
end
-BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062:: @ 82C4062
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom:: @ 82C4062
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_2, 1
end
-BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D
+BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack:: @ 82C406D
setvar VAR_TEMP_3, 0
setvar VAR_TEMP_2, 0
lockall
@@ -138,12 +138,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D
closemessage
end
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082:: @ 82C4082
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom:: @ 82C4082
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_2, 1
end
-BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D:: @ 82C408D
+BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack:: @ 82C408D
setvar VAR_TEMP_3, 0
setvar VAR_TEMP_2, 0
lockall
@@ -152,18 +152,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D:: @ 82C408D
end
BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2
- battlepike_ispartyfullhealth
+ pike_ispartyfullhealth
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing
compare VAR_RESULT, TRUE
call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing
- battlepike_getstreak
+ pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
- battlepike_setstreak VAR_RESULT
+ pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
- battlepike_isfinalroom
+ pike_isfinalroom
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom
compare VAR_RESULT, FALSE
@@ -172,11 +172,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2
end
BattleFrontier_BattlePikeRoom_EventScript_DisableHealing:: @ 82C4128
- battlepike_nohealing TRUE
+ pike_nohealing TRUE
return
BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136
- battlepike_nohealing FALSE
+ pike_nohealing FALSE
return
BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144
@@ -193,21 +193,20 @@ BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
return
-BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174
- setvar VAR_0x8004, BATTLE_PIKE_FUNC_7
- special CallBattlePikeFunction
- battlepike_ispartyfullhealth
+BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit:: @ 82C4174
+ pike_exitwildmonroom
+ pike_ispartyfullhealth
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing
compare VAR_RESULT, TRUE
call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing
- battlepike_getstreak
+ pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
- battlepike_setstreak VAR_RESULT
+ pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
- battlepike_isfinalroom
+ pike_isfinalroom
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom
compare VAR_RESULT, FALSE
@@ -215,12 +214,12 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174
waitstate
end
-BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202:: @ 82C4202
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom:: @ 82C4202
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_2, 1
end
-BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D:: @ 82C420D
+BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack:: @ 82C420D
setvar VAR_TEMP_3, 0
setvar VAR_TEMP_2, 0
lockall
@@ -235,14 +234,14 @@ BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
end
BattleFrontier_BattlePikeRoom_OnResume: @ 82C423E
- setorcopyvar VAR_0x8006, VAR_RESULT
+ setorcopyvar VAR_0x8006, VAR_RESULT @ Save VAR_RESULT from being overwritten
frontier_get FRONTIER_DATA_CHALLENGE_STATUS
compare VAR_RESULT, CHALLENGE_STATUS_PAUSED
- goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B
+ goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume
compare VAR_RESULT, CHALLENGE_STATUS_SAVING
- goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B
+ goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume
call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves
-BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B
+BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume:: @ 82C426B
setorcopyvar VAR_RESULT, VAR_0x8006
end
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 1b2e3f60f..f37596961 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -49,7 +49,7 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23
end
@ Unused?
-OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62
+CableClub_EventScript_MysteryGiftThankYou2:: @ 8276B62
msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT
release
end
@@ -301,7 +301,7 @@ CableClub_EventScript_Colosseum:: @ 8276EB7
end
CableClub_EventScript_SelectBattleMode:: @ 8276EC2
- message CableClub_Text_WhichBattleMode
+ message CableClub_Text_PlayWhichBattleMode
waitmessage
multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
@@ -795,39 +795,40 @@ EventScript_TradeCenter_Chair3:: @ 8277413
waitstate
end
+@ VAR_TEMP_1 for below scripts set by ReceiveGiftItem
EventScript_RecordCenter_Spot0:: @ 827741D
setvar VAR_0x8005, 0
special RecordMixingPlayerSpotTriggered
waitstate
- compare VAR_TEMP_1, 0
- goto_if_ne RecordCorner_EventScript_277471
+ compare VAR_TEMP_1, ITEM_NONE
+ goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot1:: @ 8277432
setvar VAR_0x8005, 1
special RecordMixingPlayerSpotTriggered
waitstate
- compare VAR_TEMP_1, 0
- goto_if_ne RecordCorner_EventScript_277471
+ compare VAR_TEMP_1, ITEM_NONE
+ goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot2:: @ 8277447
setvar VAR_0x8005, 2
special RecordMixingPlayerSpotTriggered
waitstate
- compare VAR_TEMP_1, 0
- goto_if_ne RecordCorner_EventScript_277471
+ compare VAR_TEMP_1, ITEM_NONE
+ goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot3:: @ 827745C
setvar VAR_0x8005, 3
special RecordMixingPlayerSpotTriggered
waitstate
- compare VAR_TEMP_1, 0
- goto_if_ne RecordCorner_EventScript_277471
+ compare VAR_TEMP_1, ITEM_NONE
+ goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
-RecordCorner_EventScript_277471:: @ 8277471
+RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471
bufferitemname 1, VAR_TEMP_1
message RecordCorner_Text_PlayerSentOverOneX
waitmessage
@@ -868,7 +869,7 @@ TradeCenter_EventScript_Attendant:: @ 82774B6
closemessage
end
-RecordCorner_EventScript_2774C6:: @ 82774C6
+RecordCorner_EventScript_Attendant:: @ 82774C6
compare VAR_TEMP_0, 0
goto_if_ne RecordCorner_EventScript_AlreadyMixed
special Script_FacePlayer
@@ -1090,7 +1091,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D
end
CableClub_EventScript_WirelessBattleSelect:: @ 827783B
- message CableClub_Text_WhichBattleMode
+ message CableClub_Text_PlayWhichBattleMode
waitmessage
multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 61763ba17..968464f9d 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -262,7 +262,7 @@ Route117_PokemonDayCare_Movement_RetrieveDaycareMon: @ 8291F47
step_end
@ Unused. Possibly a commented script, or a typo end added to the above Movement script
-Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B
+Route117_PokemonDayCare_EventScript_UnusedEnd:: @ 8291F5B
end
Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
@@ -279,7 +279,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
end
@ Unused
-Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
+Route117_PokemonDayCare_EventScript_UnusedRetrieveMon:: @ 8291F95
special ShowDaycareLevelMenu
waitstate
compare VAR_RESULT, 2
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index f33292fe6..d15da3399 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -29,15 +29,13 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
message gText_PlayerWhitedOut
waitmessage
waitbuttonpress
- setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN
- special CallBattlePikeFunction
- compare VAR_RESULT, 1
+ pike_inchallenge
+ compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattlePike_EventScript_Retire
- setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
- special CallBattlePyramidFunction
- compare VAR_RESULT, 1
+ pyramid_inchallenge
+ compare VAR_RESULT, 1 @ On Pyramid floor
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
- compare VAR_RESULT, 2
+ compare VAR_RESULT, 2 @ On Pyramid peak
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
trainerhill_inchallenge
compare VAR_RESULT, TRUE
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 34622775a..a6585ca4d 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -289,7 +289,8 @@ MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales: @ 828E7EE
.string "Then tell me, have you any tales that\n"
.string "are even remotely legendary?$"
-MauvilleCity_PokemonCenter_1F_Text_28E844: @ 828E844
+@ Unused
+MauvilleCity_PokemonCenter_1F_Text_HearAnotherLegendaryTale: @ 828E844
.string "Incidentally… Would you care to hear\n"
.string "another legendary tale?$"
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index 206277cb7..77b795f60 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -128,8 +128,7 @@ EventScript_PickUpItem:: @ 8271C3A
waitfanfare
waitmessage
bufferitemnameplural 1, VAR_0x8004, VAR_0x8005
- setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
- special CallBattlePyramidFunction
+ pyramid_inchallenge
compare VAR_RESULT, 1
goto_if_eq EventScript_PutBattlePyramidItemInBag
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 11:42:43 +0000