dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Name several vars, document some related events

Browse Source
This commit is contained in:
Phlosioneer
2019-02-27 20:25:09 -05:00
parent 648fc3d4f3
commit e77e7844ea
42 changed files with 103 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+3 -3
View File
@@ -824,7 +824,7 @@
.byte \y .byte \y
.endm .endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoice x:req, y:req, list:req, b:req .macro multichoice x:req, y:req, list:req, b:req
.byte 0x6f .byte 0x6f
.byte \x .byte \x
@@ -833,7 +833,7 @@
.byte \b .byte \b
.endm .endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoicedefault x:req, y:req, list:req, default:req, b:req .macro multichoicedefault x:req, y:req, list:req, default:req, b:req
.byte 0x70 .byte 0x70
.byte \x .byte \x
@@ -843,7 +843,7 @@
.byte \b .byte \b
.endm .endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box. @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
.macro multichoicegrid x:req, y:req, list:req, per_row:req, B:req .macro multichoicegrid x:req, y:req, list:req, per_row:req, B:req
.byte 0x71 .byte 0x71
.byte \x .byte \x
data/event_scripts.s
+2 -2
View File
@@ -1093,7 +1093,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
special sub_81AFDD0 special sub_81AFDD0
setflag FLAG_IS_CHAMPION setflag FLAG_IS_CHAMPION
call EverGrandeCity_HallOfFame_EventScript_271829 call EverGrandeCity_HallOfFame_EventScript_271829
compare VAR_0x40CC, 0 compare VAR_FOSSIL_MANIAC_STATE, 0
call_if_eq EverGrandeCity_HallOfFame_EventScript_271839 call_if_eq EverGrandeCity_HallOfFame_EventScript_271839
clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
call EverGrandeCity_HallOfFame_EventScript_2718CC call EverGrandeCity_HallOfFame_EventScript_2718CC
@@ -1126,7 +1126,7 @@ EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829
return return
EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839 EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839
setvar VAR_0x40CC, 1 setvar VAR_FOSSIL_MANIAC_STATE, 1
return return
EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F
data/maps/BattleFrontier_ReceptionGate/scripts.inc
+2 -2
View File
@@ -8,12 +8,12 @@ BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
end end
BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9 BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9
map_script_2 VAR_0x40D0, 0, BattleFrontier_ReceptionGate_EventScript_2661F3 map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_2661F3
.2byte 0 .2byte 0
BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
lockall lockall
setvar VAR_0x40D0, 1 setvar VAR_HAS_ENTERED_BATTLE_FRONTIER, 1
playse SE_PIN playse SE_PIN
applymovement 1, Common_Movement_ExclamationMark applymovement 1, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+3 -3
View File
@@ -184,11 +184,11 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
applymovement 1, Common_Movement_FacePlayer applymovement 1, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT
compare VAR_0x40D1, 13 compare VAR_SCOTT_STATE, 13
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC
compare VAR_0x40D1, 9 compare VAR_SCOTT_STATE, 9
goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB
compare VAR_0x40D1, 6 compare VAR_SCOTT_STATE, 6
goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA
goto BattleFrontier_ScottsHouse_EventScript_2639E9 goto BattleFrontier_ScottsHouse_EventScript_2639E9
end end
data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -40,7 +40,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_IN_EVERGRANDE setflag FLAG_MET_SCOTT_IN_EVERGRANDE
playse SE_KAIDAN playse SE_KAIDAN
waitse waitse
data/maps/FallarborTown_BattleTentLobby/scripts.inc
+1 -1
View File
@@ -296,7 +296,7 @@ FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228
faceplayer faceplayer
goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_200245 goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_200245
msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_IN_FALLARBOR setflag FLAG_MET_SCOTT_IN_FALLARBOR
release release
end end
data/maps/JaggedPass/map.json
+5 -5
View File
@@ -184,7 +184,7 @@
"x": 21, "x": 21,
"y": 15, "y": 15,
"elevation": 3, "elevation": 3,
"var": "VAR_0x40C8", "var": "VAR_JAGGED_PASS_STATE",
"var_value": "1", "var_value": "1",
"script": "JaggedPass_EventScript_2306BB" "script": "JaggedPass_EventScript_2306BB"
}, },
@@ -193,7 +193,7 @@
"x": 22, "x": 22,
"y": 20, "y": 20,
"elevation": 3, "elevation": 3,
"var": "VAR_0x40C8", "var": "VAR_JAGGED_PASS_STATE",
"var_value": "1", "var_value": "1",
"script": "JaggedPass_EventScript_2306BB" "script": "JaggedPass_EventScript_2306BB"
}, },
@@ -202,7 +202,7 @@
"x": 21, "x": 21,
"y": 20, "y": 20,
"elevation": 3, "elevation": 3,
"var": "VAR_0x40C8", "var": "VAR_JAGGED_PASS_STATE",
"var_value": "1", "var_value": "1",
"script": "JaggedPass_EventScript_2306BB" "script": "JaggedPass_EventScript_2306BB"
}, },
@@ -211,7 +211,7 @@
"x": 14, "x": 14,
"y": 15, "y": 15,
"elevation": 3, "elevation": 3,
"var": "VAR_0x40C8", "var": "VAR_JAGGED_PASS_STATE",
"var_value": "1", "var_value": "1",
"script": "JaggedPass_EventScript_2306BB" "script": "JaggedPass_EventScript_2306BB"
}, },
@@ -220,7 +220,7 @@
"x": 13, "x": 13,
"y": 15, "y": 15,
"elevation": 3, "elevation": 3,
"var": "VAR_0x40C8", "var": "VAR_JAGGED_PASS_STATE",
"var_value": "1", "var_value": "1",
"script": "JaggedPass_EventScript_2306BB" "script": "JaggedPass_EventScript_2306BB"
} }
data/maps/JaggedPass/scripts.inc
+4 -4
View File
@@ -6,7 +6,7 @@ JaggedPass_MapScripts:: @ 8230656
JaggedPass_MapScript1_230666: @ 8230666 JaggedPass_MapScript1_230666: @ 8230666
setstepcallback 1 setstepcallback 1
compare VAR_0x40C8, 0 compare VAR_JAGGED_PASS_STATE, 0
call_if_eq JaggedPass_EventScript_230674 call_if_eq JaggedPass_EventScript_230674
end end
@@ -17,7 +17,7 @@ JaggedPass_EventScript_230674:: @ 8230674
return return
JaggedPass_EventScript_230685:: @ 8230685 JaggedPass_EventScript_230685:: @ 8230685
setvar VAR_0x40C8, 1 setvar VAR_JAGGED_PASS_STATE, 1
return return
JaggedPass_MapScript1_23068B: @ 823068B JaggedPass_MapScript1_23068B: @ 823068B
@@ -31,7 +31,7 @@ JaggedPass_EventScript_230697:: @ 8230697
return return
JaggedPass_MapScript1_23069C: @ 823069C JaggedPass_MapScript1_23069C: @ 823069C
compare VAR_0x40C8, 1 compare VAR_JAGGED_PASS_STATE, 1
goto_if_le JaggedPass_EventScript_2306A8 goto_if_le JaggedPass_EventScript_2306A8
end end
@@ -61,7 +61,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB
setmetatile 16, 18, 606, 0 setmetatile 16, 18, 606, 0
special DrawWholeMapView special DrawWholeMapView
delay 30 delay 30
setvar VAR_0x40C8, 2 setvar VAR_JAGGED_PASS_STATE, 2
waitse waitse
releaseall releaseall
end end
data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+1 -1
View File
@@ -57,7 +57,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D
faceplayer faceplayer
goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A
msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_IN_LILYCOVE setflag FLAG_MET_SCOTT_IN_LILYCOVE
release release
end end
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+1 -1
View File
@@ -570,7 +570,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC
setflag FLAG_SYS_POKEDEX_GET setflag FLAG_SYS_POKEDEX_GET
special sub_81AFDA0 special sub_81AFDA0
setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH
setvar VAR_0x40CD, 1 setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1
return return
LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4 LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4
data/maps/MauvilleCity/scripts.inc
+1 -1
View File
@@ -168,7 +168,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
closemessage closemessage
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if_eq MauvilleCity_EventScript_1DF616 call_if_eq MauvilleCity_EventScript_1DF616
compare VAR_FACING, 4 compare VAR_FACING, 4
data/maps/MauvilleCity_Gym/scripts.inc
+1 -1
View File
@@ -90,7 +90,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
waitmessage waitmessage
call Common_EventScript_PlayGymBadgeFanfare call Common_EventScript_PlayGymBadgeFanfare
msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT
setvar VAR_0x40D2, 3 setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3
clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_DEFEATED_MAUVILLE_GYM
setflag FLAG_BADGE03_GET setflag FLAG_BADGE03_GET
data/maps/MirageTower_4F/scripts.inc
+1 -1
View File
@@ -52,7 +52,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
waitstate waitstate
special DoMirageTowerCeilingCrumble special DoMirageTowerCeilingCrumble
waitstate waitstate
setvar VAR_0x40CB, 1 setvar VAR_ROUTE_111_STATE, 1
clearflag FLAG_LANDMARK_MIRAGE_TOWER clearflag FLAG_LANDMARK_MIRAGE_TOWER
warp MAP_ROUTE111, 255, 19, 59 warp MAP_ROUTE111, 255, 19, 59
waitstate waitstate
data/maps/MossdeepCity/scripts.inc
+1 -1
View File
@@ -259,7 +259,7 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85
call_if_eq MossdeepCity_EventScript_1E4CB0 call_if_eq MossdeepCity_EventScript_1E4CB0
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if_eq MossdeepCity_EventScript_1E4CC2 call_if_eq MossdeepCity_EventScript_1E4CC2
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
removeobject 16 removeobject 16
release release
end end
data/maps/PetalburgCity/scripts.inc
+1 -1
View File
@@ -551,7 +551,7 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0 waitmovement 0
setvar VAR_0x40D1, 1 setvar VAR_SCOTT_STATE, 1
msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT
closemessage closemessage
applymovement 9, Common_Movement_WalkInPlaceRight applymovement 9, Common_Movement_WalkInPlaceRight
data/maps/Route111/scripts.inc
+9 -9
View File
@@ -7,7 +7,7 @@ Route111_MapScripts:: @ 81F0CA7
Route111_MapScript1_1F0CBC: @ 81F0CBC Route111_MapScript1_1F0CBC: @ 81F0CBC
call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1 call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1
compare VAR_0x40CB, 1 compare VAR_ROUTE_111_STATE, 1
call_if_eq Route111_EventScript_1F0CE4 call_if_eq Route111_EventScript_1F0CE4
end end
@@ -41,9 +41,9 @@ Route111_MapScript1_1F0D87: @ 81F0D87
setvar VAR_0x40D6, 0 setvar VAR_0x40D6, 0
special SetMirageTowerVisibility special SetMirageTowerVisibility
call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C
compare VAR_0x40CB, 1 compare VAR_ROUTE_111_STATE, 1
call_if_eq Route111_EventScript_1F0DC2 call_if_eq Route111_EventScript_1F0DC2
compare VAR_0x40CB, 2 compare VAR_ROUTE_111_STATE, 2
call_if_eq Route111_EventScript_1F0E40 call_if_eq Route111_EventScript_1F0E40
call Route111_EventScript_1F0DE6 call Route111_EventScript_1F0DE6
call Route111_EventScript_28CCC7 call Route111_EventScript_28CCC7
@@ -101,11 +101,11 @@ Route111_EventScript_1F0E3C:: @ 81F0E3C
return return
Route111_EventScript_1F0E40:: @ 81F0E40 Route111_EventScript_1F0E40:: @ 81F0E40
setvar VAR_0x40CB, 3 setvar VAR_ROUTE_111_STATE, 3
return return
Route111_MapScript2_1F0E46: @ 81F0E46 Route111_MapScript2_1F0E46: @ 81F0E46
map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E50 map_script_2 VAR_ROUTE_111_STATE, 1, Route111_EventScript_1F0E50
.2byte 0 .2byte 0
Route111_EventScript_1F0E50:: @ 81F0E50 Route111_EventScript_1F0E50:: @ 81F0E50
@@ -113,7 +113,7 @@ Route111_EventScript_1F0E50:: @ 81F0E50
end end
Route111_MapScript2_1F0E56: @ 81F0E56 Route111_MapScript2_1F0E56: @ 81F0E56
map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E60 map_script_2 VAR_ROUTE_111_STATE, 1, Route111_EventScript_1F0E60
.2byte 0 .2byte 0
Route111_EventScript_1F0E60:: @ 81F0E60 Route111_EventScript_1F0E60:: @ 81F0E60
@@ -134,7 +134,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60
waitstate waitstate
special StartMirageTowerFossilFallAndSink special StartMirageTowerFossilFallAndSink
waitstate waitstate
setvar VAR_0x40CB, 2 setvar VAR_ROUTE_111_STATE, 2
clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7 goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7
msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT
@@ -411,9 +411,9 @@ Route111_EventScript_1F1192:: @ 81F1192
Route111_EventScript_1F119B:: @ 81F119B Route111_EventScript_1F119B:: @ 81F119B
lock lock
faceplayer faceplayer
compare VAR_0x40CB, 3 compare VAR_ROUTE_111_STATE, 3
goto_if_eq Route111_EventScript_1F11C6 goto_if_eq Route111_EventScript_1F11C6
compare VAR_0x40CB, 2 compare VAR_ROUTE_111_STATE, 2
goto_if_eq Route111_EventScript_1F11D0 goto_if_eq Route111_EventScript_1F11D0
goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA
msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT
data/maps/Route114_FossilManiacsTunnel/map.json
+2 -2
View File
@@ -57,7 +57,7 @@
"x": 5, "x": 5,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
"var": "VAR_0x40CC", "var": "VAR_FOSSIL_MANIAC_STATE",
"var_value": "1", "var_value": "1",
"script": "Route114_FossilManiacsTunnel_EventScript_22AF66" "script": "Route114_FossilManiacsTunnel_EventScript_22AF66"
}, },
@@ -66,7 +66,7 @@
"x": 6, "x": 6,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
"var": "VAR_0x40CC", "var": "VAR_FOSSIL_MANIAC_STATE",
"var_value": "1", "var_value": "1",
"script": "Route114_FossilManiacsTunnel_EventScript_22AF66" "script": "Route114_FossilManiacsTunnel_EventScript_22AF66"
} }
data/maps/Route114_FossilManiacsTunnel/scripts.inc
+1 -1
View File
@@ -27,7 +27,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
waitmovement 0 waitmovement 0
msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT
setvar VAR_0x40CC, 2 setvar VAR_FOSSIL_MANIAC_STATE, 2
releaseall releaseall
end end
data/maps/Route119/scripts.inc
+2 -2
View File
@@ -167,7 +167,7 @@ Route119_EventScript_1F460F:: @ 81F460F
addobject 43 addobject 43
applymovement 43, Route119_Movement_1F4752 applymovement 43, Route119_Movement_1F4752
waitmovement 0 waitmovement 0
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_TEMP_1, 1 compare VAR_TEMP_1, 1
@@ -491,7 +491,7 @@ Route119_EventScript_1F49EC:: @ 81F49EC
pokenavcall Route119_Text_1F4FBA pokenavcall Route119_Text_1F4FBA
waitmessage waitmessage
clearflag FLAG_REGISTER_WINONA_POKENAV clearflag FLAG_REGISTER_WINONA_POKENAV
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
releaseall releaseall
end end
data/maps/RustboroCity_PokemonSchool/scripts.inc
+2 -2
View File
@@ -170,7 +170,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_21406F goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_21406F
goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082 goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082
msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_RUSTBORO setflag FLAG_MET_SCOTT_RUSTBORO
release release
end end
@@ -192,7 +192,7 @@ RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090
end end
RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE
release release
end end
data/maps/SSTidalCorridor/scripts.inc
+2 -2
View File
@@ -3,7 +3,7 @@ SSTidalCorridor_MapScripts:: @ 823BFCF
.byte 0 .byte 0
SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219 map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_23C219
map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF
map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015 map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015
map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067 map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067
@@ -216,7 +216,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
waitmovement 0 waitmovement 0
delay 30 delay 30
setflag FLAG_MET_SCOTT_ON_SS_TIDAL setflag FLAG_MET_SCOTT_ON_SS_TIDAL
setvar VAR_0x40D4, 1 setvar VAR_SS_TIDAL_SCOTT_STATE, 1
releaseall releaseall
end end
data/maps/SkyPillar_1F/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SkyPillar_1F_MapScripts:: @ 8239615
.byte 0 .byte 0
SkyPillar_1F_MapScript1_23961B: @ 823961B SkyPillar_1F_MapScript1_23961B: @ 823961B
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_1F_EventScript_239627 call_if_lt SkyPillar_1F_EventScript_239627
end end
data/maps/SkyPillar_2F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SkyPillar_2F_MapScripts:: @ 823962B
.byte 0 .byte 0
SkyPillar_2F_MapScript1_23963B: @ 823963B SkyPillar_2F_MapScript1_23963B: @ 823963B
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_2F_EventScript_23964C call_if_lt SkyPillar_2F_EventScript_23964C
copyvar VAR_ICE_STEP_COUNT, 0x1 copyvar VAR_ICE_STEP_COUNT, 0x1
end end
data/maps/SkyPillar_3F/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SkyPillar_3F_MapScripts:: @ 823965B
.byte 0 .byte 0
SkyPillar_3F_MapScript1_239661: @ 8239661 SkyPillar_3F_MapScript1_239661: @ 8239661
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_3F_EventScript_23966D call_if_lt SkyPillar_3F_EventScript_23966D
end end
data/maps/SkyPillar_4F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SkyPillar_4F_MapScripts:: @ 8239671
.byte 0 .byte 0
SkyPillar_4F_MapScript1_239681: @ 8239681 SkyPillar_4F_MapScript1_239681: @ 8239681
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_4F_EventScript_239692 call_if_lt SkyPillar_4F_EventScript_239692
copyvar VAR_ICE_STEP_COUNT, 0x1 copyvar VAR_ICE_STEP_COUNT, 0x1
end end
data/maps/SkyPillar_5F/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SkyPillar_5F_MapScripts:: @ 82396A2
.byte 0 .byte 0
SkyPillar_5F_MapScript1_2396A8: @ 82396A8 SkyPillar_5F_MapScript1_2396A8: @ 82396A8
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_5F_EventScript_2396B4 call_if_lt SkyPillar_5F_EventScript_2396B4
return return
data/maps/SkyPillar_Top/scripts.inc
+4 -4
View File
@@ -16,9 +16,9 @@ SkyPillar_Top_EventScript_2396D2:: @ 82396D2
return return
SkyPillar_Top_MapScript1_2396E6: @ 82396E6 SkyPillar_Top_MapScript1_2396E6: @ 82396E6
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_Top_EventScript_2396FD call_if_lt SkyPillar_Top_EventScript_2396FD
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
call_if_ge SkyPillar_Top_EventScript_239705 call_if_ge SkyPillar_Top_EventScript_239705
end end
@@ -36,7 +36,7 @@ SkyPillar_Top_EventScript_23970F:: @ 823970F
return return
SkyPillar_Top_MapScript2_239713: @ 8239713 SkyPillar_Top_MapScript2_239713: @ 8239713
map_script_2 VAR_0x40CA, 0, SkyPillar_Top_EventScript_23971D map_script_2 VAR_SKY_PILLAR_STATE, 0, SkyPillar_Top_EventScript_23971D
.2byte 0 .2byte 0
SkyPillar_Top_EventScript_23971D:: @ 823971D SkyPillar_Top_EventScript_23971D:: @ 823971D
@@ -131,7 +131,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
setvar VAR_RAYQUAZA_STATE, 5 setvar VAR_RAYQUAZA_STATE, 5
setvar VAR_0x40CA, 1 setvar VAR_SKY_PILLAR_STATE, 1
setvar VAR_0x40D7, 1 setvar VAR_0x40D7, 1
releaseall releaseall
end end
data/maps/SlateportCity/map.json
+1 -1
View File
@@ -571,7 +571,7 @@
"x": 10, "x": 10,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"var": "VAR_0x40D2", "var": "VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE",
"var_value": "2", "var_value": "2",
"script": "SlateportCity_EventScript_1DD5DC" "script": "SlateportCity_EventScript_1DD5DC"
} }
data/maps/SlateportCity/scripts.inc
+6 -6
View File
@@ -8,7 +8,7 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C
call SlateportCity_EventScript_1DCC8D call SlateportCity_EventScript_1DCC8D
compare VAR_SLATEPORT_STATE, 1 compare VAR_SLATEPORT_STATE, 1
call_if_eq SlateportCity_EventScript_1DCC99 call_if_eq SlateportCity_EventScript_1DCC99
compare VAR_0x40D2, 1 compare VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1
call_if_eq SlateportCity_EventScript_1DCCE7 call_if_eq SlateportCity_EventScript_1DCCE7
end end
@@ -50,7 +50,7 @@ SlateportCity_EventScript_1DCD06:: @ 81DCD06
return return
SlateportCity_MapScript2_1DCD12: @ 81DCD12 SlateportCity_MapScript2_1DCD12: @ 81DCD12
map_script_2 VAR_0x40D2, 1, SlateportCity_EventScript_1DCD1C map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_1DCD1C
.2byte 0 .2byte 0
SlateportCity_EventScript_1DCD1C:: @ 81DCD1C SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
@@ -84,8 +84,8 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
setobjectxyperm 35, 10, 12 setobjectxyperm 35, 10, 12
setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_SPECIAL_FLAG_0x4000
setvar VAR_0x40D2, 2 setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
releaseall releaseall
end end
@@ -901,8 +901,8 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
applymovement 35, SlateportCity_Movement_1DD63A applymovement 35, SlateportCity_Movement_1DD63A
waitmovement 0 waitmovement 0
removeobject 35 removeobject 35
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
setvar VAR_0x40D2, 3 setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3
releaseall releaseall
end end
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+1 -1
View File
@@ -86,7 +86,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
setflag FLAG_DELIVERED_DEVON_GOODS setflag FLAG_DELIVERED_DEVON_GOODS
clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
setvar VAR_0x40D2, 1 setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1
fadescreen 0 fadescreen 0
release release
end end
data/maps/SootopolisCity/scripts.inc
+10 -10
View File
@@ -35,7 +35,7 @@ SootopolisCity_MapScript1_1E56EF: @ 81E56EF
setflag FLAG_VISITED_SOOTOPOLIS_CITY setflag FLAG_VISITED_SOOTOPOLIS_CITY
compare VAR_RAYQUAZA_STATE, 1 compare VAR_RAYQUAZA_STATE, 1
call_if_eq SootopolisCity_EventScript_1E5781 call_if_eq SootopolisCity_EventScript_1E5781
compare VAR_0x40CA, 1 compare VAR_SKY_PILLAR_STATE, 1
call_if_eq SootopolisCity_EventScript_1E5781 call_if_eq SootopolisCity_EventScript_1E5781
call SootopolisCity_EventScript_1E5805 call SootopolisCity_EventScript_1E5805
call SootopolisCity_EventScript_1E57B2 call SootopolisCity_EventScript_1E57B2
@@ -89,7 +89,7 @@ SootopolisCity_EventScript_1E57B2:: @ 81E57B2
goto_if_eq SootopolisCity_EventScript_1E5801 goto_if_eq SootopolisCity_EventScript_1E5801
compare VAR_RAYQUAZA_STATE, 4 compare VAR_RAYQUAZA_STATE, 4
goto_if_eq SootopolisCity_EventScript_1E5801 goto_if_eq SootopolisCity_EventScript_1E5801
compare VAR_0x40CA, 1 compare VAR_SKY_PILLAR_STATE, 1
goto_if_le SootopolisCity_EventScript_1E5801 goto_if_le SootopolisCity_EventScript_1E5801
return return
@@ -107,9 +107,9 @@ SootopolisCity_EventScript_1E5805:: @ 81E5805
goto_if_ge SootopolisCity_EventScript_1E583D goto_if_ge SootopolisCity_EventScript_1E583D
compare VAR_RAYQUAZA_STATE, 1 compare VAR_RAYQUAZA_STATE, 1
goto_if_eq SootopolisCity_EventScript_1E583E goto_if_eq SootopolisCity_EventScript_1E583E
compare VAR_0x40CA, 1 compare VAR_SKY_PILLAR_STATE, 1
goto_if_eq SootopolisCity_EventScript_1E583E goto_if_eq SootopolisCity_EventScript_1E583E
compare VAR_0x40CA, 1 compare VAR_SKY_PILLAR_STATE, 1
goto_if_le Common_EventScript_SetWeather15 goto_if_le Common_EventScript_SetWeather15
return return
@@ -172,9 +172,9 @@ SootopolisCity_MapScript2_1E58DB: @ 81E58DB
.2byte 0 .2byte 0
SootopolisCity_EventScript_1E58E5:: @ 81E58E5 SootopolisCity_EventScript_1E58E5:: @ 81E58E5
compare VAR_0x40CA, 1 compare VAR_SKY_PILLAR_STATE, 1
call_if_eq SootopolisCity_EventScript_1E58FC call_if_eq SootopolisCity_EventScript_1E58FC
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
call_if_eq SootopolisCity_EventScript_1E5901 call_if_eq SootopolisCity_EventScript_1E5901
end end
@@ -184,7 +184,7 @@ SootopolisCity_EventScript_1E58FC:: @ 81E58FC
SootopolisCity_EventScript_1E5901:: @ 81E5901 SootopolisCity_EventScript_1E5901:: @ 81E5901
turnobject EVENT_OBJ_ID_PLAYER, 2 turnobject EVENT_OBJ_ID_PLAYER, 2
setvar VAR_0x40CA, 3 setvar VAR_SKY_PILLAR_STATE, 3
return return
SootopolisCity_MapScript1_1E590B: @ 81E590B SootopolisCity_MapScript1_1E590B: @ 81E590B
@@ -193,7 +193,7 @@ SootopolisCity_MapScript1_1E590B: @ 81E590B
SootopolisCity_MapScript2_1E5914: @ 81E5914 SootopolisCity_MapScript2_1E5914: @ 81E5914
map_script_2 VAR_RAYQUAZA_STATE, 1, SootopolisCity_EventScript_1E5926 map_script_2 VAR_RAYQUAZA_STATE, 1, SootopolisCity_EventScript_1E5926
map_script_2 VAR_0x40CA, 1, SootopolisCity_EventScript_1E5BFE map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_1E5BFE
.2byte 0 .2byte 0
SootopolisCity_EventScript_1E5926:: @ 81E5926 SootopolisCity_EventScript_1E5926:: @ 81E5926
@@ -540,7 +540,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
special WaitWeather special WaitWeather
waitstate waitstate
clearflag FLAG_SYS_WEATHER_CTRL clearflag FLAG_SYS_WEATHER_CTRL
setvar VAR_0x40CA, 3 setvar VAR_SKY_PILLAR_STATE, 3
clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
fadenewbgm MUS_RUNECITY fadenewbgm MUS_RUNECITY
delay 120 delay 120
@@ -593,7 +593,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
special WaitWeather special WaitWeather
waitstate waitstate
clearflag FLAG_SYS_WEATHER_CTRL clearflag FLAG_SYS_WEATHER_CTRL
setvar VAR_0x40CA, 2 setvar VAR_SKY_PILLAR_STATE, 2
clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
fadenewbgm MUS_NAMINORI fadenewbgm MUS_NAMINORI
delay 120 delay 120
data/maps/SootopolisCity_Mart/scripts.inc
+2 -2
View File
@@ -28,7 +28,7 @@ SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC
SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2
lock lock
faceplayer faceplayer
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
goto_if_ge SootopolisCity_Mart_EventScript_2267E2 goto_if_ge SootopolisCity_Mart_EventScript_2267E2
goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_2267E2 goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_2267E2
msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT
@@ -43,7 +43,7 @@ SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2
SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC
lock lock
faceplayer faceplayer
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
goto_if_ge SootopolisCity_Mart_EventScript_22680C goto_if_ge SootopolisCity_Mart_EventScript_22680C
goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_22680C goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_22680C
msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT
data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -18,7 +18,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500
SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E
lock lock
faceplayer faceplayer
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E
goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_22652E goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_22652E
msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT
@@ -33,7 +33,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E
SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538
lock lock
faceplayer faceplayer
compare VAR_0x40CA, 2 compare VAR_SKY_PILLAR_STATE, 2
goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558 goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558
goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_226558 goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_226558
msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT
data/maps/SouthernIsland_Interior/scripts.inc
+4 -4
View File
@@ -15,9 +15,9 @@ SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
return return
SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E
compare VAR_0x40D5, 0 compare VAR_ROAMER_POKEMON, 0
call_if_eq SouthernIsland_Interior_EventScript_242A8A call_if_eq SouthernIsland_Interior_EventScript_242A8A
compare VAR_0x40D5, 0 compare VAR_ROAMER_POKEMON, 0
call_if_ne SouthernIsland_Interior_EventScript_242A95 call_if_ne SouthernIsland_Interior_EventScript_242A95
call SouthernIsland_Interior_EventScript_242AA0 call SouthernIsland_Interior_EventScript_242AA0
end end
@@ -77,9 +77,9 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
delay 50 delay 50
special RemoveCameraObject special RemoveCameraObject
setvar VAR_LAST_TALKED, 2 setvar VAR_LAST_TALKED, 2
compare VAR_0x40D5, 0 compare VAR_ROAMER_POKEMON, 0
call_if_eq SouthernIsland_Interior_EventScript_242BA4 call_if_eq SouthernIsland_Interior_EventScript_242BA4
compare VAR_0x40D5, 0 compare VAR_ROAMER_POKEMON, 0
call_if_ne SouthernIsland_Interior_EventScript_242BB7 call_if_ne SouthernIsland_Interior_EventScript_242BB7
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
special BattleSetup_StartLatiBattle special BattleSetup_StartLatiBattle
data/maps/TrainerHill_Entrance/scripts.inc
+1
View File
@@ -91,6 +91,7 @@ TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA
lockall lockall
applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT
@ No "end" command; intentional fall-through to TrainerHill_Entrance_EventScript_2681DA.
TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA
closemessage closemessage
data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+1 -1
View File
@@ -307,7 +307,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0
faceplayer faceplayer
goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_201AED goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_201AED
msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT
addvar VAR_0x40D1, 1 addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_IN_VERDANTURF setflag FLAG_MET_SCOTT_IN_VERDANTURF
release release
end end
data/scripts/cable_club.inc
+2 -2
View File
@@ -197,7 +197,7 @@ RustboroCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
map_script_2 VAR_0x40CD, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0
map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85
map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85
map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85
@@ -336,7 +336,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
waitmovement 0 waitmovement 0
delay 30 delay 30
msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT
setvar VAR_0x40CD, 2 setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 2
releaseall releaseall
end end
data/scripts/players_house.inc
+2 -1
View File
@@ -510,7 +510,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
multichoice 22, 8, 108, 1 multichoice 22, 8, 108, 1
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
special InitRoamer special InitRoamer
copyvar VAR_0x40D5, VAR_RESULT copyvar VAR_ROAMER_POKEMON, VAR_RESULT
msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_LITTLEROOT_HOUSES_STATE, 4 setvar VAR_LITTLEROOT_HOUSES_STATE, 4
@@ -518,6 +518,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
releaseall releaseall
end end
@ Never called.
LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72 LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72
setflag FLAG_SYS_TV_LATIAS_LATIOS setflag FLAG_SYS_TV_LATIAS_LATIOS
return return
data/scripts/tv.inc
+3
View File
@@ -42,6 +42,9 @@ EventScript_27EE9A:: @ 827EE9A
EventScript_27EEA4:: @ 827EEA4 EventScript_27EEA4:: @ 827EEA4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
@ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and
@ It's called again when Mom actually asks for the color, overwriting
@ whatever it does here.
special InitRoamer special InitRoamer
clearflag FLAG_SYS_TV_LATIAS_LATIOS clearflag FLAG_SYS_TV_LATIAS_LATIOS
setflag FLAG_LATIOS_OR_LATIAS_ROAMING setflag FLAG_LATIOS_OR_LATIAS_ROAMING
include/constants/vars.h
+10 -10
View File
@@ -216,20 +216,20 @@
#define VAR_WHICH_FOSSIL_REVIVED 0x40C5 #define VAR_WHICH_FOSSIL_REVIVED 0x40C5
#define VAR_STEVENS_HOUSE_STATE 0x40C6 #define VAR_STEVENS_HOUSE_STATE 0x40C6
#define VAR_OLDALE_STATE 0x40C7 #define VAR_OLDALE_STATE 0x40C7
#define VAR_0x40C8 0x40C8 #define VAR_JAGGED_PASS_STATE 0x40C8
#define VAR_0x40C9 0x40C9 #define VAR_0x40C9 0x40C9
#define VAR_0x40CA 0x40CA #define VAR_SKY_PILLAR_STATE 0x40CA
#define VAR_0x40CB 0x40CB #define VAR_ROUTE_111_STATE 0x40CB
#define VAR_0x40CC 0x40CC #define VAR_FOSSIL_MANIAC_STATE 0x40CC
#define VAR_0x40CD 0x40CD #define VAR_CABLE_CLUB_TUTORIAL_STATE 0x40CD
#define VAR_FRONTIER_BATTLE_MODE 0x40CE #define VAR_FRONTIER_BATTLE_MODE 0x40CE
#define VAR_FRONTIER_FACILITY 0x40CF #define VAR_FRONTIER_FACILITY 0x40CF
#define VAR_0x40D0 0x40D0 #define VAR_HAS_ENTERED_BATTLE_FRONTIER 0x40D0 // Var is used like a flag.
#define VAR_0x40D1 0x40D1 #define VAR_SCOTT_STATE 0x40D1
#define VAR_0x40D2 0x40D2 #define VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE 0x40D2
#define VAR_0x40D3 0x40D3 #define VAR_0x40D3 0x40D3
#define VAR_0x40D4 0x40D4 #define VAR_SS_TIDAL_SCOTT_STATE 0x40D4 // Always equal to FLAG_MET_SCOTT_ON_SS_TIDAL
#define VAR_0x40D5 0x40D5 #define VAR_ROAMER_POKEMON 0x40D5 // 0 = Latias, 1 = Latios
#define VAR_0x40D6 0x40D6 #define VAR_0x40D6 0x40D6
#define VAR_0x40D7 0x40D7 #define VAR_0x40D7 0x40D7
#define VAR_0x40D8 0x40D8 #define VAR_0x40D8 0x40D8
src/mirage_tower.c
+1 -1
View File
@@ -317,7 +317,7 @@ void SetMirageTowerVisibility(void)
u16 rand; u16 rand;
bool8 visible; bool8 visible;
if (VarGet(VAR_0x40CB)) if (VarGet(VAR_ROUTE_111_STATE))
{ {
FlagClear(FLAG_MIRAGE_TOWER_VISIBLE); FlagClear(FLAG_MIRAGE_TOWER_VISIBLE);
return; return;
src/overworld.c
+2 -2
View File
@@ -1034,7 +1034,7 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
static bool16 NoMusicInSotopolisWithLegendaries(struct WarpData *warp) static bool16 NoMusicInSotopolisWithLegendaries(struct WarpData *warp)
{ {
if (VarGet(VAR_0x40CA) != 1) if (VarGet(VAR_SKY_PILLAR_STATE) != 1)
return FALSE; return FALSE;
else if (warp->mapGroup != MAP_GROUP(SOOTOPOLIS_CITY)) else if (warp->mapGroup != MAP_GROUP(SOOTOPOLIS_CITY))
return FALSE; return FALSE;
@@ -1212,7 +1212,7 @@ void TryFadeOutOldMapMusic(void)
if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE && warpMusic != GetCurrentMapMusic()) if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE && warpMusic != GetCurrentMapMusic())
{ {
if (currentMusic == MUS_NAMINORI if (currentMusic == MUS_NAMINORI
&& VarGet(VAR_0x40CA) == 2 && VarGet(VAR_SKY_PILLAR_STATE) == 2
&& gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(SOOTOPOLIS_CITY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SOOTOPOLIS_CITY)
&& sWarpDestination.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY) && sWarpDestination.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY)