ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

name unused route state vars

Browse Source
This commit is contained in:
GriffinR 2019-08-05 11:50:29 -04:00 committed by GitHub
parent c2bf668fdd
commit 191f74525d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
waitstate waitstate
special DoMirageTowerCeilingCrumble special DoMirageTowerCeilingCrumble
waitstate waitstate
setvar VAR_ROUTE_111_STATE, 1 setvar VAR_MIRAGE_TOWER_STATE, 1
clearflag FLAG_LANDMARK_MIRAGE_TOWER clearflag FLAG_LANDMARK_MIRAGE_TOWER
warp MAP_ROUTE111, 255, 19, 59 warp MAP_ROUTE111, 255, 19, 59
waitstate waitstate

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

@ -7,7 +7,7 @@ Route111_MapScripts:: @ 81F0CA7
Route111_MapScript1_1F0CBC: @ 81F0CBC Route111_MapScript1_1F0CBC: @ 81F0CBC
call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1 call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1
compare VAR_ROUTE_111_STATE, 1 compare VAR_MIRAGE_TOWER_STATE, 1
call_if_eq Route111_EventScript_1F0CE4 call_if_eq Route111_EventScript_1F0CE4
end end
@ -41,9 +41,9 @@ Route111_OnTransition: @ 81F0D87
setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
special SetMirageTowerVisibility special SetMirageTowerVisibility
call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C
compare VAR_ROUTE_111_STATE, 1 compare VAR_MIRAGE_TOWER_STATE, 1
call_if_eq Route111_EventScript_1F0DC2 call_if_eq Route111_EventScript_1F0DC2
compare VAR_ROUTE_111_STATE, 2 compare VAR_MIRAGE_TOWER_STATE, 2
call_if_eq Route111_EventScript_1F0E40 call_if_eq Route111_EventScript_1F0E40
call Route111_EventScript_1F0DE6 call Route111_EventScript_1F0DE6
call Route111_EventScript_28CCC7 call Route111_EventScript_28CCC7
@ -101,11 +101,11 @@ Route111_EventScript_1F0E3C:: @ 81F0E3C
return return
Route111_EventScript_1F0E40:: @ 81F0E40 Route111_EventScript_1F0E40:: @ 81F0E40
setvar VAR_ROUTE_111_STATE, 3 setvar VAR_MIRAGE_TOWER_STATE, 3
return return
Route111_MapScript2_1F0E46: @ 81F0E46 Route111_MapScript2_1F0E46: @ 81F0E46
map_script_2 VAR_ROUTE_111_STATE, 1, Route111_EventScript_1F0E50 map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E50
.2byte 0 .2byte 0
Route111_EventScript_1F0E50:: @ 81F0E50 Route111_EventScript_1F0E50:: @ 81F0E50
@ -113,7 +113,7 @@ Route111_EventScript_1F0E50:: @ 81F0E50
end end
Route111_MapScript2_1F0E56: @ 81F0E56 Route111_MapScript2_1F0E56: @ 81F0E56
map_script_2 VAR_ROUTE_111_STATE, 1, Route111_EventScript_1F0E60 map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E60
.2byte 0 .2byte 0
Route111_EventScript_1F0E60:: @ 81F0E60 Route111_EventScript_1F0E60:: @ 81F0E60
@ -134,7 +134,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60
waitstate waitstate
special StartMirageTowerFossilFallAndSink special StartMirageTowerFossilFallAndSink
waitstate waitstate
setvar VAR_ROUTE_111_STATE, 2 setvar VAR_MIRAGE_TOWER_STATE, 2
clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7 goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7
msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT
@ -411,9 +411,9 @@ Route111_EventScript_1F1192:: @ 81F1192
Route111_EventScript_1F119B:: @ 81F119B Route111_EventScript_1F119B:: @ 81F119B
lock lock
faceplayer faceplayer
compare VAR_ROUTE_111_STATE, 3 compare VAR_MIRAGE_TOWER_STATE, 3
goto_if_eq Route111_EventScript_1F11C6 goto_if_eq Route111_EventScript_1F11C6
compare VAR_ROUTE_111_STATE, 2 compare VAR_MIRAGE_TOWER_STATE, 2
goto_if_eq Route111_EventScript_1F11D0 goto_if_eq Route111_EventScript_1F11D0
goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA
msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT

70
include/constants/vars.h
View File

@ -96,54 +96,54 @@
#define VAR_LOTAD_SIZE_RECORD 0x404F #define VAR_LOTAD_SIZE_RECORD 0x404F
#define VAR_LITTLEROOT_TOWN_STATE 0x4050 #define VAR_LITTLEROOT_TOWN_STATE 0x4050
#define VAR_OLDALE_TOWN_STATE 0x4051 #define VAR_OLDALE_TOWN_STATE 0x4051
#define VAR_UNUSED_0x4052 0x4052 // Unused Var #define VAR_DEWFORD_TOWN_STATE 0x4052 // Unused Var
#define VAR_LAVARIDGE_TOWN_STATE 0x4053 #define VAR_LAVARIDGE_TOWN_STATE 0x4053
#define VAR_CURRENT_SECRET_BASE 0x4054 #define VAR_CURRENT_SECRET_BASE 0x4054 // was probably allocated for VAR_FALLARBOR_TOWN_STATE at one point
#define VAR_UNUSED_0x4055 0x4055 // Unused Var #define VAR_VERDANTURF_TOWN_STATE 0x4055 // Unused Var
#define VAR_UNUSED_0x4056 0x4056 // Unused Var #define VAR_PACIFIDLOG_TOWN_STATE 0x4056 // Unused Var
#define VAR_PETALBURG_CITY_STATE 0x4057 #define VAR_PETALBURG_CITY_STATE 0x4057
#define VAR_SLATEPORT_CITY_STATE 0x4058 #define VAR_SLATEPORT_CITY_STATE 0x4058
#define VAR_UNUSED_0x4059 0x4059 // Unused Var #define VAR_MAUVILLE_CITY_STATE 0x4059 // Unused Var
#define VAR_RUSTBORO_CITY_STATE 0x405A #define VAR_RUSTBORO_CITY_STATE 0x405A
#define VAR_UNUSED_0x405B 0x405B // Unused Var #define VAR_FORTREE_CITY_STATE 0x405B // Unused Var
#define VAR_UNUSED_0x405C 0x405C // Unused Var #define VAR_LILYCOVE_CITY_STATE 0x405C // Unused Var
#define VAR_MOSSDEEP_CITY_STATE 0x405D #define VAR_MOSSDEEP_CITY_STATE 0x405D
#define VAR_SOOTOPOLIS_CITY_STATE 0x405E #define VAR_SOOTOPOLIS_CITY_STATE 0x405E
#define VAR_UNUSED_0x405F 0x405F // Unused Var #define VAR_EVER_GRANDE_CITY_STATE 0x405F // Unused Var
#define VAR_ROUTE101_STATE 0x4060 #define VAR_ROUTE101_STATE 0x4060
#define VAR_UNUSED_0x4061 0x4061 // Unused Var #define VAR_ROUTE102_STATE 0x4061 // Unused Var
#define VAR_UNUSED_0x4062 0x4062 // Unused Var #define VAR_ROUTE103_STATE 0x4062 // Unused Var
#define VAR_ROUTE104_STATE 0x4063 #define VAR_ROUTE104_STATE 0x4063
#define VAR_UNUSED_0x4064 0x4064 // Unused Var #define VAR_ROUTE105_STATE 0x4064 // Unused Var
#define VAR_UNUSED_0x4065 0x4065 // Unused Var #define VAR_ROUTE106_STATE 0x4065 // Unused Var
#define VAR_UNUSED_0x4066 0x4066 // Unused Var #define VAR_ROUTE107_STATE 0x4066 // Unused Var
#define VAR_UNUSED_0x4067 0x4067 // Unused Var #define VAR_ROUTE108_STATE 0x4067 // Unused Var
#define VAR_UNUSED_0x4068 0x4068 // Unused Var #define VAR_ROUTE109_STATE 0x4068 // Unused Var
#define VAR_ROUTE110_STATE 0x4069 #define VAR_ROUTE110_STATE 0x4069
#define VAR_UNUSED_0x406A 0x406A // Unused Var #define VAR_ROUTE111_STATE 0x406A // Unused Var
#define VAR_UNUSED_0x406B 0x406B // Unused Var #define VAR_ROUTE112_STATE 0x406B // Unused Var
#define VAR_UNUSED_0x406C 0x406C // Unused Var #define VAR_ROUTE113_STATE 0x406C // Unused Var
#define VAR_UNUSED_0x406D 0x406D // Unused Var #define VAR_ROUTE114_STATE 0x406D // Unused Var
#define VAR_UNUSED_0x406E 0x406E // Unused Var #define VAR_ROUTE115_STATE 0x406E // Unused Var
#define VAR_ROUTE116_STATE 0x406F #define VAR_ROUTE116_STATE 0x406F
#define VAR_UNUSED_0x4070 0x4070 // Unused Var #define VAR_ROUTE117_STATE 0x4070 // Unused Var
#define VAR_ROUTE118_STATE 0x4071 #define VAR_ROUTE118_STATE 0x4071
#define VAR_ROUTE119_STATE 0x4072 #define VAR_ROUTE119_STATE 0x4072
#define VAR_UNUSED_0x4073 0x4073 // Unused Var #define VAR_ROUTE120_STATE 0x4073 // Unused Var
#define VAR_ROUTE121_STATE 0x4074 #define VAR_ROUTE121_STATE 0x4074
#define VAR_UNUSED_0x4075 0x4075 // Unused Var #define VAR_ROUTE122_STATE 0x4075 // Unused Var
#define VAR_UNUSED_0x4076 0x4076 // Unused Var #define VAR_ROUTE123_STATE 0x4076 // Unused Var
#define VAR_UNUSED_0x4077 0x4077 // Unused Var #define VAR_ROUTE124_STATE 0x4077 // Unused Var
#define VAR_UNUSED_0x4078 0x4078 // Unused Var #define VAR_ROUTE125_STATE 0x4078 // Unused Var
#define VAR_UNUSED_0x4079 0x4079 // Unused Var #define VAR_ROUTE126_STATE 0x4079 // Unused Var
#define VAR_UNUSED_0x407A 0x407A // Unused Var #define VAR_ROUTE127_STATE 0x407A // Unused Var
#define VAR_ROUTE128_STATE 0x407B #define VAR_ROUTE128_STATE 0x407B
#define VAR_UNUSED_0x407C 0x407C // Unused Var #define VAR_ROUTE129_STATE 0x407C // Unused Var
#define VAR_UNUSED_0x407D 0x407D // Unused Var #define VAR_ROUTE130_STATE 0x407D // Unused Var
#define VAR_UNUSED_0x407E 0x407E // Unused Var #define VAR_ROUTE131_STATE 0x407E // Unused Var
#define VAR_UNUSED_0x407F 0x407F // Unused Var #define VAR_ROUTE132_STATE 0x407F // Unused Var
#define VAR_UNUSED_0x4080 0x4080 // Unused Var #define VAR_ROUTE133_STATE 0x4080 // Unused Var
#define VAR_UNUSED_0x4081 0x4081 // Unused Var #define VAR_ROUTE134_STATE 0x4081 // Unused Var
#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 #define VAR_LITTLEROOT_HOUSES_STATE 0x4082
#define VAR_UNUSED_0x4083 0x4083 // Unused Var #define VAR_UNUSED_0x4083 0x4083 // Unused Var
#define VAR_BIRCH_LAB_STATE 0x4084 #define VAR_BIRCH_LAB_STATE 0x4084
@ -217,7 +217,7 @@
#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
#define VAR_ROUTE_111_STATE 0x40CB #define VAR_MIRAGE_TOWER_STATE 0x40CB
#define VAR_FOSSIL_MANIAC_STATE 0x40CC #define VAR_FOSSIL_MANIAC_STATE 0x40CC
#define VAR_CABLE_CLUB_TUTORIAL_STATE 0x40CD #define VAR_CABLE_CLUB_TUTORIAL_STATE 0x40CD
#define VAR_FRONTIER_BATTLE_MODE 0x40CE #define VAR_FRONTIER_BATTLE_MODE 0x40CE

2
src/mirage_tower.c
View File

@ -318,7 +318,7 @@ void SetMirageTowerVisibility(void)
u16 rand; u16 rand;
bool8 visible; bool8 visible;
if (VarGet(VAR_ROUTE_111_STATE)) if (VarGet(VAR_MIRAGE_TOWER_STATE))
{ {
FlagClear(FLAG_MIRAGE_TOWER_VISIBLE); FlagClear(FLAG_MIRAGE_TOWER_VISIBLE);
return; return;