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

rename town/city vars

Browse Source
This commit is contained in:
GriffinR
2019-08-05 11:23:45 -04:00
committed by GitHub
parent 0f5d96e5f5
commit c2bf668fdd
43 changed files with 210 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/CaveOfOrigin_B1F/scripts.inc
View File

@@ -52,7 +52,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D
playse SE_KAIDAN playse SE_KAIDAN
fadescreenspeed 1, 4 fadescreenspeed 1, 4
setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR
setvar VAR_RAYQUAZA_STATE, 3 setvar VAR_SOOTOPOLIS_CITY_STATE, 3
removeobject 1 removeobject 1
clearflag FLAG_HIDE_SKY_PILLAR_WALLACE clearflag FLAG_HIDE_SKY_PILLAR_WALLACE
fadescreen 0 fadescreen 0

8
data/maps/LavaridgeTown/scripts.inc
View File

@@ -9,9 +9,9 @@ LavaridgeTown_OnTransition: @ 81EA4DE
call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F
call Common_EventScript_SetupRivalGender call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalOnBikeGender call Common_EventScript_SetupRivalOnBikeGender
compare VAR_LAVARIDGE_RIVAL_STATE, 1 compare VAR_LAVARIDGE_TOWN_STATE, 1
call_if_eq LavaridgeTown_EventScript_1EA518 call_if_eq LavaridgeTown_EventScript_1EA518
compare VAR_LAVARIDGE_RIVAL_STATE, 1 compare VAR_LAVARIDGE_TOWN_STATE, 1
call_if_eq LavaridgeTown_EventScript_1EA543 call_if_eq LavaridgeTown_EventScript_1EA543
end end
@@ -41,7 +41,7 @@ LavaridgeTown_EventScript_1EA543:: @ 81EA543
return return
LavaridgeTown_MapScript2_1EA547: @ 81EA547 LavaridgeTown_MapScript2_1EA547: @ 81EA547
map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_1EA551 map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_1EA551
.2byte 0 .2byte 0
LavaridgeTown_EventScript_1EA551:: @ 81EA551 LavaridgeTown_EventScript_1EA551:: @ 81EA551
@@ -94,7 +94,7 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
compare VAR_0x8008, 9 compare VAR_0x8008, 9
call_if_ne LavaridgeTown_EventScript_1EA6C9 call_if_ne LavaridgeTown_EventScript_1EA6C9
removeobject 7 removeobject 7
setvar VAR_LAVARIDGE_RIVAL_STATE, 2 setvar VAR_LAVARIDGE_TOWN_STATE, 2
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
savebgm MUS_DUMMY savebgm MUS_DUMMY
fadedefaultbgm fadedefaultbgm

2
data/maps/LavaridgeTown_Gym_1F/scripts.inc
View File

@@ -82,7 +82,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
setvar VAR_0x8008, 4 setvar VAR_0x8008, 4
call LavaridgeTown_Gym_1F_EventScript_271F43 call LavaridgeTown_Gym_1F_EventScript_271F43
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
setvar VAR_LAVARIDGE_RIVAL_STATE, 1 setvar VAR_LAVARIDGE_TOWN_STATE, 1
call LavaridgeTown_Gym_1F_EventScript_1FE841 call LavaridgeTown_Gym_1F_EventScript_1FE841
closemessage closemessage
delay 30 delay 30

10
data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
View File

@@ -3,9 +3,9 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A
.byte 0 .byte 0
LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80 LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80
map_script_2 VAR_RAYQUAZA_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
map_script_2 VAR_RAYQUAZA_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
map_script_2 VAR_RAYQUAZA_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
.2byte 0 .2byte 0
LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A
@@ -125,9 +125,9 @@ LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075
lockall lockall
applymovement 7, Common_Movement_FacePlayer applymovement 7, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
compare VAR_RAYQUAZA_STATE, 0 compare VAR_SOOTOPOLIS_CITY_STATE, 0
goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C
compare VAR_RAYQUAZA_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_22009C goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_22009C
goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7 goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7
end end

18
data/maps/LittlerootTown/map.json
View File

@@ -154,7 +154,7 @@
"x": 10, "x": 10,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "0", "var_value": "0",
"script": "LittlerootTown_EventScript_1E8091" "script": "LittlerootTown_EventScript_1E8091"
}, },
@@ -163,7 +163,7 @@
"x": 11, "x": 11,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "0", "var_value": "0",
"script": "LittlerootTown_EventScript_1E80EF" "script": "LittlerootTown_EventScript_1E80EF"
}, },
@@ -172,7 +172,7 @@
"x": 11, "x": 11,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "1", "var_value": "1",
"script": "LittlerootTown_EventScript_1E811F" "script": "LittlerootTown_EventScript_1E811F"
}, },
@@ -181,7 +181,7 @@
"x": 8, "x": 8,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E81F9" "script": "LittlerootTown_EventScript_1E81F9"
}, },
@@ -190,7 +190,7 @@
"x": 9, "x": 9,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E8205" "script": "LittlerootTown_EventScript_1E8205"
}, },
@@ -199,7 +199,7 @@
"x": 10, "x": 10,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E81E1" "script": "LittlerootTown_EventScript_1E81E1"
}, },
@@ -208,7 +208,7 @@
"x": 11, "x": 11,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E81ED" "script": "LittlerootTown_EventScript_1E81ED"
}, },
@@ -217,7 +217,7 @@
"x": 10, "x": 10,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E81BB" "script": "LittlerootTown_EventScript_1E81BB"
}, },
@@ -226,7 +226,7 @@
"x": 11, "x": 11,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E81CE" "script": "LittlerootTown_EventScript_1E81CE"
} }

16
data/maps/LittlerootTown/scripts.inc
View File

@@ -10,13 +10,13 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
compare VAR_LITTLEROOT_INTRO_STATE, 2 compare VAR_LITTLEROOT_INTRO_STATE, 2
call_if_eq LittlerootTown_EventScript_1E7E67 call_if_eq LittlerootTown_EventScript_1E7E67
call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F
compare VAR_LITTLEROOT_STATE, 3 compare VAR_LITTLEROOT_TOWN_STATE, 3
call_if_eq LittlerootTown_EventScript_1E7E92 call_if_eq LittlerootTown_EventScript_1E7E92
compare VAR_LITTLEROOT_HOUSES_STATE, 4 compare VAR_LITTLEROOT_HOUSES_STATE, 4
call_if_eq LittlerootTown_EventScript_1E7E5C call_if_eq LittlerootTown_EventScript_1E7E5C
compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
call_if_eq LittlerootTown_EventScript_1E7E5C call_if_eq LittlerootTown_EventScript_1E7E5C
compare VAR_OLDALE_STATE, 1 compare VAR_OLDALE_RIVAL_STATE, 1
call_if_eq LittlerootTown_EventScript_1E7E53 call_if_eq LittlerootTown_EventScript_1E7E53
compare VAR_LITTLEROOT_RIVAL_STATE, 3 compare VAR_LITTLEROOT_RIVAL_STATE, 3
call_if_eq LittlerootTown_EventScript_1E7E4F call_if_eq LittlerootTown_EventScript_1E7E4F
@@ -39,7 +39,7 @@ LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
return return
LittlerootTown_EventScript_1E7E53:: @ 81E7E53 LittlerootTown_EventScript_1E7E53:: @ 81E7E53
setvar VAR_OLDALE_STATE, 2 setvar VAR_OLDALE_RIVAL_STATE, 2
setflag FLAG_HIDE_OLDALE_TOWN_RIVAL setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
return return
@@ -53,7 +53,7 @@ LittlerootTown_EventScript_1E7E67:: @ 81E7E67
return return
LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F
compare VAR_LITTLEROOT_STATE, 0 compare VAR_LITTLEROOT_TOWN_STATE, 0
goto_if_eq LittlerootTown_EventScript_1E7E86 goto_if_eq LittlerootTown_EventScript_1E7E86
setobjectxyperm 1, 10, 1 setobjectxyperm 1, 10, 1
setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
@@ -236,7 +236,7 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034
faceplayer faceplayer
goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_1E8087 goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_1E8087
goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E807A goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E807A
compare VAR_LITTLEROOT_STATE, 0 compare VAR_LITTLEROOT_TOWN_STATE, 0
goto_if_ne LittlerootTown_EventScript_1E805D goto_if_ne LittlerootTown_EventScript_1E805D
msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT
release release
@@ -248,7 +248,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D
closemessage closemessage
applymovement 1, Common_Movement_FaceOriginalDirection applymovement 1, Common_Movement_FaceOriginalDirection
waitmovement 0 waitmovement 0
setvar VAR_LITTLEROOT_STATE, 2 setvar VAR_LITTLEROOT_TOWN_STATE, 2
release release
end end
@@ -366,7 +366,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F
closemessage closemessage
applymovement 1, Common_Movement_FaceOriginalDirection applymovement 1, Common_Movement_FaceOriginalDirection
waitmovement 0 waitmovement 0
setvar VAR_LITTLEROOT_STATE, 2 setvar VAR_LITTLEROOT_TOWN_STATE, 2
releaseall releaseall
end end
@@ -909,7 +909,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D
LittlerootTown_EventScript_1E8686:: @ 81E8686 LittlerootTown_EventScript_1E8686:: @ 81E8686
removeobject 4 removeobject 4
setflag FLAG_SYS_B_DASH setflag FLAG_SYS_B_DASH
setvar VAR_LITTLEROOT_STATE, 4 setvar VAR_LITTLEROOT_TOWN_STATE, 4
release release
end end

2
data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
View File

@@ -174,7 +174,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
delay 30 delay 30
setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setvar VAR_LITTLEROOT_STATE, 1 setvar VAR_LITTLEROOT_TOWN_STATE, 1
savebgm MUS_DUMMY savebgm MUS_DUMMY
fadedefaultbgm fadedefaultbgm
releaseall releaseall

2
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
View File

@@ -84,7 +84,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
setvar VAR_LITTLEROOT_STATE, 1 setvar VAR_LITTLEROOT_TOWN_STATE, 1
savebgm MUS_DUMMY savebgm MUS_DUMMY
fadedefaultbgm fadedefaultbgm
releaseall releaseall

2
data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
View File

@@ -211,7 +211,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
delay 30 delay 30
setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setvar VAR_LITTLEROOT_STATE, 1 setvar VAR_LITTLEROOT_TOWN_STATE, 1
savebgm MUS_DUMMY savebgm MUS_DUMMY
fadedefaultbgm fadedefaultbgm
releaseall releaseall

2
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
View File

@@ -85,7 +85,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
setvar VAR_LITTLEROOT_STATE, 1 setvar VAR_LITTLEROOT_TOWN_STATE, 1
savebgm MUS_DUMMY savebgm MUS_DUMMY
fadedefaultbgm fadedefaultbgm
releaseall releaseall

4
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View File

@@ -539,9 +539,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F
setvar VAR_BIRCH_LAB_STATE, 5 setvar VAR_BIRCH_LAB_STATE, 5
setflag FLAG_ADVENTURE_STARTED setflag FLAG_ADVENTURE_STARTED
setvar VAR_ROUTE102_ACCESSIBLE, 1 setvar VAR_OLDALE_TOWN_STATE, 1
setvar VAR_LITTLEROOT_RIVAL_STATE, 4 setvar VAR_LITTLEROOT_RIVAL_STATE, 4
setvar VAR_LITTLEROOT_STATE, 3 setvar VAR_LITTLEROOT_TOWN_STATE, 3
releaseall releaseall
end end

2
data/maps/MagmaHideout_4F/scripts.inc
View File

@@ -62,7 +62,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
closemessage closemessage
clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
setvar VAR_SLATEPORT_STATE, 1 setvar VAR_SLATEPORT_CITY_STATE, 1
setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT
setvar VAR_SLATEPORT_HARBOR_STATE, 1 setvar VAR_SLATEPORT_HARBOR_STATE, 1
fadescreen 1 fadescreen 1

14
data/maps/MossdeepCity/map.json
View File

@@ -366,7 +366,7 @@
"x": 42, "x": 42,
"y": 21, "y": 21,
"elevation": 5, "elevation": 5,
"var": "VAR_MOSSDEEP_STATE", "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41" "script": "MossdeepCity_EventScript_1E4B41"
}, },
@@ -375,7 +375,7 @@
"x": 41, "x": 41,
"y": 22, "y": 22,
"elevation": 5, "elevation": 5,
"var": "VAR_MOSSDEEP_STATE", "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41" "script": "MossdeepCity_EventScript_1E4B41"
}, },
@@ -384,7 +384,7 @@
"x": 41, "x": 41,
"y": 23, "y": 23,
"elevation": 5, "elevation": 5,
"var": "VAR_MOSSDEEP_STATE", "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41" "script": "MossdeepCity_EventScript_1E4B41"
}, },
@@ -393,7 +393,7 @@
"x": 41, "x": 41,
"y": 24, "y": 24,
"elevation": 5, "elevation": 5,
"var": "VAR_MOSSDEEP_STATE", "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41" "script": "MossdeepCity_EventScript_1E4B41"
}, },
@@ -402,7 +402,7 @@
"x": 40, "x": 40,
"y": 25, "y": 25,
"elevation": 5, "elevation": 5,
"var": "VAR_MOSSDEEP_STATE", "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41" "script": "MossdeepCity_EventScript_1E4B41"
}, },
@@ -411,7 +411,7 @@
"x": 40, "x": 40,
"y": 26, "y": 26,
"elevation": 5, "elevation": 5,
"var": "VAR_MOSSDEEP_STATE", "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41" "script": "MossdeepCity_EventScript_1E4B41"
} }
@@ -482,4 +482,4 @@
"script": "MossdeepCity_EventScript_1E4B14" "script": "MossdeepCity_EventScript_1E4B14"
} }
] ]
} }

2
data/maps/MossdeepCity/scripts.inc
View File

@@ -94,7 +94,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41
removeobject 12 removeobject 12
removeobject 13 removeobject 13
delay 30 delay 30
setvar VAR_MOSSDEEP_STATE, 2 setvar VAR_MOSSDEEP_CITY_STATE, 2
setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
releaseall releaseall
end end

2
data/maps/MossdeepCity_Gym/scripts.inc
View File

@@ -71,7 +71,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
setvar VAR_MOSSDEEP_STATE, 1 setvar VAR_MOSSDEEP_CITY_STATE, 1
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1 setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1
call MossdeepCity_Gym_EventScript_22095B call MossdeepCity_Gym_EventScript_22095B

18
data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
View File

@@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41
.byte 0 .byte 0
MossdeepCity_SpaceCenter_1F_OnTransition: @ 8222F4C MossdeepCity_SpaceCenter_1F_OnTransition: @ 8222F4C
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58
end end
@@ -39,7 +39,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA
end end
MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE
end end
@@ -50,7 +50,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE
MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
lock lock
faceplayer faceplayer
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024
dotimebasedevents dotimebasedevents
specialvar VAR_RESULT, GetWeekCount specialvar VAR_RESULT, GetWeekCount
@@ -98,7 +98,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A
MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063
lock lock
faceplayer faceplayer
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A
msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT
release release
@@ -114,7 +114,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A
MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E
lock lock
faceplayer faceplayer
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA
goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0 goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0
msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT
@@ -155,9 +155,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D
lock lock
faceplayer faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154 goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154 goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154
goto MossdeepCity_SpaceCenter_1F_EventScript_22315E goto MossdeepCity_SpaceCenter_1F_EventScript_22315E
end end
@@ -176,9 +176,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168
lock lock
faceplayer faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F
goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4
end end

16
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
View File

@@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58
.byte 0 .byte 0
MossdeepCity_SpaceCenter_2F_OnTransition: @ 8223D63 MossdeepCity_SpaceCenter_2F_OnTransition: @ 8223D63
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A
compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2
call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F
@@ -98,9 +98,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D
lock lock
faceplayer faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4 goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4
goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE
end end
@@ -119,9 +119,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8
lock lock
faceplayer faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF
goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9
end end
@@ -140,9 +140,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03
lock lock
faceplayer faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34
compare VAR_MOSSDEEP_STATE, 2 compare VAR_MOSSDEEP_CITY_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A
goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 goto MossdeepCity_SpaceCenter_2F_EventScript_223F34
end end
@@ -287,7 +287,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
delay 20 delay 20
msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_MOSSDEEP_STATE, 3 setvar VAR_MOSSDEEP_CITY_STATE, 3
fadedefaultbgm fadedefaultbgm
fadescreen 1 fadescreen 1
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 3 setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 3

10
data/maps/OldaleTown/map.json
View File

@@ -119,7 +119,7 @@
"x": 0, "x": 0,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
"var": "VAR_ROUTE102_ACCESSIBLE", "var": "VAR_OLDALE_TOWN_STATE",
"var_value": "0", "var_value": "0",
"script": "OldaleTown_EventScript_1E903F" "script": "OldaleTown_EventScript_1E903F"
}, },
@@ -128,7 +128,7 @@
"x": 8, "x": 8,
"y": 19, "y": 19,
"elevation": 3, "elevation": 3,
"var": "VAR_OLDALE_STATE", "var": "VAR_OLDALE_RIVAL_STATE",
"var_value": "1", "var_value": "1",
"script": "OldaleTown_EventScript_1E9086" "script": "OldaleTown_EventScript_1E9086"
}, },
@@ -137,7 +137,7 @@
"x": 9, "x": 9,
"y": 19, "y": 19,
"elevation": 3, "elevation": 3,
"var": "VAR_OLDALE_STATE", "var": "VAR_OLDALE_RIVAL_STATE",
"var_value": "1", "var_value": "1",
"script": "OldaleTown_EventScript_1E90A6" "script": "OldaleTown_EventScript_1E90A6"
}, },
@@ -146,7 +146,7 @@
"x": 10, "x": 10,
"y": 19, "y": 19,
"elevation": 3, "elevation": 3,
"var": "VAR_OLDALE_STATE", "var": "VAR_OLDALE_RIVAL_STATE",
"var_value": "1", "var_value": "1",
"script": "OldaleTown_EventScript_1E90C6" "script": "OldaleTown_EventScript_1E90C6"
} }
@@ -193,4 +193,4 @@
"script": "Common_EventScript_ShowPokemartSign" "script": "Common_EventScript_ShowPokemartSign"
} }
] ]
} }

4
data/maps/OldaleTown/scripts.inc
View File

@@ -11,7 +11,7 @@ OldaleTown_OnTransition: @ 81E8EA8
end end
OldaleTown_EventScript_1E8ECC:: @ 81E8ECC OldaleTown_EventScript_1E8ECC:: @ 81E8ECC
setvar VAR_ROUTE102_ACCESSIBLE, 1 setvar VAR_OLDALE_TOWN_STATE, 1
return return
OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 OldaleTown_EventScript_1E8ED2:: @ 81E8ED2
@@ -280,7 +280,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A
applymovement 4, OldaleTown_Movement_1E9177 applymovement 4, OldaleTown_Movement_1E9177
waitmovement 0 waitmovement 0
removeobject 4 removeobject 4
setvar VAR_OLDALE_STATE, 2 setvar VAR_OLDALE_RIVAL_STATE, 2
setflag FLAG_HIDE_OLDALE_TOWN_RIVAL setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
releaseall releaseall
end end

10
data/maps/PetalburgCity/map.json
View File

@@ -193,7 +193,7 @@
"x": 8, "x": 8,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
"var": "VAR_PETALBURG_STATE", "var": "VAR_PETALBURG_CITY_STATE",
"var_value": "0", "var_value": "0",
"script": "PetalburgCity_EventScript_1DC49A" "script": "PetalburgCity_EventScript_1DC49A"
}, },
@@ -202,7 +202,7 @@
"x": 8, "x": 8,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"var": "VAR_PETALBURG_STATE", "var": "VAR_PETALBURG_CITY_STATE",
"var_value": "0", "var_value": "0",
"script": "PetalburgCity_EventScript_1DC4A6" "script": "PetalburgCity_EventScript_1DC4A6"
}, },
@@ -211,7 +211,7 @@
"x": 8, "x": 8,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"var": "VAR_PETALBURG_STATE", "var": "VAR_PETALBURG_CITY_STATE",
"var_value": "0", "var_value": "0",
"script": "PetalburgCity_EventScript_1DC4B2" "script": "PetalburgCity_EventScript_1DC4B2"
}, },
@@ -220,7 +220,7 @@
"x": 8, "x": 8,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"var": "VAR_PETALBURG_STATE", "var": "VAR_PETALBURG_CITY_STATE",
"var_value": "0", "var_value": "0",
"script": "PetalburgCity_EventScript_1DC4BE" "script": "PetalburgCity_EventScript_1DC4BE"
}, },
@@ -327,4 +327,4 @@
"flag": "FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY" "flag": "FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY"
} }
] ]
} }

12
data/maps/PetalburgCity/scripts.inc
View File

@@ -5,11 +5,11 @@ PetalburgCity_MapScripts::
PetalburgCity_OnTransition: @ 81DC2D7 PetalburgCity_OnTransition: @ 81DC2D7
setflag FLAG_VISITED_PETALBURG_CITY setflag FLAG_VISITED_PETALBURG_CITY
compare VAR_PETALBURG_STATE, 0 compare VAR_PETALBURG_CITY_STATE, 0
call_if_eq PetalburgCity_EventScript_1DC307 call_if_eq PetalburgCity_EventScript_1DC307
compare VAR_PETALBURG_STATE, 2 compare VAR_PETALBURG_CITY_STATE, 2
call_if_eq PetalburgCity_EventScript_1DC30F call_if_eq PetalburgCity_EventScript_1DC30F
compare VAR_PETALBURG_STATE, 4 compare VAR_PETALBURG_CITY_STATE, 4
call_if_eq PetalburgCity_EventScript_1DC30F call_if_eq PetalburgCity_EventScript_1DC30F
compare VAR_PETALBURG_GYM_STATE, 8 compare VAR_PETALBURG_GYM_STATE, 8
call_if_eq PetalburgCity_EventScript_1DC316 call_if_eq PetalburgCity_EventScript_1DC316
@@ -29,8 +29,8 @@ PetalburgCity_EventScript_1DC316:: @ 81DC316
return return
PetalburgCity_MapScript2_1DC31C: @ 81DC31C PetalburgCity_MapScript2_1DC31C: @ 81DC31C
map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_1DC32E map_script_2 VAR_PETALBURG_CITY_STATE, 2, PetalburgCity_EventScript_1DC32E
map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_EventScript_1DC390 map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_EventScript_1DC390
.2byte 0 .2byte 0
PetalburgCity_EventScript_1DC32E:: @ 81DC32E PetalburgCity_EventScript_1DC32E:: @ 81DC32E
@@ -49,7 +49,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT
closemessage closemessage
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_PETALBURG_STATE, 3 setvar VAR_PETALBURG_CITY_STATE, 3
fadedefaultbgm fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001 clearflag FLAG_SPECIAL_FLAG_0x4001
special LoadPlayerParty special LoadPlayerParty

4
data/maps/PetalburgCity_Gym/scripts.inc
View File

@@ -217,7 +217,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC
removeobject 10 removeobject 10
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
setvar VAR_PETALBURG_GYM_STATE, 1 setvar VAR_PETALBURG_GYM_STATE, 1
setvar VAR_PETALBURG_STATE, 2 setvar VAR_PETALBURG_CITY_STATE, 2
clearflag FLAG_HIDE_PETALBURG_CITY_WALLY clearflag FLAG_HIDE_PETALBURG_CITY_WALLY
clearflag FLAG_HIDE_PETALBURG_GYM_WALLY clearflag FLAG_HIDE_PETALBURG_GYM_WALLY
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
@@ -496,7 +496,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if_eq PetalburgCity_Gym_EventScript_20506C call_if_eq PetalburgCity_Gym_EventScript_20506C
removeobject 11 removeobject 11
setvar VAR_PETALBURG_STATE, 4 setvar VAR_PETALBURG_CITY_STATE, 4
clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
warp MAP_PETALBURG_CITY, 255, 15, 8 warp MAP_PETALBURG_CITY, 255, 15, 8
waitstate waitstate

6
data/maps/PetalburgCity_WallysHouse/scripts.inc
View File

@@ -4,7 +4,7 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229
.byte 0 .byte 0
PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234
map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_WallysHouse_EventScript_20423E map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_20423E
.2byte 0 .2byte 0
PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E
@@ -13,7 +13,7 @@ PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E
end end
PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247
map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_WallysHouse_EventScript_204251 map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_204251
.2byte 0 .2byte 0
PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251
@@ -22,7 +22,7 @@ PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251
giveitem_std ITEM_HM03 giveitem_std ITEM_HM03
setflag FLAG_RECEIVED_HM03 setflag FLAG_RECEIVED_HM03
msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT
setvar VAR_PETALBURG_STATE, 5 setvar VAR_PETALBURG_CITY_STATE, 5
releaseall releaseall
end end

2
data/maps/Route103/scripts.inc
View File

@@ -143,7 +143,7 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2
setvar VAR_BIRCH_LAB_STATE, 4 setvar VAR_BIRCH_LAB_STATE, 4
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
setflag FLAG_DEFEATED_RIVAL_ROUTE103 setflag FLAG_DEFEATED_RIVAL_ROUTE103
setvar VAR_OLDALE_STATE, 1 setvar VAR_OLDALE_RIVAL_STATE, 1
clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL
savebgm MUS_DUMMY savebgm MUS_DUMMY
fadedefaultbgm fadedefaultbgm

2
data/maps/Route104/scripts.inc
View File

@@ -49,7 +49,7 @@ Route104_EventScript_1ECC9E:: @ 81ECC9E
Route104_EventScript_1ECCB3:: @ 81ECCB3 Route104_EventScript_1ECCB3:: @ 81ECCB3
lockall lockall
setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
setvar VAR_RUSTBORO_STATE, 8 setvar VAR_RUSTBORO_CITY_STATE, 8
setvar VAR_ROUTE104_STATE, 2 setvar VAR_ROUTE104_STATE, 2
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0 waitmovement 0

2
data/maps/Route104_MrBrineysHouse/scripts.inc
View File

@@ -79,7 +79,7 @@ Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setvar VAR_RUSTBORO_STATE, 8 setvar VAR_RUSTBORO_CITY_STATE, 8
setvar VAR_ROUTE104_STATE, 2 setvar VAR_ROUTE104_STATE, 2
setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
setflag FLAG_HIDE_ROUTE_104_RIVAL setflag FLAG_HIDE_ROUTE_104_RIVAL

2
data/maps/Route129/scripts.inc
View File

@@ -14,7 +14,7 @@ Route129_MapScript1_1F7294: @ 81F7294
Route129_OnTransition: @ 81F72AB Route129_OnTransition: @ 81F72AB
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route129_EventScript_273D13 call_if_eq Route129_EventScript_273D13
compare VAR_RAYQUAZA_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_ge Route129_EventScript_1F72D8 call_if_ge Route129_EventScript_1F72D8
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
call_if_eq UnusualWeather_StartKyogreWeather call_if_eq UnusualWeather_StartKyogreWeather

2
data/maps/Route130/scripts.inc
View File

@@ -3,7 +3,7 @@ Route130_MapScripts:: @ 81F735F
.byte 0 .byte 0
Route130_OnTransition: @ 81F7365 Route130_OnTransition: @ 81F7365
compare VAR_RAYQUAZA_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_ge Route130_EventScript_1F73B5 call_if_ge Route130_EventScript_1F73B5
specialvar VAR_RESULT, IsMirageIslandPresent specialvar VAR_RESULT, IsMirageIslandPresent
compare VAR_RESULT, 1 compare VAR_RESULT, 1

2
data/maps/Route131/scripts.inc
View File

@@ -3,7 +3,7 @@ Route131_MapScripts:: @ 81F7404
.byte 0 .byte 0
Route131_OnTransition: @ 81F740A Route131_OnTransition: @ 81F740A
compare VAR_RAYQUAZA_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_ge Route131_EventScript_1F741F call_if_ge Route131_EventScript_1F741F
call Route131_EventScript_1F741B call Route131_EventScript_1F741B
end end

44
data/maps/RustboroCity/map.json
View File

@@ -331,7 +331,7 @@
"x": 23, "x": 23,
"y": 20, "y": 20,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "RustboroCity_EventScript_1E095A" "script": "RustboroCity_EventScript_1E095A"
}, },
@@ -340,7 +340,7 @@
"x": 23, "x": 23,
"y": 21, "y": 21,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "RustboroCity_EventScript_1E0971" "script": "RustboroCity_EventScript_1E0971"
}, },
@@ -349,7 +349,7 @@
"x": 23, "x": 23,
"y": 22, "y": 22,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "RustboroCity_EventScript_1E0988" "script": "RustboroCity_EventScript_1E0988"
}, },
@@ -358,7 +358,7 @@
"x": 23, "x": 23,
"y": 23, "y": 23,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "RustboroCity_EventScript_1E099F" "script": "RustboroCity_EventScript_1E099F"
}, },
@@ -367,7 +367,7 @@
"x": 23, "x": 23,
"y": 24, "y": 24,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "1", "var_value": "1",
"script": "RustboroCity_EventScript_1E09B6" "script": "RustboroCity_EventScript_1E09B6"
}, },
@@ -376,7 +376,7 @@
"x": 30, "x": 30,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "2", "var_value": "2",
"script": "RustboroCity_EventScript_1E0AFE" "script": "RustboroCity_EventScript_1E0AFE"
}, },
@@ -385,7 +385,7 @@
"x": 29, "x": 29,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "2", "var_value": "2",
"script": "RustboroCity_EventScript_1E0B0A" "script": "RustboroCity_EventScript_1E0B0A"
}, },
@@ -394,7 +394,7 @@
"x": 30, "x": 30,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "2", "var_value": "2",
"script": "RustboroCity_EventScript_1E0B16" "script": "RustboroCity_EventScript_1E0B16"
}, },
@@ -403,7 +403,7 @@
"x": 30, "x": 30,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "2", "var_value": "2",
"script": "RustboroCity_EventScript_1E0B22" "script": "RustboroCity_EventScript_1E0B22"
}, },
@@ -412,7 +412,7 @@
"x": 30, "x": 30,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "4", "var_value": "4",
"script": "RustboroCity_EventScript_1E0C2B" "script": "RustboroCity_EventScript_1E0C2B"
}, },
@@ -421,7 +421,7 @@
"x": 31, "x": 31,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "4", "var_value": "4",
"script": "RustboroCity_EventScript_1E0C37" "script": "RustboroCity_EventScript_1E0C37"
}, },
@@ -430,7 +430,7 @@
"x": 30, "x": 30,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "4", "var_value": "4",
"script": "RustboroCity_EventScript_1E0C43" "script": "RustboroCity_EventScript_1E0C43"
}, },
@@ -439,7 +439,7 @@
"x": 30, "x": 30,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "4", "var_value": "4",
"script": "RustboroCity_EventScript_1E0C4F" "script": "RustboroCity_EventScript_1E0C4F"
}, },
@@ -448,7 +448,7 @@
"x": 12, "x": 12,
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7", "var_value": "7",
"script": "RustboroCity_EventScript_1E0DF3" "script": "RustboroCity_EventScript_1E0DF3"
}, },
@@ -457,7 +457,7 @@
"x": 13, "x": 13,
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7", "var_value": "7",
"script": "RustboroCity_EventScript_1E0E33" "script": "RustboroCity_EventScript_1E0E33"
}, },
@@ -466,7 +466,7 @@
"x": 14, "x": 14,
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7", "var_value": "7",
"script": "RustboroCity_EventScript_1E0E73" "script": "RustboroCity_EventScript_1E0E73"
}, },
@@ -475,7 +475,7 @@
"x": 15, "x": 15,
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7", "var_value": "7",
"script": "RustboroCity_EventScript_1E0EB3" "script": "RustboroCity_EventScript_1E0EB3"
}, },
@@ -484,7 +484,7 @@
"x": 16, "x": 16,
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7", "var_value": "7",
"script": "RustboroCity_EventScript_1E0EF3" "script": "RustboroCity_EventScript_1E0EF3"
}, },
@@ -493,7 +493,7 @@
"x": 17, "x": 17,
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7", "var_value": "7",
"script": "RustboroCity_EventScript_1E0F33" "script": "RustboroCity_EventScript_1E0F33"
}, },
@@ -502,7 +502,7 @@
"x": 18, "x": 18,
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7", "var_value": "7",
"script": "RustboroCity_EventScript_1E0F73" "script": "RustboroCity_EventScript_1E0F73"
}, },
@@ -511,7 +511,7 @@
"x": 19, "x": 19,
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
"var": "VAR_RUSTBORO_STATE", "var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7", "var_value": "7",
"script": "RustboroCity_EventScript_1E0FB3" "script": "RustboroCity_EventScript_1E0FB3"
} }
@@ -598,4 +598,4 @@
"script": "RustboroCity_EventScript_1E0919" "script": "RustboroCity_EventScript_1E0919"
} }
] ]
} }

18
data/maps/RustboroCity/scripts.inc
View File

@@ -6,10 +6,10 @@ RustboroCity_MapScripts:: @ 81E06BD
RustboroCity_OnTransition: @ 81E06C8 RustboroCity_OnTransition: @ 81E06C8
setflag FLAG_VISITED_RUSTBORO_CITY setflag FLAG_VISITED_RUSTBORO_CITY
call Common_EventScript_SetupRivalGender call Common_EventScript_SetupRivalGender
compare VAR_RUSTBORO_STATE, 6 compare VAR_RUSTBORO_CITY_STATE, 6
call_if_eq RustboroCity_EventScript_1E0707 call_if_eq RustboroCity_EventScript_1E0707
getplayerxy VAR_TEMP_0, VAR_TEMP_1 getplayerxy VAR_TEMP_0, VAR_TEMP_1
compare VAR_RUSTBORO_STATE, 6 compare VAR_RUSTBORO_CITY_STATE, 6
goto_if_eq RustboroCity_EventScript_1E06EC goto_if_eq RustboroCity_EventScript_1E06EC
end end
@@ -28,7 +28,7 @@ RustboroCity_EventScript_1E0707:: @ 81E0707
return return
RustboroCity_MapScript2_1E070B: @ 81E070B RustboroCity_MapScript2_1E070B: @ 81E070B
map_script_2 VAR_RUSTBORO_STATE, 6, RustboroCity_EventScript_1E0715 map_script_2 VAR_RUSTBORO_CITY_STATE, 6, RustboroCity_EventScript_1E0715
.2byte 0 .2byte 0
RustboroCity_EventScript_1E0715:: @ 81E0715 RustboroCity_EventScript_1E0715:: @ 81E0715
@@ -99,7 +99,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
playse SE_KAIDAN playse SE_KAIDAN
removeobject 15 removeobject 15
setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
setvar VAR_RUSTBORO_STATE, 7 setvar VAR_RUSTBORO_CITY_STATE, 7
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall releaseall
end end
@@ -302,7 +302,7 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD
setobjectxyperm 9, 30, 10 setobjectxyperm 9, 30, 10
clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
setflag FLAG_DEVON_GOODS_STOLEN setflag FLAG_DEVON_GOODS_STOLEN
setvar VAR_RUSTBORO_STATE, 2 setvar VAR_RUSTBORO_CITY_STATE, 2
setvar VAR_RUSTURF_TUNNEL_STATE, 2 setvar VAR_RUSTURF_TUNNEL_STATE, 2
setvar VAR_ROUTE116_STATE, 1 setvar VAR_ROUTE116_STATE, 1
clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY
@@ -493,7 +493,7 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
compare VAR_TEMP_1, 3 compare VAR_TEMP_1, 3
call_if_eq RustboroCity_EventScript_1E0BF3 call_if_eq RustboroCity_EventScript_1E0BF3
setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN
setvar VAR_RUSTBORO_STATE, 3 setvar VAR_RUSTBORO_CITY_STATE, 3
moveobjectoffscreen 9 moveobjectoffscreen 9
msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT
releaseall releaseall
@@ -596,7 +596,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
closemessage closemessage
setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_RETURNED_DEVON_GOODS
setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
setvar VAR_RUSTBORO_STATE, 5 setvar VAR_RUSTBORO_CITY_STATE, 5
delay 30 delay 30
warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
waitstate waitstate
@@ -840,7 +840,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B
closemessage closemessage
delay 30 delay 30
setflag FLAG_ENABLE_RIVAL_MATCH_CALL setflag FLAG_ENABLE_RIVAL_MATCH_CALL
setvar VAR_RUSTBORO_STATE, 8 setvar VAR_RUSTBORO_CITY_STATE, 8
setvar VAR_ROUTE104_STATE, 2 setvar VAR_ROUTE104_STATE, 2
setvar VAR_0x8008, 0 setvar VAR_0x8008, 0
msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO
@@ -911,7 +911,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114
closemessage closemessage
delay 30 delay 30
setflag FLAG_ENABLE_RIVAL_MATCH_CALL setflag FLAG_ENABLE_RIVAL_MATCH_CALL
setvar VAR_RUSTBORO_STATE, 8 setvar VAR_RUSTBORO_CITY_STATE, 8
setvar VAR_ROUTE104_STATE, 2 setvar VAR_ROUTE104_STATE, 2
msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, 1

2
data/maps/RustboroCity_DevonCorp_2F/scripts.inc
View File

@@ -281,7 +281,7 @@ RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF
faceplayer faceplayer
compare VAR_FOSSIL_RESURRECTION_STATE, 1 compare VAR_FOSSIL_RESURRECTION_STATE, 1
call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
compare VAR_RUSTBORO_STATE, 6 compare VAR_RUSTBORO_CITY_STATE, 6
goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1 goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1
msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT
release release

2
data/maps/RustboroCity_DevonCorp_3F/scripts.inc
View File

@@ -68,7 +68,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
setvar VAR_BRINEY_LOCATION, 1 setvar VAR_BRINEY_LOCATION, 1
clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL
setvar VAR_DEVON_CORP_3F_STATE, 1 setvar VAR_DEVON_CORP_3F_STATE, 1
setvar VAR_RUSTBORO_STATE, 6 setvar VAR_RUSTBORO_CITY_STATE, 6
releaseall releaseall
end end

2
data/maps/RustboroCity_Gym/scripts.inc
View File

@@ -18,7 +18,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66
msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT
setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_DEFEATED_RUSTBORO_GYM
setflag FLAG_BADGE01_GET setflag FLAG_BADGE01_GET
setvar VAR_RUSTBORO_STATE, 1 setvar VAR_RUSTBORO_CITY_STATE, 1
addvar VAR_PETALBURG_GYM_STATE, 1 addvar VAR_PETALBURG_GYM_STATE, 1
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
call RustboroCity_Gym_EventScript_271F43 call RustboroCity_Gym_EventScript_271F43

2
data/maps/RusturfTunnel/scripts.inc
View File

@@ -345,7 +345,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
removeobject 7 removeobject 7
clearflag FLAG_DEVON_GOODS_STOLEN clearflag FLAG_DEVON_GOODS_STOLEN
setflag FLAG_RECOVERED_DEVON_GOODS setflag FLAG_RECOVERED_DEVON_GOODS
setvar VAR_RUSTBORO_STATE, 4 setvar VAR_RUSTBORO_CITY_STATE, 4
setvar VAR_BRINEY_HOUSE_STATE, 1 setvar VAR_BRINEY_HOUSE_STATE, 1
setflag FLAG_HIDE_ROUTE_116_MR_BRINEY setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
release release

2
data/maps/SeafloorCavern_Room9/scripts.inc
View File

@@ -119,7 +119,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
waitmovement 0 waitmovement 0
msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT
setvar VAR_ROUTE128_STATE, 1 setvar VAR_ROUTE128_STATE, 1
setvar VAR_RAYQUAZA_STATE, 1 setvar VAR_SOOTOPOLIS_CITY_STATE, 1
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE

8
data/maps/SkyPillar_Outside/scripts.inc
View File

@@ -5,9 +5,9 @@ SkyPillar_Outside_MapScripts:: @ 82392A8
.byte 0 .byte 0
SkyPillar_Outside_OnTransition: @ 82392B8 SkyPillar_Outside_OnTransition: @ 82392B8
compare VAR_RAYQUAZA_STATE, 3 compare VAR_SOOTOPOLIS_CITY_STATE, 3
call_if_eq SkyPillar_Outside_EventScript_2392CF call_if_eq SkyPillar_Outside_EventScript_2392CF
compare VAR_RAYQUAZA_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_ge SkyPillar_Outside_EventScript_2392D3 call_if_ge SkyPillar_Outside_EventScript_2392D3
end end
@@ -29,7 +29,7 @@ SkyPillar_Outside_EventScript_2392E7:: @ 82392E7
return return
SkyPillar_Outside_MapScript2_2392FA: @ 82392FA SkyPillar_Outside_MapScript2_2392FA: @ 82392FA
map_script_2 VAR_RAYQUAZA_STATE, 3, SkyPillar_Outside_EventScript_239304 map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, SkyPillar_Outside_EventScript_239304
.2byte 0 .2byte 0
SkyPillar_Outside_EventScript_239304:: @ 8239304 SkyPillar_Outside_EventScript_239304:: @ 8239304
@@ -82,7 +82,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
playse SE_KAIDAN playse SE_KAIDAN
fadescreenswapbuffers 1 fadescreenswapbuffers 1
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_RAYQUAZA_STATE, 4 setvar VAR_SOOTOPOLIS_CITY_STATE, 4
removeobject 1 removeobject 1
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
fadescreenswapbuffers 0 fadescreenswapbuffers 0

2
data/maps/SkyPillar_Top/scripts.inc
View File

@@ -130,7 +130,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_23985C applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_23985C
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
setvar VAR_RAYQUAZA_STATE, 5 setvar VAR_SOOTOPOLIS_CITY_STATE, 5
setvar VAR_SKY_PILLAR_STATE, 1 setvar VAR_SKY_PILLAR_STATE, 1
setvar VAR_SKY_PILLAR_RAQUAZA_CRY_DONE, 1 setvar VAR_SKY_PILLAR_RAQUAZA_CRY_DONE, 1
releaseall releaseall

18
data/maps/SlateportCity/scripts.inc
View File

@@ -6,7 +6,7 @@ SlateportCity_MapScripts:: @ 81DCC61
SlateportCity_OnTransition: @ 81DCC6C SlateportCity_OnTransition: @ 81DCC6C
setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
call SlateportCity_EventScript_1DCC8D call SlateportCity_EventScript_1DCC8D
compare VAR_SLATEPORT_STATE, 1 compare VAR_SLATEPORT_CITY_STATE, 1
call_if_eq SlateportCity_EventScript_1DCC99 call_if_eq SlateportCity_EventScript_1DCC99
compare VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1 compare VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1
call_if_eq SlateportCity_EventScript_1DCCE7 call_if_eq SlateportCity_EventScript_1DCCE7
@@ -170,7 +170,7 @@ SlateportCity_EventScript_1DCE38:: @ 81DCE38
SlateportCity_EventScript_1DCE42:: @ 81DCE42 SlateportCity_EventScript_1DCE42:: @ 81DCE42
lock lock
faceplayer faceplayer
compare VAR_SLATEPORT_STATE, 1 compare VAR_SLATEPORT_CITY_STATE, 1
call_if_eq SlateportCity_EventScript_1DCE59 call_if_eq SlateportCity_EventScript_1DCE59
msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT
release release
@@ -184,7 +184,7 @@ SlateportCity_EventScript_1DCE59:: @ 81DCE59
SlateportCity_EventScript_1DCE63:: @ 81DCE63 SlateportCity_EventScript_1DCE63:: @ 81DCE63
lock lock
faceplayer faceplayer
compare VAR_SLATEPORT_STATE, 1 compare VAR_SLATEPORT_CITY_STATE, 1
call_if_eq SlateportCity_EventScript_1DCE7A call_if_eq SlateportCity_EventScript_1DCE7A
msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT
release release
@@ -198,7 +198,7 @@ SlateportCity_EventScript_1DCE7A:: @ 81DCE7A
SlateportCity_EventScript_1DCE84:: @ 81DCE84 SlateportCity_EventScript_1DCE84:: @ 81DCE84
lock lock
faceplayer faceplayer
compare VAR_SLATEPORT_STATE, 1 compare VAR_SLATEPORT_CITY_STATE, 1
call_if_eq SlateportCity_EventScript_1DCEA4 call_if_eq SlateportCity_EventScript_1DCEA4
goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DCEAE goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DCEAE
msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT
@@ -218,7 +218,7 @@ SlateportCity_EventScript_1DCEAE:: @ 81DCEAE
SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 SlateportCity_EventScript_1DCEB8:: @ 81DCEB8
lock lock
faceplayer faceplayer
compare VAR_SLATEPORT_STATE, 1 compare VAR_SLATEPORT_CITY_STATE, 1
call_if_eq SlateportCity_EventScript_1DCECF call_if_eq SlateportCity_EventScript_1DCECF
msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT
release release
@@ -230,7 +230,7 @@ SlateportCity_EventScript_1DCECF:: @ 81DCECF
end end
SlateportCity_EventScript_1DCED9:: @ 81DCED9 SlateportCity_EventScript_1DCED9:: @ 81DCED9
compare VAR_SLATEPORT_STATE, 1 compare VAR_SLATEPORT_CITY_STATE, 1
goto_if_eq SlateportCity_EventScript_1DCEED goto_if_eq SlateportCity_EventScript_1DCEED
msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC
end end
@@ -242,7 +242,7 @@ SlateportCity_EventScript_1DCEED:: @ 81DCEED
SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 SlateportCity_EventScript_1DCEF6:: @ 81DCEF6
lock lock
faceplayer faceplayer
compare VAR_SLATEPORT_STATE, 1 compare VAR_SLATEPORT_CITY_STATE, 1
call_if_eq SlateportCity_EventScript_1DCF0D call_if_eq SlateportCity_EventScript_1DCF0D
msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT
release release
@@ -323,7 +323,7 @@ SlateportCity_EventScript_1DCFB2:: @ 81DCFB2
SlateportCity_EventScript_1DCFBB:: @ 81DCFBB SlateportCity_EventScript_1DCFBB:: @ 81DCFBB
lock lock
faceplayer faceplayer
compare VAR_SLATEPORT_STATE, 1 compare VAR_SLATEPORT_CITY_STATE, 1
call_if_eq SlateportCity_EventScript_1DCFD2 call_if_eq SlateportCity_EventScript_1DCFD2
msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT
release release
@@ -609,7 +609,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW
clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
setvar VAR_SLATEPORT_STATE, 2 setvar VAR_SLATEPORT_CITY_STATE, 2
warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
waitstate waitstate
releaseall releaseall

112
data/maps/SootopolisCity/scripts.inc
View File

@@ -33,31 +33,31 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5
SootopolisCity_OnTransition: @ 81E56EF SootopolisCity_OnTransition: @ 81E56EF
setflag FLAG_VISITED_SOOTOPOLIS_CITY setflag FLAG_VISITED_SOOTOPOLIS_CITY
compare VAR_RAYQUAZA_STATE, 1 compare VAR_SOOTOPOLIS_CITY_STATE, 1
call_if_eq SootopolisCity_EventScript_1E5781 call_if_eq SootopolisCity_EventScript_1E5781
compare VAR_SKY_PILLAR_STATE, 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
compare VAR_RAYQUAZA_STATE, 1 compare VAR_SOOTOPOLIS_CITY_STATE, 1
call_if_eq SootopolisCity_EventScript_1E5785 call_if_eq SootopolisCity_EventScript_1E5785
compare VAR_RAYQUAZA_STATE, 2 compare VAR_SOOTOPOLIS_CITY_STATE, 2
call_if_eq SootopolisCity_EventScript_1E5785 call_if_eq SootopolisCity_EventScript_1E5785
compare VAR_RAYQUAZA_STATE, 3 compare VAR_SOOTOPOLIS_CITY_STATE, 3
call_if_eq SootopolisCity_EventScript_1E5785 call_if_eq SootopolisCity_EventScript_1E5785
compare VAR_RAYQUAZA_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_eq SootopolisCity_EventScript_1E5785 call_if_eq SootopolisCity_EventScript_1E5785
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
call_if_eq SootopolisCity_EventScript_1E5785 call_if_eq SootopolisCity_EventScript_1E5785
compare VAR_RAYQUAZA_STATE, 2 compare VAR_SOOTOPOLIS_CITY_STATE, 2
call_if_eq SootopolisCity_EventScript_1E5842 call_if_eq SootopolisCity_EventScript_1E5842
compare VAR_RAYQUAZA_STATE, 3 compare VAR_SOOTOPOLIS_CITY_STATE, 3
call_if_eq SootopolisCity_EventScript_1E5842 call_if_eq SootopolisCity_EventScript_1E5842
compare VAR_RAYQUAZA_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_eq SootopolisCity_EventScript_1E585B call_if_eq SootopolisCity_EventScript_1E585B
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
call_if_eq SootopolisCity_EventScript_1E5871 call_if_eq SootopolisCity_EventScript_1E5871
compare VAR_RAYQUAZA_STATE, 6 compare VAR_SOOTOPOLIS_CITY_STATE, 6
call_if_eq SootopolisCity_EventScript_1E58D3 call_if_eq SootopolisCity_EventScript_1E58D3
end end
@@ -77,17 +77,17 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785
return return
SootopolisCity_EventScript_1E57B2:: @ 81E57B2 SootopolisCity_EventScript_1E57B2:: @ 81E57B2
compare VAR_RAYQUAZA_STATE, 0 compare VAR_SOOTOPOLIS_CITY_STATE, 0
goto_if_eq SootopolisCity_EventScript_1E5800 goto_if_eq SootopolisCity_EventScript_1E5800
compare VAR_RAYQUAZA_STATE, 6 compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_1E5800 goto_if_ge SootopolisCity_EventScript_1E5800
compare VAR_RAYQUAZA_STATE, 1 compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_eq SootopolisCity_EventScript_1E5801 goto_if_eq SootopolisCity_EventScript_1E5801
compare VAR_RAYQUAZA_STATE, 2 compare VAR_SOOTOPOLIS_CITY_STATE, 2
goto_if_eq SootopolisCity_EventScript_1E5801 goto_if_eq SootopolisCity_EventScript_1E5801
compare VAR_RAYQUAZA_STATE, 3 compare VAR_SOOTOPOLIS_CITY_STATE, 3
goto_if_eq SootopolisCity_EventScript_1E5801 goto_if_eq SootopolisCity_EventScript_1E5801
compare VAR_RAYQUAZA_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
goto_if_eq SootopolisCity_EventScript_1E5801 goto_if_eq SootopolisCity_EventScript_1E5801
compare VAR_SKY_PILLAR_STATE, 1 compare VAR_SKY_PILLAR_STATE, 1
goto_if_le SootopolisCity_EventScript_1E5801 goto_if_le SootopolisCity_EventScript_1E5801
@@ -101,11 +101,11 @@ SootopolisCity_EventScript_1E5801:: @ 81E5801
return return
SootopolisCity_EventScript_1E5805:: @ 81E5805 SootopolisCity_EventScript_1E5805:: @ 81E5805
compare VAR_RAYQUAZA_STATE, 0 compare VAR_SOOTOPOLIS_CITY_STATE, 0
goto_if_eq SootopolisCity_EventScript_1E583D goto_if_eq SootopolisCity_EventScript_1E583D
compare VAR_RAYQUAZA_STATE, 6 compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_1E583D goto_if_ge SootopolisCity_EventScript_1E583D
compare VAR_RAYQUAZA_STATE, 1 compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_eq SootopolisCity_EventScript_1E583E goto_if_eq SootopolisCity_EventScript_1E583E
compare VAR_SKY_PILLAR_STATE, 1 compare VAR_SKY_PILLAR_STATE, 1
goto_if_eq SootopolisCity_EventScript_1E583E goto_if_eq SootopolisCity_EventScript_1E583E
@@ -140,11 +140,11 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871
setobjectxyperm 7, 29, 33 setobjectxyperm 7, 29, 33
setobjectxyperm 16, 33, 35 setobjectxyperm 16, 33, 35
setobjectxyperm 17, 34, 35 setobjectxyperm 17, 34, 35
compare VAR_SOOTOPOLIS_STATE, 0 compare VAR_SOOTOPOLIS_WALLACE_STATE, 0
call_if_eq SootopolisCity_EventScript_1E58AF call_if_eq SootopolisCity_EventScript_1E58AF
compare VAR_SOOTOPOLIS_STATE, 1 compare VAR_SOOTOPOLIS_WALLACE_STATE, 1
call_if_eq SootopolisCity_EventScript_1E58BB call_if_eq SootopolisCity_EventScript_1E58BB
compare VAR_SOOTOPOLIS_STATE, 2 compare VAR_SOOTOPOLIS_WALLACE_STATE, 2
call_if_eq SootopolisCity_EventScript_1E58C7 call_if_eq SootopolisCity_EventScript_1E58C7
return return
@@ -168,7 +168,7 @@ SootopolisCity_EventScript_1E58D3:: @ 81E58D3
return return
SootopolisCity_MapScript2_1E58DB: @ 81E58DB SootopolisCity_MapScript2_1E58DB: @ 81E58DB
map_script_2 VAR_RAYQUAZA_STATE, 5, SootopolisCity_EventScript_1E58E5 map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_1E58E5
.2byte 0 .2byte 0
SootopolisCity_EventScript_1E58E5:: @ 81E58E5 SootopolisCity_EventScript_1E58E5:: @ 81E58E5
@@ -192,7 +192,7 @@ SootopolisCity_MapScript1_1E590B: @ 81E590B
end end
SootopolisCity_MapScript2_1E5914: @ 81E5914 SootopolisCity_MapScript2_1E5914: @ 81E5914
map_script_2 VAR_RAYQUAZA_STATE, 1, SootopolisCity_EventScript_1E5926 map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_1E5926
map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_1E5BFE map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_1E5BFE
.2byte 0 .2byte 0
@@ -271,7 +271,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A75 applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A75
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
setvar VAR_RAYQUAZA_STATE, 2 setvar VAR_SOOTOPOLIS_CITY_STATE, 2
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall releaseall
end end
@@ -371,7 +371,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BAE applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BAE
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
setvar VAR_RAYQUAZA_STATE, 2 setvar VAR_SOOTOPOLIS_CITY_STATE, 2
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall releaseall
end end
@@ -694,11 +694,11 @@ SootopolisCity_Movement_1E5E7F: @ 81E5E7F
SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D
lock lock
faceplayer faceplayer
compare VAR_RAYQUAZA_STATE, 6 compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_1E5EC4 goto_if_ge SootopolisCity_EventScript_1E5EC4
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E5ECE goto_if_eq SootopolisCity_EventScript_1E5ECE
compare VAR_RAYQUAZA_STATE, 2 compare VAR_SOOTOPOLIS_CITY_STATE, 2
goto_if_ge SootopolisCity_EventScript_1E5EBA goto_if_ge SootopolisCity_EventScript_1E5EBA
msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT
release release
@@ -722,11 +722,11 @@ SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE
SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8
lock lock
faceplayer faceplayer
compare VAR_RAYQUAZA_STATE, 1 compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_le SootopolisCity_EventScript_1E5F1B goto_if_le SootopolisCity_EventScript_1E5F1B
compare VAR_RAYQUAZA_STATE, 6 compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_1E5F1B goto_if_ge SootopolisCity_EventScript_1E5F1B
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E5F10 goto_if_eq SootopolisCity_EventScript_1E5F10
msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT
closemessage closemessage
@@ -794,7 +794,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2
lockall lockall
applymovement 2, Common_Movement_FacePlayer applymovement 2, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E600D goto_if_eq SootopolisCity_EventScript_1E600D
msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT
closemessage closemessage
@@ -811,7 +811,7 @@ SootopolisCity_EventScript_1E600D:: @ 81E600D
SootopolisCity_EventScript_1E6017:: @ 81E6017 SootopolisCity_EventScript_1E6017:: @ 81E6017
lock lock
faceplayer faceplayer
compare VAR_RAYQUAZA_STATE, 6 compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_1E602E goto_if_ge SootopolisCity_EventScript_1E602E
msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT
release release
@@ -825,11 +825,11 @@ SootopolisCity_EventScript_1E602E:: @ 81E602E
SootopolisCity_EventScript_1E6038:: @ 81E6038 SootopolisCity_EventScript_1E6038:: @ 81E6038
lock lock
faceplayer faceplayer
compare VAR_RAYQUAZA_STATE, 6 compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_1E607A goto_if_ge SootopolisCity_EventScript_1E607A
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E6084 goto_if_eq SootopolisCity_EventScript_1E6084
compare VAR_RAYQUAZA_STATE, 2 compare VAR_SOOTOPOLIS_CITY_STATE, 2
goto_if_ge SootopolisCity_EventScript_1E6065 goto_if_ge SootopolisCity_EventScript_1E6065
msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT
release release
@@ -857,11 +857,11 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E
lockall lockall
applymovement 4, Common_Movement_FacePlayer applymovement 4, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E60D9 goto_if_eq SootopolisCity_EventScript_1E60D9
compare VAR_RAYQUAZA_STATE, 6 compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_1E60CF goto_if_ge SootopolisCity_EventScript_1E60CF
compare VAR_RAYQUAZA_STATE, 1 compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_le SootopolisCity_EventScript_1E60CF goto_if_le SootopolisCity_EventScript_1E60CF
msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT
closemessage closemessage
@@ -884,12 +884,12 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3
lockall lockall
applymovement 5, Common_Movement_FacePlayer applymovement 5, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E612D goto_if_eq SootopolisCity_EventScript_1E612D
goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_1E6137 goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_1E6137
compare VAR_RAYQUAZA_STATE, 6 compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_1E6141 goto_if_ge SootopolisCity_EventScript_1E6141
compare VAR_RAYQUAZA_STATE, 1 compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_le SootopolisCity_EventScript_1E6141 goto_if_le SootopolisCity_EventScript_1E6141
msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT
closemessage closemessage
@@ -930,11 +930,11 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166
applymovement 7, Common_Movement_FacePlayer applymovement 7, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC
compare VAR_RAYQUAZA_STATE, 2 compare VAR_SOOTOPOLIS_CITY_STATE, 2
goto_if_eq SootopolisCity_EventScript_1E61AE goto_if_eq SootopolisCity_EventScript_1E61AE
compare VAR_RAYQUAZA_STATE, 3 compare VAR_SOOTOPOLIS_CITY_STATE, 3
goto_if_eq SootopolisCity_EventScript_1E61C2 goto_if_eq SootopolisCity_EventScript_1E61C2
compare VAR_RAYQUAZA_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
goto_if_eq SootopolisCity_EventScript_1E61C2 goto_if_eq SootopolisCity_EventScript_1E61C2
goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E61B8 goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E61B8
msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT
@@ -1263,7 +1263,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D
lockall lockall
applymovement 15, Common_Movement_FacePlayer applymovement 15, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E6388 goto_if_eq SootopolisCity_EventScript_1E6388
msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT
closemessage closemessage
@@ -1280,7 +1280,7 @@ SootopolisCity_EventScript_1E6388:: @ 81E6388
SootopolisCity_EventScript_1E6393:: @ 81E6393 SootopolisCity_EventScript_1E6393:: @ 81E6393
lockall lockall
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E63C7 goto_if_eq SootopolisCity_EventScript_1E63C7
msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT
closemessage closemessage
@@ -1304,7 +1304,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB
lockall lockall
applymovement 13, Common_Movement_FacePlayer applymovement 13, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E6406 goto_if_eq SootopolisCity_EventScript_1E6406
msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT
closemessage closemessage
@@ -1323,7 +1323,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411
lockall lockall
applymovement 12, Common_Movement_FacePlayer applymovement 12, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E643C goto_if_eq SootopolisCity_EventScript_1E643C
msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT
closemessage closemessage
@@ -1340,7 +1340,7 @@ SootopolisCity_EventScript_1E643C:: @ 81E643C
SootopolisCity_EventScript_1E6446:: @ 81E6446 SootopolisCity_EventScript_1E6446:: @ 81E6446
lock lock
faceplayer faceplayer
compare VAR_RAYQUAZA_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
goto_if_eq SootopolisCity_EventScript_1E64D8 goto_if_eq SootopolisCity_EventScript_1E64D8
goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_1E64E2 goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_1E64E2
goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E646F goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E646F
@@ -1367,14 +1367,14 @@ SootopolisCity_EventScript_1E64B2:: @ 81E64B2
applymovement 18, SootopolisCity_Movement_1E64EC applymovement 18, SootopolisCity_Movement_1E64EC
waitmovement 0 waitmovement 0
moveobjectoffscreen 18 moveobjectoffscreen 18
setvar VAR_SOOTOPOLIS_STATE, 1 setvar VAR_SOOTOPOLIS_WALLACE_STATE, 1
return return
SootopolisCity_EventScript_1E64C5:: @ 81E64C5 SootopolisCity_EventScript_1E64C5:: @ 81E64C5
applymovement 18, SootopolisCity_Movement_1E64EF applymovement 18, SootopolisCity_Movement_1E64EF
waitmovement 0 waitmovement 0
moveobjectoffscreen 18 moveobjectoffscreen 18
setvar VAR_SOOTOPOLIS_STATE, 2 setvar VAR_SOOTOPOLIS_WALLACE_STATE, 2
return return
SootopolisCity_EventScript_1E64D8:: @ 81E64D8 SootopolisCity_EventScript_1E64D8:: @ 81E64D8
@@ -1399,7 +1399,7 @@ SootopolisCity_Movement_1E64EF: @ 81E64EF
SootopolisCity_EventScript_1E64F2:: @ 81E64F2 SootopolisCity_EventScript_1E64F2:: @ 81E64F2
lockall lockall
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E6509 goto_if_eq SootopolisCity_EventScript_1E6509
msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT
closemessage closemessage
@@ -1415,7 +1415,7 @@ SootopolisCity_EventScript_1E6509:: @ 81E6509
SootopolisCity_EventScript_1E651F:: @ 81E651F SootopolisCity_EventScript_1E651F:: @ 81E651F
lockall lockall
compare VAR_RAYQUAZA_STATE, 5 compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_1E6536 goto_if_eq SootopolisCity_EventScript_1E6536
msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT
closemessage closemessage

2
data/maps/SootopolisCity_Gym_1F/scripts.inc
View File

@@ -106,7 +106,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
setvar VAR_RAYQUAZA_STATE, 6 setvar VAR_SOOTOPOLIS_CITY_STATE, 6
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1
setvar VAR_0x8008, 8 setvar VAR_0x8008, 8
call SootopolisCity_Gym_1F_EventScript_271F43 call SootopolisCity_Gym_1F_EventScript_271F43

20
include/constants/vars.h
View File

@@ -94,21 +94,21 @@
#define VAR_POKELOT_PRIZE_PLACE 0x404D #define VAR_POKELOT_PRIZE_PLACE 0x404D
#define VAR_UNUSED_0x404E 0x404E // Unused Var #define VAR_UNUSED_0x404E 0x404E // Unused Var
#define VAR_LOTAD_SIZE_RECORD 0x404F #define VAR_LOTAD_SIZE_RECORD 0x404F
#define VAR_LITTLEROOT_STATE 0x4050 #define VAR_LITTLEROOT_TOWN_STATE 0x4050
#define VAR_ROUTE102_ACCESSIBLE 0x4051 #define VAR_OLDALE_TOWN_STATE 0x4051
#define VAR_UNUSED_0x4052 0x4052 // Unused Var #define VAR_UNUSED_0x4052 0x4052 // Unused Var
#define VAR_LAVARIDGE_RIVAL_STATE 0x4053 #define VAR_LAVARIDGE_TOWN_STATE 0x4053
#define VAR_CURRENT_SECRET_BASE 0x4054 #define VAR_CURRENT_SECRET_BASE 0x4054
#define VAR_UNUSED_0x4055 0x4055 // Unused Var #define VAR_UNUSED_0x4055 0x4055 // Unused Var
#define VAR_UNUSED_0x4056 0x4056 // Unused Var #define VAR_UNUSED_0x4056 0x4056 // Unused Var
#define VAR_PETALBURG_STATE 0x4057 #define VAR_PETALBURG_CITY_STATE 0x4057
#define VAR_SLATEPORT_STATE 0x4058 #define VAR_SLATEPORT_CITY_STATE 0x4058
#define VAR_UNUSED_0x4059 0x4059 // Unused Var #define VAR_UNUSED_0x4059 0x4059 // Unused Var
#define VAR_RUSTBORO_STATE 0x405A #define VAR_RUSTBORO_CITY_STATE 0x405A
#define VAR_UNUSED_0x405B 0x405B // Unused Var #define VAR_UNUSED_0x405B 0x405B // Unused Var
#define VAR_UNUSED_0x405C 0x405C // Unused Var #define VAR_UNUSED_0x405C 0x405C // Unused Var
#define VAR_MOSSDEEP_STATE 0x405D #define VAR_MOSSDEEP_CITY_STATE 0x405D
#define VAR_RAYQUAZA_STATE 0x405E #define VAR_SOOTOPOLIS_CITY_STATE 0x405E
#define VAR_UNUSED_0x405F 0x405F // Unused Var #define VAR_UNUSED_0x405F 0x405F // Unused Var
#define VAR_ROUTE101_STATE 0x4060 #define VAR_ROUTE101_STATE 0x4060
#define VAR_UNUSED_0x4061 0x4061 // Unused Var #define VAR_UNUSED_0x4061 0x4061 // Unused Var
@@ -213,7 +213,7 @@
#define VAR_FOSSIL_RESURRECTION_STATE 0x40C4 #define VAR_FOSSIL_RESURRECTION_STATE 0x40C4
#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_RIVAL_STATE 0x40C7
#define VAR_JAGGED_PASS_STATE 0x40C8 #define VAR_JAGGED_PASS_STATE 0x40C8
#define VAR_SCOTT_PETALBURG_ENCOUNTER 0x40C9 #define VAR_SCOTT_PETALBURG_ENCOUNTER 0x40C9
#define VAR_SKY_PILLAR_STATE 0x40CA #define VAR_SKY_PILLAR_STATE 0x40CA
@@ -230,7 +230,7 @@
#define VAR_ROAMER_POKEMON 0x40D5 // 0 = Latias, 1 = Latios #define VAR_ROAMER_POKEMON 0x40D5 // 0 = Latias, 1 = Latios
#define VAR_TRAINER_HILL_IS_ACTIVE 0x40D6 #define VAR_TRAINER_HILL_IS_ACTIVE 0x40D6
#define VAR_SKY_PILLAR_RAQUAZA_CRY_DONE 0x40D7 #define VAR_SKY_PILLAR_RAQUAZA_CRY_DONE 0x40D7
#define VAR_SOOTOPOLIS_STATE 0x40D8 #define VAR_SOOTOPOLIS_WALLACE_STATE 0x40D8
#define VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT 0x40D9 #define VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT 0x40D9
#define VAR_REGISTER_BIRCH_STATE 0x40DA #define VAR_REGISTER_BIRCH_STATE 0x40DA
#define VAR_UNUSED_0x40DB 0x40DB // Unused Var #define VAR_UNUSED_0x40DB 0x40DB // Unused Var

6
src/overworld.c
View File

@@ -1040,7 +1040,7 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
case MAP_NUM(ROUTE128): case MAP_NUM(ROUTE128):
return TRUE; return TRUE;
default: default:
if (VarGet(VAR_RAYQUAZA_STATE) < 4) if (VarGet(VAR_SOOTOPOLIS_CITY_STATE) < 4)
return FALSE; return FALSE;
switch (warp->mapNum) switch (warp->mapNum)
{ {
@@ -1081,9 +1081,9 @@ static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp)
static bool16 IsInflitratedSpaceCenter(struct WarpData *warp) static bool16 IsInflitratedSpaceCenter(struct WarpData *warp)
{ {
if (VarGet(VAR_MOSSDEEP_STATE) == 0) if (VarGet(VAR_MOSSDEEP_CITY_STATE) == 0)
return FALSE; return FALSE;
else if (VarGet(VAR_MOSSDEEP_STATE) > 2) else if (VarGet(VAR_MOSSDEEP_CITY_STATE) > 2)
return FALSE; return FALSE;
else if (warp->mapGroup != MAP_GROUP(MOSSDEEP_CITY_SPACE_CENTER_1F)) else if (warp->mapGroup != MAP_GROUP(MOSSDEEP_CITY_SPACE_CENTER_1F))
return FALSE; return FALSE;