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

Name more unknown vars

Browse Source
This commit is contained in:
Phlosioneer
2019-02-27 15:18:56 -05:00
parent 4137dd7b0b
commit 648fc3d4f3
26 changed files with 141 additions and 141 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
fadescreenspeed 1, 4
setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR
setvar VAR_0x405E, 3
setvar VAR_RAYQUAZA_STATE, 3
removeobject 1
clearflag FLAG_HIDE_SKY_PILLAR_WALLACE
fadescreen 0

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

@@ -9,7 +9,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
lock
faceplayer
dotimebasedevents
compare VAR_POKELOT_PRIZE, 0
compare VAR_POKELOT_PRIZE_ITEM, 0
goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7
goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D
msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO
@@ -100,8 +100,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4
return
LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD
copyvar VAR_0x404D, VAR_0x8004
copyvar VAR_POKELOT_PRIZE, VAR_0x8005
copyvar VAR_POKELOT_PRIZE_PLACE, VAR_0x8004
copyvar VAR_POKELOT_PRIZE_ITEM, VAR_0x8005
goto LilycoveCity_DepartmentStore_1F_EventScript_21F7ED
end
@@ -112,14 +112,14 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED
LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7
msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT
giveitem_std VAR_POKELOT_PRIZE
giveitem_std VAR_POKELOT_PRIZE_ITEM
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED
copyvar VAR_0x8004, VAR_0x404D
copyvar VAR_0x8005, VAR_POKELOT_PRIZE
copyvar VAR_0x8004, VAR_POKELOT_PRIZE_PLACE
copyvar VAR_0x8005, VAR_POKELOT_PRIZE_ITEM
special sub_80EE2CC
setvar VAR_POKELOT_PRIZE, 0
setvar VAR_0x404D, 0
setvar VAR_POKELOT_PRIZE_ITEM, 0
setvar VAR_POKELOT_PRIZE_PLACE, 0
release
end

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

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

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

@@ -11,7 +11,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
compare VAR_LITTLEROOT_INTRO_STATE, 4
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE
call LittlerootTown_BrendansHouse_2F_EventScript_275CE1
setvar VAR_0x4089, 0
setvar VAR_SECRET_BASE_INITIALIZED, 0
end
LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
@@ -44,7 +44,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464
return
LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474
map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474
.2byte 0
LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474

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

@@ -11,7 +11,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
compare VAR_LITTLEROOT_INTRO_STATE, 4
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE
call LittlerootTown_MaysHouse_2F_EventScript_275CE1
setvar VAR_0x4089, 0
setvar VAR_SECRET_BASE_INITIALIZED, 0
end
LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
@@ -45,7 +45,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317
return
LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327
map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327
.2byte 0
LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327

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

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

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

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

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

@@ -71,9 +71,9 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
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_STEVEN
setvar VAR_0x405D, 1
setvar VAR_MOSSDEEP_STATE, 1
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN
setvar VAR_0x409F, 1
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1
call MossdeepCity_Gym_EventScript_22095B
closemessage
delay 30

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

@@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41
.byte 0
MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58
end
@@ -18,11 +18,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58
setobjectxyperm 1, 3, 4
setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT
compare VAR_0x409E, 1
compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA
compare VAR_0x409E, 2
compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2
compare VAR_0x409E, 3
compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA
end
@@ -39,7 +39,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA
end
MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE
end
@@ -50,7 +50,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE
MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
lock
faceplayer
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024
dotimebasedevents
specialvar VAR_RESULT, GetWeekCount
@@ -98,7 +98,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A
MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063
lock
faceplayer
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A
msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT
release
@@ -114,7 +114,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A
MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E
lock
faceplayer
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA
goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0
msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT
@@ -155,9 +155,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D
lock
faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154
goto MossdeepCity_SpaceCenter_1F_EventScript_22315E
end
@@ -176,9 +176,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168
lock
faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F
goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4
end
@@ -242,7 +242,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F
case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289
applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2
waitmovement 0
setvar VAR_0x409E, 2
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2
release
end
@@ -254,14 +254,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E
MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278
applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A
waitmovement 0
setvar VAR_0x409E, 1
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1
release
end
MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289
applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E
waitmovement 0
setvar VAR_0x409E, 3
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3
release
end

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

@@ -4,9 +4,9 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58
.byte 0
MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A
compare VAR_0x409F, 2
compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2
call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F
end
@@ -27,7 +27,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F
return
MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5
map_script_2 VAR_0x409F, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF
map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF
.2byte 0
MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF
@@ -69,7 +69,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1
applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89
waitmovement 0
setvar VAR_0x409F, 2
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2
moveobjectoffscreen 5
moveobjectoffscreen 7
moveobjectoffscreen 6
@@ -98,9 +98,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D
lock
faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4
goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE
end
@@ -119,9 +119,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8
lock
faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF
goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9
end
@@ -140,9 +140,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03
lock
faceplayer
goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34
compare VAR_0x405D, 2
compare VAR_MOSSDEEP_STATE, 2
goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A
goto MossdeepCity_SpaceCenter_2F_EventScript_223F34
end
@@ -287,10 +287,10 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
delay 20
msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT
closemessage
setvar VAR_0x405D, 3
setvar VAR_MOSSDEEP_STATE, 3
fadedefaultbgm
fadescreen 1
setvar VAR_0x409F, 3
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 3
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA

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

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

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

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

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

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

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

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

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

@@ -6,7 +6,7 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483
.byte 0
SecretBase_RedCave1_MapScript2_23B498: @ 823B498
map_script_2 VAR_0x4089, 0, EventScript_275D0C
map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, EventScript_275D0C
.2byte 0
SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2
@@ -16,7 +16,7 @@ SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2
end
SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE
map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_275B81
map_script_2 VAR_SECRET_BASE_SHOULD_BE_INIT, 0, SecretBase_RedCave1_EventScript_275B81
.2byte 0
SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8

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

@@ -5,9 +5,9 @@ SkyPillar_Outside_MapScripts:: @ 82392A8
.byte 0
SkyPillar_Outside_MapScript1_2392B8: @ 82392B8
compare VAR_0x405E, 3
compare VAR_RAYQUAZA_STATE, 3
call_if_eq SkyPillar_Outside_EventScript_2392CF
compare VAR_0x405E, 4
compare VAR_RAYQUAZA_STATE, 4
call_if_ge SkyPillar_Outside_EventScript_2392D3
end
@@ -29,7 +29,7 @@ SkyPillar_Outside_EventScript_2392E7:: @ 82392E7
return
SkyPillar_Outside_MapScript2_2392FA: @ 82392FA
map_script_2 VAR_0x405E, 3, SkyPillar_Outside_EventScript_239304
map_script_2 VAR_RAYQUAZA_STATE, 3, SkyPillar_Outside_EventScript_239304
.2byte 0
SkyPillar_Outside_EventScript_239304:: @ 8239304
@@ -82,7 +82,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
playse SE_KAIDAN
fadescreenswapbuffers 1
clearflag FLAG_SPECIAL_FLAG_0x4000
setvar VAR_0x405E, 4
setvar VAR_RAYQUAZA_STATE, 4
removeobject 1
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
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
waitmovement 0
special RemoveCameraObject
setvar VAR_0x405E, 5
setvar VAR_RAYQUAZA_STATE, 5
setvar VAR_0x40CA, 1
setvar VAR_0x40D7, 1
releaseall

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

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

2
data/scripts/cable_club.inc
View File

@@ -74,7 +74,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23
msgbox gUnknown_08273594, MSGBOX_DEFAULT
giveitem_std ITEM_EON_TICKET
setflag FLAG_SYS_HAS_EON_TICKET
setvar VAR_0x403F, 0
setvar VAR_ALWAYS_ZERO_0x403F, 0
msgbox gUnknown_082735F2, MSGBOX_DEFAULT
release
end

14
data/scripts/secret_base.inc
View File

@@ -430,21 +430,21 @@ EventScript_275B4D:: @ 8275B4D
EventScript_275B5B:: @ 8275B5B
closemessage
playse SE_KAIDAN
setvar VAR_0x4097, 0
setvar VAR_SECRET_BASE_SHOULD_BE_INIT, 0
setflag FLAG_DECORATION_0
special sub_80E8E18
special sub_80E9068
setvar VAR_0x8004, 0
setvar VAR_0x8005, 0
special sub_80E933C
setvar VAR_0x4089, 1
setvar VAR_SECRET_BASE_INITIALIZED, 1
waitstate
end
SecretBase_RedCave1_EventScript_275B81:: @ 8275B81
applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4
waitmovement 0
setvar VAR_0x4097, 1
setvar VAR_SECRET_BASE_SHOULD_BE_INIT, 1
msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq SecretBase_RedCave1_EventScript_275BAB
@@ -467,21 +467,21 @@ SecretBase_RedCave1_Movement_275BB4: @ 8275BB4
EventScript_275BB7:: @ 8275BB7
lockall
setvar VAR_0x4097, 1
setvar VAR_SECRET_BASE_SHOULD_BE_INIT, 1
playse SE_KAIDAN
special sub_80E9744
compare VAR_RESULT, 0
goto_if_eq EventScript_275BDB
clearflag FLAG_DECORATION_0
special sub_80E9068
setvar VAR_0x4089, 0
setvar VAR_SECRET_BASE_INITIALIZED, 0
waitstate
end
EventScript_275BDB:: @ 8275BDB
setflag FLAG_DECORATION_0
special sub_80E9068
setvar VAR_0x4089, 0
setvar VAR_SECRET_BASE_INITIALIZED, 0
waitstate
end
@@ -570,7 +570,7 @@ EventScript_275D0C:: @ 8275D0C
setvar VAR_0x8004, 0
setvar VAR_0x8005, 0
special sub_80E933C
setvar VAR_0x4089, 1
setvar VAR_SECRET_BASE_INITIALIZED, 1
end
EventScript_275D1F:: @ 8275D1F

18
include/constants/vars.h
View File

@@ -79,13 +79,13 @@
#define VAR_REGICE_STEPS_2 0x403C
#define VAR_REGICE_STEPS_3 0x403D
#define VAR_ALTERING_CAVE_WILD_SET 0x403E
#define VAR_0x403F 0x403F
#define VAR_ALWAYS_ZERO_0x403F 0x403F // This var is read and written, but is always zero.
#define VAR_DAYS 0x4040
#define VAR_FANCLUB_UNKNOWN_1 0x4041
#define VAR_FANCLUB_UNKNOWN_2 0x4042
#define VAR_DEPT_STORE_FLOOR 0x4043
#define VAR_0x4044 0x4044
#define VAR_POKELOT_PRIZE 0x4045
#define VAR_POKELOT_PRIZE_ITEM 0x4045
#define VAR_NATIONAL_DEX 0x4046
#define VAR_SEEDOT_SIZE_RECORD 0x4047
#define VAR_ASH_GATHER_COUNT 0x4048
@@ -93,7 +93,7 @@
#define VAR_CRUISE_STEP_COUNT 0x404A
#define VAR_POKELOT_RND1 0x404B
#define VAR_POKELOT_RND2 0x404C
#define VAR_0x404D 0x404D
#define VAR_POKELOT_PRIZE_PLACE 0x404D
#define VAR_UNUSED_0x404E 0x404E // Unused Var
#define VAR_LOTAD_SIZE_RECORD 0x404F
#define VAR_0x4050 0x4050
@@ -109,8 +109,8 @@
#define VAR_RUSTBORO_STATE 0x405A
#define VAR_UNUSED_0x405B 0x405B // Unused Var
#define VAR_UNUSED_0x405C 0x405C // Unused Var
#define VAR_0x405D 0x405D
#define VAR_0x405E 0x405E
#define VAR_MOSSDEEP_STATE 0x405D
#define VAR_RAYQUAZA_STATE 0x405E
#define VAR_UNUSED_0x405F 0x405F // Unused Var
#define VAR_ROUTE101_STATE 0x4060
#define VAR_UNUSED_0x4061 0x4061 // Unused Var
@@ -153,7 +153,7 @@
#define VAR_LINK_CONTEST_ROOM_STATE 0x4086
#define VAR_CABLE_CLUB_STATE 0x4087
#define VAR_CONTEST_LOCATION 0x4088
#define VAR_0x4089 0x4089
#define VAR_SECRET_BASE_INITIALIZED 0x4089
#define VAR_CONTEST_PRIZE_PICKUP 0x408A
#define VAR_UNUSED_0x408B 0x408B // Unused Var
#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C
@@ -167,15 +167,15 @@
#define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094
#define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095
#define VAR_BRINEY_LOCATION 0x4096
#define VAR_0x4097 0x4097
#define VAR_SECRET_BASE_SHOULD_BE_INIT 0x4097
#define VAR_PETALBURG_WOODS_STATE 0x4098
#define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099
#define VAR_RUSTURF_TUNNEL_STATE 0x409A
#define VAR_UNUSED_0x409B 0x409B // Unused Var
#define VAR_ELITE_4_STATE 0x409C
#define VAR_UNUSED_0x409D 0x409D // Unused Var
#define VAR_0x409E 0x409E
#define VAR_0x409F 0x409F
#define VAR_MOSSDEEP_SPACE_CENTER_STATE_1 0x409E
#define VAR_MOSSDEEP_SPACE_CENTER_STATE_2 0x409F
#define VAR_SLATEPORT_HARBOR_STATE 0x40A0
#define VAR_UNUSED_0x40A1 0x40A1 // Unused var
#define VAR_SEAFLOOR_CAVERN_STATE 0x40A2

2
src/field_specials.c
View File

@@ -3580,7 +3580,7 @@ bool32 sub_813B4E0(void)
bool32 sub_813B514(void)
{
if (!VarGet(VAR_0x403F))
if (!VarGet(VAR_ALWAYS_ZERO_0x403F))
{
return FALSE;
}

2
src/lottery_corner.c
View File

@@ -27,7 +27,7 @@ void ResetLotteryCorner(void)
u16 rand = Random();
SetLotteryNumber((Random() << 16) | rand);
VarSet(VAR_POKELOT_PRIZE, 0);
VarSet(VAR_POKELOT_PRIZE_ITEM, 0);
}
void SetRandomLotteryNumber(u16 i)

6
src/overworld.c
View File

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

4
src/secret_base.c
View File

@@ -407,7 +407,7 @@ void sub_80E9068(void)
bool8 sub_80E909C(void)
{
if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_0x4097) == 0)
if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_SECRET_BASE_SHOULD_BE_INIT) == 0)
{
return FALSE;
}
@@ -494,7 +494,7 @@ void sub_80E9238(u8 flagIn)
sub_80E8CB0(&x, &y, 0x220);
MapGridSetMetatileIdAt(x + 7, y + 7, 0x221 | 0xc00);
}
else if (flagIn == 1 && VarGet(VAR_0x4089) == 1)
else if (flagIn == 1 && VarGet(VAR_SECRET_BASE_INITIALIZED) == 1)
{
sub_80E8CB0(&x, &y, 0x220);
MapGridSetMetatileIdAt(x + 7, y + 7, 0x20a | 0xc00);