summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc64
-rw-r--r--data/scripts/contest_hall.inc52
-rw-r--r--data/scripts/players_house.inc18
3 files changed, 67 insertions, 67 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index b73d7e1fa..94c883363 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -101,14 +101,14 @@ RustboroCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
SlateportCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
SootopolisCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
- map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE
- map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE
+ map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE
.2byte 0
MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE
@@ -138,21 +138,21 @@ RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
- compare VAR_0x4087, 1
+ compare VAR_CABLE_CLUB_STATE, 1
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
- compare VAR_0x4087, 2
+ compare VAR_CABLE_CLUB_STATE, 2
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
- compare VAR_0x4087, 5
+ compare VAR_CABLE_CLUB_STATE, 5
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
- compare VAR_0x4087, 3
+ compare VAR_CABLE_CLUB_STATE, 3
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D
- compare VAR_0x4087, 4
+ compare VAR_CABLE_CLUB_STATE, 4
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23
- compare VAR_0x4087, 6
+ compare VAR_CABLE_CLUB_STATE, 6
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29
- compare VAR_0x4087, 7
+ compare VAR_CABLE_CLUB_STATE, 7
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F
- compare VAR_0x4087, 8
+ compare VAR_CABLE_CLUB_STATE, 8
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35
end
@@ -198,14 +198,14 @@ SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B
map_script_2 VAR_0x40CD, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0
- map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85
- map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85
- map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85
- map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7
- map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C
- map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C
- map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85
- map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D
+ map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85
+ map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85
+ map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85
+ map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7
+ map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C
+ map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C
+ map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85
+ map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D
.2byte 0
OldaleTown_PokemonCenter_2F_EventScript_276C85:: @ 8276C85
@@ -231,7 +231,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D
OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5
special CloseLink
- setvar VAR_0x4087, 0
+ setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D
@@ -254,7 +254,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7
OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF
special CloseLink
- setvar VAR_0x4087, 0
+ setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E
@@ -276,7 +276,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C
OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44
special CloseLink
- setvar VAR_0x4087, 0
+ setvar VAR_CABLE_CLUB_STATE, 0
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F
waitmovement 0
compare VAR_0x8007, 0
@@ -298,7 +298,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C
end
OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84
- setvar VAR_0x4087, 0
+ setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E
@@ -450,7 +450,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
special HealPlayerParty
special SavePlayerParty
special LoadPlayerBag
- copyvar VAR_0x4087, VAR_0x8004
+ copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197
waitmessage
call OldaleTown_PokemonCenter_2F_EventScript_277BE4
@@ -554,7 +554,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
setvar VAR_0x8004, 3
- copyvar VAR_0x4087, VAR_0x8004
+ copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197
waitmessage
call OldaleTown_PokemonCenter_2F_EventScript_277BE4
@@ -629,7 +629,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
setvar VAR_0x8004, 4
- copyvar VAR_0x4087, VAR_0x8004
+ copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197
waitmessage
call OldaleTown_PokemonCenter_2F_EventScript_277BE4
@@ -1030,7 +1030,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
closemessage
special HealPlayerParty
setvar VAR_0x8004, 6
- copyvar VAR_0x4087, VAR_0x8004
+ copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
call OldaleTown_PokemonCenter_2F_EventScript_277BBE
special DrawWholeMapView
playse SE_TK_KASYA
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index f85ebd3d2..b42b6505f 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1,7 +1,7 @@
LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5
lock
faceplayer
- compare VAR_0x408A, 0
+ compare VAR_CONTEST_PRIZE_PICKUP, 0
goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13
call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA
call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3
@@ -21,7 +21,7 @@ LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3
LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13
msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT
- switch VAR_0x408A
+ switch VAR_CONTEST_PRIZE_PICKUP
case 4, LilycoveCity_ContestLobby_EventScript_279D2C
end
@@ -29,7 +29,7 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C
giveitem_std ITEM_LUXURY_BALL
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B
- setvar VAR_0x408A, 0
+ setvar VAR_CONTEST_PRIZE_PICKUP, 0
closemessage
release
end
@@ -181,7 +181,7 @@ LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87
msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT
closemessage
releaseall
- setvar VAR_0x4086, 1
+ setvar VAR_LINK_CONTEST_ROOM_STATE, 1
return
LinkContestRoom1_EventScript_279F97:: @ 8279F97
@@ -204,7 +204,7 @@ LinkContestRoom1_EventScript_279F97:: @ 8279F97
call LinkContestRoom1_EventScript_27A9D4
call LinkContestRoom1_EventScript_27AA1B
call LinkContestRoom1_EventScript_27AB36
- setvar VAR_0x4086, 2
+ setvar VAR_LINK_CONTEST_ROOM_STATE, 2
return
LinkContestRoom1_EventScript_279FF2:: @ 8279FF2
@@ -271,7 +271,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097
return
LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A0C7
lockall
msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT
@@ -391,7 +391,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
return
LinkContestRoom1_EventScript_27A217:: @ 827A217
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A229
message LinkContestRoom1_Text_27B815
waitmessage
@@ -419,7 +419,7 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230
return
LinkContestRoom1_EventScript_27A26C:: @ 827A26C
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A280
msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT
return
@@ -445,7 +445,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297
return
LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A2CA
message LinkContestRoom1_Text_27B8F2
return
@@ -483,15 +483,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5
LinkContestRoom1_EventScript_27A34F:: @ 827A34F
special sub_80F82FC
- compare VAR_0x4088, 1
+ compare VAR_CONTEST_LOCATION, 1
call_if_eq LinkContestRoom1_EventScript_27A454
- compare VAR_0x4088, 2
+ compare VAR_CONTEST_LOCATION, 2
call_if_eq LinkContestRoom1_EventScript_27A4B2
- compare VAR_0x4088, 3
+ compare VAR_CONTEST_LOCATION, 3
call_if_eq LinkContestRoom1_EventScript_27A510
- compare VAR_0x4088, 4
+ compare VAR_CONTEST_LOCATION, 4
call_if_eq LinkContestRoom1_EventScript_27A56E
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
call_if_eq LinkContestRoom1_EventScript_27A5CC
setvar VAR_TEMP_1, 9
setvar VAR_TEMP_2, 9
@@ -843,7 +843,7 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801
return
LinkContestRoom1_EventScript_27A853:: @ 827A853
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A867
msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT
return
@@ -893,7 +893,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5
return
LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A90F
msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT
return
@@ -906,7 +906,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F
return
LinkContestRoom1_EventScript_27A91E:: @ 827A91E
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A932
msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT
return
@@ -919,7 +919,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932
return
LinkContestRoom1_EventScript_27A941:: @ 827A941
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A955
msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT
return
@@ -932,7 +932,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955
return
LinkContestRoom1_EventScript_27A964:: @ 827A964
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27A978
msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT
return
@@ -983,7 +983,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4
return
LinkContestRoom1_EventScript_27AA00:: @ 827AA00
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27AA14
msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT
return
@@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_27AA14:: @ 827AA14
LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B
addvar VAR_TEMP_1, 1
lockall
- compare VAR_0x4088, 1
+ compare VAR_CONTEST_LOCATION, 1
call_if_gt LinkContestRoom1_EventScript_27AA6F
applymovement 9, LinkContestRoom1_Movement_27AD3B
applymovement 12, LinkContestRoom1_Movement_27AD3F
@@ -1081,7 +1081,7 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
return
LinkContestRoom1_EventScript_27AB36:: @ 827AB36
- compare VAR_0x4088, 5
+ compare VAR_CONTEST_LOCATION, 5
goto_if_eq LinkContestRoom1_EventScript_27ABD8
call LinkContestRoom1_EventScript_27AB9E
goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82
@@ -1135,7 +1135,7 @@ LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE
return
LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2
- setvar VAR_0x4099, 1
+ setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
return
LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8
@@ -1149,7 +1149,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8
return
LinkContestRoom1_EventScript_27ABF1:: @ 827ABF1
- setvar VAR_0x4099, 2
+ setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2
return
LinkContestRoom1_EventScript_27ABF7:: @ 827ABF7
@@ -1201,7 +1201,7 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E
return
LinkContestRoom1_EventScript_27AC77:: @ 827AC77
- compare VAR_0x4088, 2
+ compare VAR_CONTEST_LOCATION, 2
call_if_eq LinkContestRoom1_EventScript_27ABCE
specialvar VAR_RESULT, sub_80F7F7C
compare VAR_RESULT, 0
@@ -1218,7 +1218,7 @@ LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8
call LinkContestRoom1_EventScript_27205E
msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT
releaseall
- setvar VAR_0x408A, 4
+ setvar VAR_CONTEST_PRIZE_PICKUP, 4
return
LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index eb29ef6e0..7214d4372 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -1,6 +1,6 @@
LittlerootTown_BrendansHouse_2F_EventScript_2926FE:: @ 82926FE
LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE
- setvar VAR_0x4092, 5
+ setvar VAR_LITTLEROOT_INTRO_STATE, 5
return
LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704
@@ -14,7 +14,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x4092, 4
+ setvar VAR_LITTLEROOT_INTRO_STATE, 4
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763
applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6
waitmovement 0
@@ -63,7 +63,7 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT
call LittlerootTown_BrendansHouse_2F_EventScript_292849
delay 30
- setvar VAR_0x4092, 6
+ setvar VAR_LITTLEROOT_INTRO_STATE, 6
setflag FLAG_SET_WALL_CLOCK
setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
@@ -149,7 +149,7 @@ LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862
LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866
LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866
- setvar VAR_0x4092, 7
+ setvar VAR_LITTLEROOT_INTRO_STATE, 7
releaseall
end
@@ -313,15 +313,15 @@ LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5
LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5
lock
faceplayer
- compare VAR_0x4082, 4
+ compare VAR_LITTLEROOT_HOUSES_STATE, 4
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
- compare VAR_0x408C, 4
+ compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19
goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86
compare VAR_TEMP_1, 1
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94
- compare VAR_0x4092, 7
+ compare VAR_LITTLEROOT_INTRO_STATE, 7
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
release
@@ -513,8 +513,8 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
copyvar VAR_0x40D5, VAR_RESULT
msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x4082, 4
- setvar VAR_0x408C, 4
+ setvar VAR_LITTLEROOT_HOUSES_STATE, 4
+ setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4
releaseall
end