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

Merge pull request #574 from Phlosioneer/event-vars

Browse Source 
Event vars
This commit is contained in:
huderlem
2019-02-25 08:02:28 -06:00
committed by GitHub
parent a5cf2b8090 4e5fae0086
commit 84573f1774
115 changed files with 807 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
data/event_scripts.s
View File

@@ -1100,7 +1100,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
setvar VAR_0x40C6, 2
setvar VAR_STEVENS_HOUSE_STATE, 2
setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
@@ -1134,8 +1134,8 @@ EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F
return
EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843
setvar VAR_0x4082, 3
setvar VAR_0x408C, 3
setvar VAR_LITTLEROOT_HOUSES_STATE, 3
setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3
clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
return
@@ -1149,11 +1149,11 @@ EventScript_WhiteOut:: @ 8271857
end
EventScript_271862:: @ 8271862
compare VAR_0x4096, 1
compare VAR_BRINEY_LOCATION, 1
goto_if_eq EverGrandeCity_HallOfFame_EventScript_271884
compare VAR_0x4096, 2
compare VAR_BRINEY_LOCATION, 2
goto_if_eq EverGrandeCity_HallOfFame_EventScript_27189A
compare VAR_0x4096, 3
compare VAR_BRINEY_LOCATION, 3
goto_if_eq EverGrandeCity_HallOfFame_EventScript_2718B3
end
@@ -1194,7 +1194,7 @@ EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC
clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
clearflag FLAG_DEFEATED_ELITE_4_GLACIA
clearflag FLAG_DEFEATED_ELITE_4_DRAKE
setvar VAR_0x409C, 0
setvar VAR_ELITE_4_STATE, 0
return
DewfordTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
@@ -1214,15 +1214,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
return
OldaleTown_PokemonCenter_1F_EventScript_27190C:: @ 827190C
setvar VAR_0x4096, 1
setvar VAR_BRINEY_LOCATION, 1
return
OldaleTown_PokemonCenter_1F_EventScript_271912:: @ 8271912
setvar VAR_0x4096, 2
setvar VAR_BRINEY_LOCATION, 2
return
OldaleTown_PokemonCenter_1F_EventScript_271918:: @ 8271918
setvar VAR_0x4096, 3
setvar VAR_BRINEY_LOCATION, 3
return
BattleFrontier_PokemonCenter_1F_EventScript_27191E:: @ 827191E
@@ -1716,8 +1716,8 @@ DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B
DewfordTown_EventScript_271E95:: @ 8271E95
Route104_MrBrineysHouse_EventScript_271E95:: @ 8271E95
Route109_EventScript_271E95:: @ 8271E95
copyvar VAR_0x8008, VAR_0x4096
setvar VAR_0x4096, 0
copyvar VAR_0x8008, VAR_BRINEY_LOCATION
setvar VAR_BRINEY_LOCATION, 0
return
EventScript_UseSurf:: @ 8271EA0
@@ -1948,7 +1948,7 @@ Route109_EventScript_2720A8:: @ 82720A8
LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD
Route101_EventScript_2720AD:: @ 82720AD
Route103_EventScript_2720AD:: @ 82720AD
compare VAR_0x4085, 0
compare VAR_PETALBURG_GYM_STATE, 0
goto_if_eq Common_EventScript_NopReturn
goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A
compare VAR_BIRCH_STATE, 0
@@ -2067,7 +2067,7 @@ PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setvar VAR_0x4096, 0
setvar VAR_BRINEY_LOCATION, 0
return
RusturfTunnel_EventScript_272216:: @ 8272216
@@ -3986,13 +3986,13 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21
end
LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B
compare VAR_0x4086, 2
compare VAR_LINK_CONTEST_ROOM_STATE, 2
goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95
setvar VAR_0x8005, 6
special InterviewBefore
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95
switch VAR_0x4088
switch VAR_CONTEST_LOCATION
case 0, LilycoveCity_ContestLobby_EventScript_28CB95
case 2, LilycoveCity_ContestLobby_EventScript_28CB91
case 1, LilycoveCity_ContestLobby_EventScript_28CB91
@@ -4079,7 +4079,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A
end
BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84
compare VAR_0x40BC, 0
compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6
setvar VAR_0x8005, 7
special InterviewBefore

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

@@ -231,7 +231,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
end
BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930
setvar VAR_0x40BC, 1
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
return
BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936
@@ -305,7 +305,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
setvar VAR_0x40BC, 1
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end
@@ -385,7 +385,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end
@@ -466,7 +466,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end
@@ -995,7 +995,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6
BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
incrementgamestat 30
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
message BattleFrontier_BattleTowerLobby_Text_24144D
waitmessage
setvar VAR_0x8004, 6
@@ -1058,7 +1058,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
incrementgamestat 30
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
message BattleFrontier_BattleTowerLobby_Text_24144D
waitmessage
setvar VAR_0x8004, 6

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

@@ -15,7 +15,7 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
return
BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F
end

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

@@ -3,7 +3,7 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
.byte 0
BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
end

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

@@ -138,10 +138,10 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN
setvar VAR_0x408E, 2
setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
copyvar VAR_0x4096, VAR_0x8008
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
waitstate
release
end
@@ -177,7 +177,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790
call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799
closemessage
copyvar VAR_0x4096, VAR_0x8008
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
resetobjectpriority 2, MAP_ROUTE109
moveobjectoffscreen 2

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

@@ -173,8 +173,8 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT
setflag FLAG_DEFEATED_DEWFORD_GYM
setflag FLAG_BADGE02_GET
addvar VAR_0x4085, 1
compare VAR_0x4085, 6
addvar VAR_PETALBURG_GYM_STATE, 1
compare VAR_PETALBURG_GYM_STATE, 6
call_if_eq DewfordTown_Gym_EventScript_271E84
setvar VAR_0x8008, 2
call DewfordTown_Gym_EventScript_271F43

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

@@ -13,19 +13,19 @@ EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
end
EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB
map_script_2 VAR_0x409C, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5
map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5
.2byte 0
EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5
lockall
call EverGrandeCity_DrakesRoom_EventScript_272475
setvar VAR_0x409C, 4
setvar VAR_ELITE_4_STATE, 4
releaseall
end
EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2
call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7
compare VAR_0x409C, 4
compare VAR_ELITE_4_STATE, 4
call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED
end

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

@@ -13,19 +13,19 @@ EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C
end
EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431
map_script_2 VAR_0x409C, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B
map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B
.2byte 0
EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B
lockall
call EverGrandeCity_GlaciasRoom_EventScript_272475
setvar VAR_0x409C, 3
setvar VAR_ELITE_4_STATE, 3
releaseall
end
EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448
call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D
compare VAR_0x409C, 3
compare VAR_ELITE_4_STATE, 3
call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463
end

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

@@ -13,19 +13,19 @@ EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E
end
EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193
map_script_2 VAR_0x409C, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D
map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D
.2byte 0
EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D
lockall
call EverGrandeCity_PhoebesRoom_EventScript_272475
setvar VAR_0x409C, 2
setvar VAR_ELITE_4_STATE, 2
releaseall
end
EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA
call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF
compare VAR_0x409C, 2
compare VAR_ELITE_4_STATE, 2
call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5
end

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

@@ -12,7 +12,7 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
compare VAR_0x409C, 1
compare VAR_ELITE_4_STATE, 1
call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38
end
@@ -34,13 +34,13 @@ EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48
end
EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D
map_script_2 VAR_0x409C, 0, EverGrandeCity_SidneysRoom_EventScript_227F57
map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_227F57
.2byte 0
EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57
lockall
call EverGrandeCity_SidneysRoom_EventScript_272475
setvar VAR_0x409C, 1
setvar VAR_ELITE_4_STATE, 1
releaseall
end

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

@@ -4,7 +4,7 @@ FallarborTown_MapScripts:: @ 81EB1FA
FallarborTown_MapScript1_1EB200: @ 81EB200
setflag FLAG_VISITED_FALLARBOR_TOWN
setvar VAR_0x4086, 0
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
clearflag FLAG_CONTEST_SKETCH_CREATED
end

6
data/maps/InsideOfTruck/map.json
View File

@@ -83,7 +83,7 @@
"x": 3,
"y": 1,
"elevation": 3,
"var": "VAR_0x4092",
"var": "VAR_LITTLEROOT_INTRO_STATE",
"var_value": "0",
"script": "InsideOfTruck_EventScript_23BF04"
},
@@ -92,7 +92,7 @@
"x": 3,
"y": 2,
"elevation": 3,
"var": "VAR_0x4092",
"var": "VAR_LITTLEROOT_INTRO_STATE",
"var_value": "0",
"script": "InsideOfTruck_EventScript_23BF04"
},
@@ -101,7 +101,7 @@
"x": 3,
"y": 3,
"elevation": 3,
"var": "VAR_0x4092",
"var": "VAR_LITTLEROOT_INTRO_STATE",
"var_value": "0",
"script": "InsideOfTruck_EventScript_23BF04"
}

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

@@ -25,26 +25,26 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04
InsideOfTruck_EventScript_23BF20:: @ 823BF20
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
setvar VAR_0x4092, 1
setvar VAR_LITTLEROOT_INTRO_STATE, 1
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
setvar VAR_0x408C, 1
setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1
setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10
releaseall
end
InsideOfTruck_EventScript_23BF46:: @ 823BF46
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
setvar VAR_0x4092, 2
setvar VAR_LITTLEROOT_INTRO_STATE, 2
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
setvar VAR_0x4082, 1
setvar VAR_LITTLEROOT_HOUSES_STATE, 1
setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
releaseall
end

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

@@ -21,7 +21,7 @@ JaggedPass_EventScript_230685:: @ 8230685
return
JaggedPass_MapScript1_23068B: @ 823068B
compare VAR_0x40BD, 1
compare VAR_JAGGED_PASS_ASH_WEATHER, 1
call_if_eq JaggedPass_EventScript_230697
end

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

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

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

@@ -76,13 +76,13 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
setflag FLAG_FLANNERY_GIVES_BADGE_INFO
setflag FLAG_DEFEATED_LAVARIDGE_GYM
setflag FLAG_BADGE04_GET
addvar VAR_0x4085, 1
compare VAR_0x4085, 6
addvar VAR_PETALBURG_GYM_STATE, 1
compare VAR_PETALBURG_GYM_STATE, 6
call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84
setvar VAR_0x8008, 4
call LavaridgeTown_Gym_1F_EventScript_271F43
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
setvar VAR_0x4053, 1
setvar VAR_LAVARIDGE_RIVAL_STATE, 1
call LavaridgeTown_Gym_1F_EventScript_1FE841
closemessage
delay 30

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

@@ -5,7 +5,7 @@ LilycoveCity_MapScripts:: @ 81E2B3C
LilycoveCity_MapScript1_1E2B47: @ 81E2B47
setflag FLAG_VISITED_LILYCOVE_CITY
setvar VAR_0x4086, 0
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call Common_EventScript_SetupRivalGender

32
data/maps/LilycoveCity_ContestLobby/scripts.inc
View File

@@ -22,13 +22,13 @@ LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C
return
LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
map_script_2 VAR_0x4099, 1, LilycoveCity_ContestLobby_EventScript_21A255
map_script_2 VAR_0x4099, 2, LilycoveCity_ContestLobby_EventScript_21A427
map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_21A255
map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_21A427
.2byte 0
LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255
goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A264
setvar VAR_0x4099, 0
setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
end
LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264
@@ -55,7 +55,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA
msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT
closemessage
special sub_80F88DC
setvar VAR_0x4099, 0
setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
specialvar VAR_RESULT, GiveMonArtistRibbon
compare VAR_RESULT, 1
call_if_eq LilycoveCity_ContestLobby_EventScript_21A314
@@ -75,7 +75,7 @@ LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4
closemessage
applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
waitmovement 0
setvar VAR_0x4099, 0
setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
removeobject 4
releaseall
end
@@ -202,7 +202,7 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427
goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A436
setvar VAR_0x4099, 0
setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
end
LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436
@@ -227,7 +227,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A
msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT
closemessage
special sub_80F88DC
setvar VAR_0x4099, 0
setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
specialvar VAR_RESULT, GiveMonArtistRibbon
compare VAR_RESULT, 1
call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4
@@ -247,7 +247,7 @@ LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4
closemessage
applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
waitmovement 0
setvar VAR_0x4099, 0
setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
removeobject 11
releaseall
end
@@ -338,28 +338,28 @@ LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585
return
LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7
setvar VAR_0x4088, 1
setvar VAR_CONTEST_LOCATION, 1
return
LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD
setvar VAR_0x4088, 2
setvar VAR_CONTEST_LOCATION, 2
return
LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3
setvar VAR_0x4088, 3
setvar VAR_CONTEST_LOCATION, 3
return
LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9
setvar VAR_0x4088, 4
setvar VAR_CONTEST_LOCATION, 4
return
LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
copyvar VAR_0x4094, 0x1
copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
giveitem ITEM_CONTEST_PASS, 1
setvar VAR_0x800B, 8
setvar VAR_CONTEST_RANK, 3
setvar VAR_0x4099, 1
setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
setflag FLAG_SYS_RIBBON_GET
end
@@ -833,9 +833,9 @@ LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17
waitmessage
subvar VAR_0x8004, 1
call LilycoveCity_ContestLobby_EventScript_21AC49
setvar VAR_0x4086, 1
setvar VAR_LINK_CONTEST_ROOM_STATE, 1
special sub_80F8AFC
setvar VAR_0x4088, 5
setvar VAR_CONTEST_LOCATION, 5
setvar VAR_CONTEST_RANK, 3
call LilycoveCity_ContestLobby_EventScript_21A5EF
end

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

@@ -57,7 +57,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB
end
LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE
map_script_2 VAR_0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808
map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808
.2byte 0
LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
@@ -76,7 +76,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861
waitmovement 0
msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN
copyvar VAR_0x4094, 0x1
copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
releaseall
end

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

@@ -61,11 +61,11 @@ LinkContestRoom1_EventScript_23B80F:: @ 823B80F
return
LinkContestRoom1_MapScript2_23B815: @ 823B815
map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829
map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B829
.2byte 0
LinkContestRoom1_MapScript2_23B81F: @ 823B81F
map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834
map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B834
.2byte 0
LinkContestRoom1_EventScript_23B829:: @ 823B829
@@ -303,7 +303,7 @@ LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
specialvar VAR_RESULT, sub_80F9160
compare VAR_RESULT, 1
goto_if_eq LinkContestRoom1_EventScript_23BD86
switch VAR_0x4088
switch VAR_CONTEST_LOCATION
case 1, LinkContestRoom1_EventScript_23BB78
case 2, LinkContestRoom1_EventScript_23BB8B
case 3, LinkContestRoom1_EventScript_23BBE6
@@ -407,7 +407,7 @@ LinkContestRoom1_EventScript_23BD86:: @ 823BD86
LinkContestRoom1_EventScript_23BE44:: @ 823BE44
special sub_80F9154
switch VAR_0x4088
switch VAR_CONTEST_LOCATION
case 1, LinkContestRoom1_EventScript_23BE84
case 2, LinkContestRoom1_EventScript_23BE8E
case 3, LinkContestRoom1_EventScript_23BE98

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

@@ -7,18 +7,18 @@ LittlerootTown_MapScripts:: @ 81E7DCB
LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
setflag FLAG_VISITED_LITTLEROOT_TOWN
call Common_EventScript_SetupRivalGender
compare VAR_0x4092, 2
compare VAR_LITTLEROOT_INTRO_STATE, 2
call_if_eq LittlerootTown_EventScript_1E7E67
call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F
compare VAR_0x4050, 3
call_if_eq LittlerootTown_EventScript_1E7E92
compare VAR_0x4082, 4
compare VAR_LITTLEROOT_HOUSES_STATE, 4
call_if_eq LittlerootTown_EventScript_1E7E5C
compare VAR_0x408C, 4
compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
call_if_eq LittlerootTown_EventScript_1E7E5C
compare VAR_0x40C7, 1
compare VAR_OLDALE_STATE, 1
call_if_eq LittlerootTown_EventScript_1E7E53
compare VAR_0x408D, 3
compare VAR_LITTLEROOT_RIVAL_STATE, 3
call_if_eq LittlerootTown_EventScript_1E7E4F
compare VAR_0x40D3, 1
call_if_eq LittlerootTown_EventScript_1E7E4B
@@ -39,13 +39,13 @@ LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
return
LittlerootTown_EventScript_1E7E53:: @ 81E7E53
setvar VAR_0x40C7, 2
setvar VAR_OLDALE_STATE, 2
setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
return
LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C
setvar VAR_0x4082, 5
setvar VAR_0x408C, 5
setvar VAR_LITTLEROOT_HOUSES_STATE, 5
setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5
return
LittlerootTown_EventScript_1E7E67:: @ 81E7E67
@@ -83,8 +83,8 @@ LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9
return
LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1
map_script_2 VAR_0x4092, 1, LittlerootTown_EventScript_1E7EDB
map_script_2 VAR_0x4092, 2, LittlerootTown_EventScript_1E7EF9
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_1E7EDB
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_1E7EF9
map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1
.2byte 0
@@ -136,7 +136,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9
waitmovement 0
setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
setvar VAR_0x4092, 3
setvar VAR_LITTLEROOT_INTRO_STATE, 3
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor VAR_0x8004, VAR_0x8005
waitdooranim

8
data/maps/LittlerootTown_BrendansHouse_1F/map.json
View File

@@ -135,7 +135,7 @@
"x": 8,
"y": 8,
"elevation": 0,
"var": "VAR_0x4092",
"var": "VAR_LITTLEROOT_INTRO_STATE",
"var_value": "4",
"script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3"
},
@@ -144,7 +144,7 @@
"x": 7,
"y": 3,
"elevation": 0,
"var": "VAR_0x408D",
"var": "VAR_LITTLEROOT_RIVAL_STATE",
"var_value": "2",
"script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE"
},
@@ -153,7 +153,7 @@
"x": 8,
"y": 4,
"elevation": 0,
"var": "VAR_0x408D",
"var": "VAR_LITTLEROOT_RIVAL_STATE",
"var_value": "2",
"script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA"
},
@@ -162,7 +162,7 @@
"x": 9,
"y": 3,
"elevation": 0,
"var": "VAR_0x408D",
"var": "VAR_LITTLEROOT_RIVAL_STATE",
"var_value": "2",
"script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6"
}

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

@@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755
.byte 0
LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
compare VAR_0x4092, 6
compare VAR_LITTLEROOT_INTRO_STATE, 6
call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A
call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
end
@@ -26,11 +26,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A
return
LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4
compare VAR_0x4092, 3
compare VAR_LITTLEROOT_INTRO_STATE, 3
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE
compare VAR_0x4092, 5
compare VAR_LITTLEROOT_INTRO_STATE, 5
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6
compare VAR_0x4092, 6
compare VAR_LITTLEROOT_INTRO_STATE, 6
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2
end
@@ -50,11 +50,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE
return
LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA
map_script_2 VAR_0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C
map_script_2 VAR_0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814
map_script_2 VAR_0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D
map_script_2 VAR_0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E
map_script_2 VAR_0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D
map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E
map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2
.2byte 0
LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814
@@ -100,7 +100,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
special GetRivalSonDaughterString
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT
setflag FLAG_MET_RIVAL_MOM
setvar VAR_0x4082, 2
setvar VAR_LITTLEROOT_HOUSES_STATE, 2
releaseall
end
@@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
delay 30
setvar VAR_0x408D, 3
setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setvar VAR_0x4050, 1
savebgm MUS_DUMMY
fadedefaultbgm

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

@@ -4,11 +4,11 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3
.byte 0
LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
compare VAR_0x408D, 2
compare VAR_LITTLEROOT_RIVAL_STATE, 2
call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457
compare VAR_0x408D, 3
compare VAR_LITTLEROOT_RIVAL_STATE, 3
call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A
compare VAR_0x4092, 4
compare VAR_LITTLEROOT_INTRO_STATE, 4
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE
call LittlerootTown_BrendansHouse_2F_EventScript_275CE1
setvar VAR_0x4089, 0
@@ -16,7 +16,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433
compare VAR_0x4084, 2
compare VAR_BIRCH_LAB_STATE, 2
goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456
goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433
@@ -40,7 +40,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457
return
LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464
setvar VAR_0x408D, 2
setvar VAR_LITTLEROOT_RIVAL_STATE, 2
return
LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
@@ -55,7 +55,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481
lockall
compare VAR_0x408D, 2
compare VAR_LITTLEROOT_RIVAL_STATE, 2
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497
msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT
releaseall
@@ -81,7 +81,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565
compare VAR_FACING, 4
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594
setvar VAR_0x408D, 3
setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
setvar VAR_0x4050, 1

8
data/maps/LittlerootTown_MaysHouse_1F/map.json
View File

@@ -135,7 +135,7 @@
"x": 2,
"y": 8,
"elevation": 0,
"var": "VAR_0x4092",
"var": "VAR_LITTLEROOT_INTRO_STATE",
"var_value": "4",
"script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C"
},
@@ -144,7 +144,7 @@
"x": 1,
"y": 3,
"elevation": 0,
"var": "VAR_0x408D",
"var": "VAR_LITTLEROOT_RIVAL_STATE",
"var_value": "2",
"script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67"
},
@@ -153,7 +153,7 @@
"x": 2,
"y": 4,
"elevation": 0,
"var": "VAR_0x408D",
"var": "VAR_LITTLEROOT_RIVAL_STATE",
"var_value": "2",
"script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73"
},
@@ -162,7 +162,7 @@
"x": 3,
"y": 3,
"elevation": 0,
"var": "VAR_0x408D",
"var": "VAR_LITTLEROOT_RIVAL_STATE",
"var_value": "2",
"script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F"
}

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

@@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5
.byte 0
LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5
compare VAR_0x4092, 6
compare VAR_LITTLEROOT_INTRO_STATE, 6
call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA
call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1F88DD
end
@@ -26,11 +26,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA
return
LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4
compare VAR_0x4092, 3
compare VAR_LITTLEROOT_INTRO_STATE, 3
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E
compare VAR_0x4092, 5
compare VAR_LITTLEROOT_INTRO_STATE, 5
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916
compare VAR_0x4092, 6
compare VAR_LITTLEROOT_INTRO_STATE, 6
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922
end
@@ -50,11 +50,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E
return
LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A
map_script_2 VAR_0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C
map_script_2 VAR_0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964
map_script_2 VAR_0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D
map_script_2 VAR_0x408C, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE
map_script_2 VAR_0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D
map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE
map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2
.2byte 0
LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964
@@ -100,7 +100,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
special GetRivalSonDaughterString
msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT
setflag FLAG_MET_RIVAL_MOM
setvar VAR_0x408C, 2
setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2
releaseall
end
@@ -119,7 +119,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3
faceplayer
goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33
goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29
compare VAR_0x408D, 3
compare VAR_LITTLEROOT_RIVAL_STATE, 3
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F
special GetRivalSonDaughterString
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT
@@ -210,7 +210,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
delay 30
setvar VAR_0x408D, 3
setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setvar VAR_0x4050, 1
savebgm MUS_DUMMY
fadedefaultbgm

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

@@ -4,11 +4,11 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296
.byte 0
LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
compare VAR_0x408D, 2
compare VAR_LITTLEROOT_RIVAL_STATE, 2
call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A
compare VAR_0x408D, 3
compare VAR_LITTLEROOT_RIVAL_STATE, 3
call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD
compare VAR_0x4092, 4
compare VAR_LITTLEROOT_INTRO_STATE, 4
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE
call LittlerootTown_MaysHouse_2F_EventScript_275CE1
setvar VAR_0x4089, 0
@@ -16,7 +16,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_1F92E6
compare VAR_0x4084, 2
compare VAR_BIRCH_LAB_STATE, 2
goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6
@@ -41,7 +41,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A
return
LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317
setvar VAR_0x408D, 2
setvar VAR_LITTLEROOT_RIVAL_STATE, 2
return
LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
@@ -56,7 +56,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334
lockall
compare VAR_0x408D, 2
compare VAR_LITTLEROOT_RIVAL_STATE, 2
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A
msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT
releaseall
@@ -82,7 +82,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418
compare VAR_FACING, 4
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440
setvar VAR_0x408D, 3
setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
setvar VAR_0x4050, 1

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

@@ -38,7 +38,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7
end
LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06
map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40
map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40
map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
map_script_2 VAR_0x40D3, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
map_script_2 VAR_0x40D3, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
@@ -85,8 +85,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75
end
LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9
map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB
map_script_2 VAR_0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67
map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB
map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67
map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80
map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62
.2byte 0
@@ -122,7 +122,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17
LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT
clearflag FLAG_HIDE_ROUTE_101_BOY
setvar VAR_0x4084, 3
setvar VAR_BIRCH_LAB_STATE, 3
releaseall
end
@@ -264,7 +264,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C
LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84
lock
faceplayer
compare VAR_0x4084, 3
compare VAR_BIRCH_LAB_STATE, 3
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1
goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT
@@ -502,7 +502,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
compare VAR_0x40D3, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141
compare VAR_0x4084, 5
compare VAR_BIRCH_LAB_STATE, 5
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT
release
@@ -537,10 +537,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F
setvar VAR_0x4084, 5
setvar VAR_BIRCH_LAB_STATE, 5
setflag FLAG_ADVENTURE_STARTED
setvar VAR_0x4051, 1
setvar VAR_0x408D, 4
setvar VAR_ROUTE102_ACCESSIBLE, 1
setvar VAR_LITTLEROOT_RIVAL_STATE, 4
setvar VAR_0x4050, 3
releaseall
end

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

@@ -3,7 +3,7 @@ MagmaHideout_1F_MapScripts:: @ 8239880
.byte 0
MagmaHideout_1F_MapScript1_239886: @ 8239886
setvar VAR_0x40BD, 0
setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
end
MagmaHideout_1F_EventScript_23988C:: @ 823988C

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

@@ -62,9 +62,9 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
closemessage
clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
setvar VAR_0x4058, 1
setvar VAR_SLATEPORT_STATE, 1
setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT
setvar VAR_0x40A0, 1
setvar VAR_SLATEPORT_HARBOR_STATE, 1
fadescreen 1
removeobject 6
removeobject 2

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

@@ -8,7 +8,7 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B
clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
setflag FLAG_SYS_TV_START
clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
setvar VAR_0x4093, 0
setvar VAR_MAUVILLE_GYM_STATE, 0
call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9
end
@@ -421,7 +421,7 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A
lock
faceplayer
goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0
compare VAR_0x40BA, 2
compare VAR_NEW_MAUVILLE_STATE, 2
goto_if_eq MauvilleCity_EventScript_1DF784
goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A
msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT

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

@@ -4,7 +4,7 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E
MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20DEE7
switch VAR_0x4093
switch VAR_MAUVILLE_GYM_STATE
case 0, MauvilleCity_Gym_EventScript_20DDBA
case 1, MauvilleCity_Gym_EventScript_20DEAF
case 2, MauvilleCity_Gym_EventScript_20DEBD
@@ -79,7 +79,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
compare VAR_RESULT, 1
goto_if_eq MauvilleCity_Gym_EventScript_20DFDE
goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_20DF8D
compare VAR_0x40BA, 2
compare VAR_NEW_MAUVILLE_STATE, 2
goto_if_eq MauvilleCity_Gym_EventScript_20DFD4
msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT
release
@@ -94,8 +94,8 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
setflag FLAG_DEFEATED_MAUVILLE_GYM
setflag FLAG_BADGE03_GET
addvar VAR_0x4085, 1
compare VAR_0x4085, 6
addvar VAR_PETALBURG_GYM_STATE, 1
compare VAR_PETALBURG_GYM_STATE, 6
call_if_eq MauvilleCity_Gym_EventScript_271E84
setvar VAR_0x8008, 3
call MauvilleCity_Gym_EventScript_271F43
@@ -144,9 +144,9 @@ MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE
MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9
lockall
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
compare VAR_0x4093, 1
compare VAR_MAUVILLE_GYM_STATE, 1
goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
setvar VAR_0x4093, 1
setvar VAR_MAUVILLE_GYM_STATE, 1
setvar VAR_0x8004, 0
goto MauvilleCity_Gym_EventScript_20E08D
end
@@ -154,9 +154,9 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9
MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E
lockall
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
compare VAR_0x4093, 2
compare VAR_MAUVILLE_GYM_STATE, 2
goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
setvar VAR_0x4093, 2
setvar VAR_MAUVILLE_GYM_STATE, 2
setvar VAR_0x8004, 1
goto MauvilleCity_Gym_EventScript_20E08D
end
@@ -164,9 +164,9 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E
MauvilleCity_Gym_EventScript_20E043:: @ 820E043
lockall
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
compare VAR_0x4093, 3
compare VAR_MAUVILLE_GYM_STATE, 3
goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
setvar VAR_0x4093, 3
setvar VAR_MAUVILLE_GYM_STATE, 3
setvar VAR_0x8004, 2
goto MauvilleCity_Gym_EventScript_20E08D
end
@@ -174,9 +174,9 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043
MauvilleCity_Gym_EventScript_20E068:: @ 820E068
lockall
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
compare VAR_0x4093, 4
compare VAR_MAUVILLE_GYM_STATE, 4
goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
setvar VAR_0x4093, 4
setvar VAR_MAUVILLE_GYM_STATE, 4
setvar VAR_0x8004, 3
goto MauvilleCity_Gym_EventScript_20E08D
end

2
data/maps/MeteorFalls_1F_1R/map.json
View File

@@ -195,7 +195,7 @@
"x": 14,
"y": 18,
"elevation": 4,
"var": "VAR_0x40BF",
"var": "VAR_METEOR_FALLS_STATE",
"var_value": "0",
"script": "MeteorFalls_1F_1R_EventScript_22BD5F"
}

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

@@ -86,7 +86,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA
setflag FLAG_MET_ARCHIE_METEOR_FALLS
setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
setvar VAR_0x40BF, 1
setvar VAR_METEOR_FALLS_STATE, 1
releaseall
end

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

@@ -5,11 +5,11 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
.byte 0
MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37
map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE
map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE
.2byte 0
MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41
map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D
map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D
.2byte 0
MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B

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

@@ -315,7 +315,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
removeobject 4
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY
clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
setvar VAR_0x40C6, 1
setvar VAR_STEVENS_HOUSE_STATE, 1
setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
removeobject 3
setobjectxyperm 3, 5, 6

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

@@ -13,7 +13,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
return
MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8
compare VAR_0x40C6, 2
compare VAR_STEVENS_HOUSE_STATE, 2
call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4
end
@@ -23,7 +23,7 @@ MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4
return
MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0
map_script_2 VAR_0x40C6, 1, MossdeepCity_StevensHouse_EventScript_2227CA
map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_2227CA
.2byte 0
MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
@@ -48,7 +48,7 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
waitmovement 0
setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT
setvar VAR_0x40C6, 2
setvar VAR_STEVENS_HOUSE_STATE, 2
releaseall
end

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

@@ -4,7 +4,7 @@ MtChimney_MapScripts:: @ 822EDC1
.byte 0
MtChimney_MapScript1_22EDCC: @ 822EDCC
setvar VAR_0x40BD, 1
setvar VAR_JAGGED_PASS_ASH_WEATHER, 1
end
MtChimney_MapScript1_22EDD2: @ 822EDD2

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

@@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA
.byte 0
MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05
compare VAR_0x40A3, 1
compare VAR_CABLE_CAR_STATION_STATE, 1
call_if_eq MtChimney_CableCarStation_EventScript_22AC11
end
@@ -14,7 +14,7 @@ MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11
return
MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D
map_script_2 VAR_0x40A3, 1, MtChimney_CableCarStation_EventScript_22AC27
map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_22AC27
.2byte 0
MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
@@ -22,7 +22,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4
applymovement 1, MtChimney_CableCarStation_Movement_22ACAA
waitmovement 0
setvar VAR_0x40A3, 0
setvar VAR_CABLE_CAR_STATION_STATE, 0
setobjectxyperm 1, 6, 7
setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
releaseall
@@ -45,7 +45,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_0x40A3, 2
setvar VAR_CABLE_CAR_STATION_STATE, 2
incrementgamestat 48
special CableCarWarp
special CableCar

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

@@ -148,7 +148,7 @@
"x": 22,
"y": 7,
"elevation": 3,
"var": "VAR_0x40B9",
"var": "VAR_MT_PYRE_STATE",
"var_value": "0",
"script": "MtPyre_Summit_EventScript_232018"
},
@@ -157,7 +157,7 @@
"x": 23,
"y": 7,
"elevation": 3,
"var": "VAR_0x40B9",
"var": "VAR_MT_PYRE_STATE",
"var_value": "0",
"script": "MtPyre_Summit_EventScript_232024"
},
@@ -166,7 +166,7 @@
"x": 24,
"y": 7,
"elevation": 3,
"var": "VAR_0x40B9",
"var": "VAR_MT_PYRE_STATE",
"var_value": "0",
"script": "MtPyre_Summit_EventScript_232030"
},
@@ -175,7 +175,7 @@
"x": 22,
"y": 9,
"elevation": 3,
"var": "VAR_0x40B9",
"var": "VAR_MT_PYRE_STATE",
"var_value": "2",
"script": "MtPyre_Summit_EventScript_2321EC"
},
@@ -184,7 +184,7 @@
"x": 23,
"y": 9,
"elevation": 3,
"var": "VAR_0x40B9",
"var": "VAR_MT_PYRE_STATE",
"var_value": "2",
"script": "MtPyre_Summit_EventScript_2321F8"
},
@@ -193,7 +193,7 @@
"x": 24,
"y": 9,
"elevation": 3,
"var": "VAR_0x40B9",
"var": "VAR_MT_PYRE_STATE",
"var_value": "2",
"script": "MtPyre_Summit_EventScript_232204"
}

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

@@ -3,7 +3,7 @@ MtPyre_Summit_MapScripts:: @ 8231FF7
.byte 0
MtPyre_Summit_MapScript1_231FFD: @ 8231FFD
compare VAR_0x40B9, 2
compare VAR_MT_PYRE_STATE, 2
call_if_eq MtPyre_Summit_EventScript_232009
end
@@ -56,7 +56,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
fadedefaultbgm
fadescreen 0
delay 20
setvar VAR_0x40B9, 1
setvar VAR_MT_PYRE_STATE, 1
compare VAR_0x8008, 0
call_if_eq MtPyre_Summit_EventScript_2320F7
compare VAR_0x8008, 1
@@ -165,7 +165,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2
lock
faceplayer
goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2
compare VAR_0x40B9, 3
compare VAR_MT_PYRE_STATE, 3
call_if_ge MtPyre_Summit_EventScript_2321CB
goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8
msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT
@@ -242,7 +242,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
waitmovement 0
removeobject 2
removeobject 8
setvar VAR_0x40B9, 3
setvar VAR_MT_PYRE_STATE, 3
releaseall
end

2
data/maps/NewMauville_Entrance/map.json
View File

@@ -36,7 +36,7 @@
"x": 4,
"y": 2,
"elevation": 3,
"var": "VAR_0x40BA",
"var": "VAR_NEW_MAUVILLE_STATE",
"var_value": "0",
"script": "NewMauville_Entrance_EventScript_2372FF"
}

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

@@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 82372AD
.byte 0
NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
compare VAR_0x40BA, 0
compare VAR_NEW_MAUVILLE_STATE, 0
call_if_eq NewMauville_Entrance_EventScript_2372C4
end
@@ -41,7 +41,7 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
setmetatile 5, 1, 717, 1
special DrawWholeMapView
playse SE_BAN
setvar VAR_0x40BA, 1
setvar VAR_NEW_MAUVILLE_STATE, 1
releaseall
end

2
data/maps/NewMauville_Inside/map.json
View File

@@ -215,7 +215,7 @@
"x": 33,
"y": 6,
"elevation": 3,
"var": "VAR_0x40BA",
"var": "VAR_NEW_MAUVILLE_STATE",
"var_value": "1",
"script": "NewMauville_Inside_EventScript_237725"
}

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

@@ -40,7 +40,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449
return
NewMauville_Inside_MapScript1_23744D: @ 823744D
compare VAR_0x40BA, 2
compare VAR_NEW_MAUVILLE_STATE, 2
call_if_eq NewMauville_Inside_EventScript_23773A
end
@@ -148,7 +148,7 @@ NewMauville_Inside_EventScript_237725:: @ 8237725
lockall
msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT
call NewMauville_Inside_EventScript_23773A
setvar VAR_0x40BA, 2
setvar VAR_NEW_MAUVILLE_STATE, 2
releaseall
end
@@ -167,7 +167,7 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A
NewMauville_Inside_EventScript_23778F:: @ 823778F
lockall
compare VAR_0x40BA, 2
compare VAR_NEW_MAUVILLE_STATE, 2
goto_if_eq NewMauville_Inside_EventScript_2377A5
msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT
releaseall

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

@@ -119,7 +119,7 @@
"x": 0,
"y": 10,
"elevation": 3,
"var": "VAR_0x4051",
"var": "VAR_ROUTE102_ACCESSIBLE",
"var_value": "0",
"script": "OldaleTown_EventScript_1E903F"
},
@@ -128,7 +128,7 @@
"x": 8,
"y": 19,
"elevation": 3,
"var": "VAR_0x40C7",
"var": "VAR_OLDALE_STATE",
"var_value": "1",
"script": "OldaleTown_EventScript_1E9086"
},
@@ -137,7 +137,7 @@
"x": 9,
"y": 19,
"elevation": 3,
"var": "VAR_0x40C7",
"var": "VAR_OLDALE_STATE",
"var_value": "1",
"script": "OldaleTown_EventScript_1E90A6"
},
@@ -146,7 +146,7 @@
"x": 10,
"y": 19,
"elevation": 3,
"var": "VAR_0x40C7",
"var": "VAR_OLDALE_STATE",
"var_value": "1",
"script": "OldaleTown_EventScript_1E90C6"
}

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

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

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

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

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

@@ -5,13 +5,13 @@ PetalburgCity_MapScripts::
PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7
setflag FLAG_VISITED_PETALBURG_CITY
compare VAR_0x4057, 0
compare VAR_PETALBURG_STATE, 0
call_if_eq PetalburgCity_EventScript_1DC307
compare VAR_0x4057, 2
compare VAR_PETALBURG_STATE, 2
call_if_eq PetalburgCity_EventScript_1DC30F
compare VAR_0x4057, 4
compare VAR_PETALBURG_STATE, 4
call_if_eq PetalburgCity_EventScript_1DC30F
compare VAR_0x4085, 8
compare VAR_PETALBURG_GYM_STATE, 8
call_if_eq PetalburgCity_EventScript_1DC316
end
@@ -25,12 +25,12 @@ PetalburgCity_EventScript_1DC30F:: @ 81DC30F
return
PetalburgCity_EventScript_1DC316:: @ 81DC316
setvar VAR_0x4085, 7
setvar VAR_PETALBURG_GYM_STATE, 7
return
PetalburgCity_MapScript2_1DC31C: @ 81DC31C
map_script_2 VAR_0x4057, 2, PetalburgCity_EventScript_1DC32E
map_script_2 VAR_0x4057, 4, PetalburgCity_EventScript_1DC390
map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_1DC32E
map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_EventScript_1DC390
.2byte 0
PetalburgCity_EventScript_1DC32E:: @ 81DC32E
@@ -49,11 +49,11 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT
closemessage
clearflag FLAG_SPECIAL_FLAG_0x4000
setvar VAR_0x4057, 3
setvar VAR_PETALBURG_STATE, 3
fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001
special LoadPlayerParty
setvar VAR_0x4085, 1
setvar VAR_PETALBURG_GYM_STATE, 1
warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
waitstate
releaseall

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

@@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8204889
.byte 0
PetalburgCity_Gym_MapScript1_20489E: @ 820489E
compare VAR_0x4085, 6
compare VAR_PETALBURG_GYM_STATE, 6
goto_if_eq PetalburgCity_Gym_EventScript_2048B5
compare VAR_0x4085, 7
compare VAR_PETALBURG_GYM_STATE, 7
call_if_ge PetalburgCity_Gym_EventScript_2048FF
end
@@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF
return
PetalburgCity_Gym_MapScript1_20492D: @ 820492D
compare VAR_0x4085, 1
compare VAR_PETALBURG_GYM_STATE, 1
call_if_eq PetalburgCity_Gym_EventScript_20494D
compare VAR_0x4085, 6
compare VAR_PETALBURG_GYM_STATE, 6
call_if_lt PetalburgCity_Gym_EventScript_204955
call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20495D
end
@@ -64,17 +64,17 @@ PetalburgCity_Gym_EventScript_20495D:: @ 820495D
specialvar VAR_RESULT, IsTrainerReadyForRematch
compare VAR_RESULT, 1
goto_if_eq PetalburgCity_Gym_EventScript_204985
compare VAR_0x4085, 8
compare VAR_PETALBURG_GYM_STATE, 8
goto_if_eq PetalburgCity_Gym_EventScript_204985
setobjectxyperm 1, 4, 107
return
PetalburgCity_Gym_EventScript_204985:: @ 8204985
setvar VAR_0x4085, 8
setvar VAR_PETALBURG_GYM_STATE, 8
end
PetalburgCity_Gym_MapScript2_20498B: @ 820498B
map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_204995
map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_204995
.2byte 0
PetalburgCity_Gym_EventScript_204995:: @ 8204995
@@ -82,7 +82,7 @@ PetalburgCity_Gym_EventScript_204995:: @ 8204995
end
PetalburgCity_Gym_MapScript2_20499A: @ 820499A
map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_2049A4
map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_2049A4
.2byte 0
PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4
@@ -100,7 +100,7 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT
setvar VAR_0x4085, 2
setvar VAR_PETALBURG_GYM_STATE, 2
releaseall
end
@@ -114,7 +114,7 @@ PetalburgCity_Gym_Movement_2049EC: @ 82049EC
PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1
lock
faceplayer
switch VAR_0x4085
switch VAR_PETALBURG_GYM_STATE
case 2, PetalburgCity_Gym_EventScript_204D4A
case 3, PetalburgCity_Gym_EventScript_204D54
case 4, PetalburgCity_Gym_EventScript_204D5E
@@ -216,8 +216,8 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC
call_if_eq PetalburgCity_Gym_EventScript_204CB5
removeobject 10
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
setvar VAR_0x4085, 1
setvar VAR_0x4057, 2
setvar VAR_PETALBURG_GYM_STATE, 1
setvar VAR_PETALBURG_STATE, 2
clearflag FLAG_HIDE_PETALBURG_CITY_WALLY
clearflag FLAG_HIDE_PETALBURG_GYM_WALLY
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
@@ -416,7 +416,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
call Common_EventScript_PlayGymBadgeFanfare
msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT
setflag FLAG_DEFEATED_PETALBURG_GYM
setvar VAR_0x4085, 7
setvar VAR_PETALBURG_GYM_STATE, 7
setflag FLAG_BADGE05_GET
special sub_813B9A0
call PetalburgCity_Gym_EventScript_2721F8
@@ -496,7 +496,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13
compare VAR_0x8008, 3
call_if_eq PetalburgCity_Gym_EventScript_20506C
removeobject 11
setvar VAR_0x4057, 4
setvar VAR_PETALBURG_STATE, 4
clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
warp MAP_PETALBURG_CITY, 255, 15, 8
waitstate
@@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_20512D:: @ 820512D
PetalburgCity_Gym_EventScript_205137:: @ 8205137
lockall
compare VAR_0x4085, 6
compare VAR_PETALBURG_GYM_STATE, 6
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 7
setvar VAR_0x8009, 85
@@ -813,7 +813,7 @@ PetalburgCity_Gym_EventScript_20517D:: @ 820517D
PetalburgCity_Gym_EventScript_205187:: @ 8205187
lockall
compare VAR_0x4085, 6
compare VAR_PETALBURG_GYM_STATE, 6
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 1
setvar VAR_0x8009, 98

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

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

4
data/maps/PetalburgWoods/map.json
View File

@@ -234,7 +234,7 @@
"x": 26,
"y": 23,
"elevation": 3,
"var": "VAR_0x4098",
"var": "VAR_PETALBURG_WOODS_STATE",
"var_value": "0",
"script": "PetalburgWoods_EventScript_22DFD7"
},
@@ -243,7 +243,7 @@
"x": 27,
"y": 23,
"elevation": 3,
"var": "VAR_0x4098",
"var": "VAR_PETALBURG_WOODS_STATE",
"var_value": "0",
"script": "PetalburgWoods_EventScript_22E079"
}

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

@@ -109,7 +109,7 @@ PetalburgWoods_EventScript_22E18B:: @ 822E18B
PetalburgWoods_EventScript_22E1A7:: @ 822E1A7
removeobject 4
setvar VAR_0x4098, 1
setvar VAR_PETALBURG_WOODS_STATE, 1
releaseall
end

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

@@ -111,7 +111,7 @@
"x": 10,
"y": 19,
"elevation": 3,
"var": "VAR_0x4060",
"var": "VAR_ROUTE101_STATE",
"var_value": "1",
"script": "Route101_EventScript_1EBCDE"
},
@@ -120,7 +120,7 @@
"x": 11,
"y": 19,
"elevation": 3,
"var": "VAR_0x4060",
"var": "VAR_ROUTE101_STATE",
"var_value": "1",
"script": "Route101_EventScript_1EBCDE"
},
@@ -129,7 +129,7 @@
"x": 10,
"y": 18,
"elevation": 3,
"var": "VAR_0x4060",
"var": "VAR_ROUTE101_STATE",
"var_value": "2",
"script": "Route101_EventScript_1EBD4E"
},
@@ -138,7 +138,7 @@
"x": 11,
"y": 18,
"elevation": 3,
"var": "VAR_0x4060",
"var": "VAR_ROUTE101_STATE",
"var_value": "2",
"script": "Route101_EventScript_1EBD4E"
},
@@ -147,7 +147,7 @@
"x": 6,
"y": 16,
"elevation": 3,
"var": "VAR_0x4060",
"var": "VAR_ROUTE101_STATE",
"var_value": "2",
"script": "Route101_EventScript_1EBD64"
},
@@ -156,7 +156,7 @@
"x": 6,
"y": 15,
"elevation": 3,
"var": "VAR_0x4060",
"var": "VAR_ROUTE101_STATE",
"var_value": "2",
"script": "Route101_EventScript_1EBD64"
},
@@ -165,7 +165,7 @@
"x": 6,
"y": 17,
"elevation": 3,
"var": "VAR_0x4060",
"var": "VAR_ROUTE101_STATE",
"var_value": "2",
"script": "Route101_EventScript_1EBD64"
},
@@ -174,7 +174,7 @@
"x": 6,
"y": 18,
"elevation": 3,
"var": "VAR_0x4060",
"var": "VAR_ROUTE101_STATE",
"var_value": "2",
"script": "Route101_EventScript_1EBD64"
},
@@ -183,7 +183,7 @@
"x": 7,
"y": 13,
"elevation": 3,
"var": "VAR_0x4060",
"var": "VAR_ROUTE101_STATE",
"var_value": "2",
"script": "Route101_EventScript_1EBD7A"
}

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

@@ -8,12 +8,12 @@ Route101_MapScript1_1EBCC5: @ 81EBCC5
end
Route101_MapScript2_1EBCCB: @ 81EBCCB
map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5
map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_1EBCD5
.2byte 0
Route101_EventScript_1EBCD5:: @ 81EBCD5
setflag FLAG_SPECIAL_FLAG_0x4000
setvar VAR_0x4060, 1
setvar VAR_ROUTE101_STATE, 1
end
Route101_EventScript_1EBCDE:: @ 81EBCDE
@@ -37,7 +37,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE
waitmovement 0
msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT
closemessage
setvar VAR_0x4060, 2
setvar VAR_ROUTE101_STATE, 2
releaseall
end
@@ -234,8 +234,8 @@ Route101_EventScript_1EBE16:: @ 81EBE16
setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
setvar VAR_0x4084, 2
setvar VAR_0x4060, 3
setvar VAR_BIRCH_LAB_STATE, 2
setvar VAR_ROUTE101_STATE, 3
clearflag FLAG_SPECIAL_FLAG_0x4000
checkplayergender
compare VAR_RESULT, MALE

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

@@ -140,10 +140,10 @@ Route103_EventScript_1EC585:: @ 81EC585
Route103_EventScript_1EC5A2:: @ 81EC5A2
removeobject 2
setvar VAR_0x4084, 4
setvar VAR_BIRCH_LAB_STATE, 4
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
setflag FLAG_DEFEATED_RIVAL_ROUTE103
setvar VAR_0x40C7, 1
setvar VAR_OLDALE_STATE, 1
clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL
savebgm MUS_DUMMY
fadedefaultbgm

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

@@ -4,7 +4,7 @@ Route104_MapScripts:: @ 81ECC32
.byte 0
Route104_MapScript2_1ECC3D: @ 81ECC3D
map_script_2 VAR_0x408E, 1, Route104_EventScript_1ECC47
map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_1ECC47
.2byte 0
Route104_EventScript_1ECC47:: @ 81ECC47
@@ -29,7 +29,7 @@ Route104_EventScript_1ECC74:: @ 81ECC74
return
Route104_EventScript_1ECC78:: @ 81ECC78
compare VAR_0x408E, 1
compare VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1
goto_if_ge Route104_EventScript_1ECC9D
goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D
goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D
@@ -49,7 +49,7 @@ Route104_EventScript_1ECC9E:: @ 81ECC9E
Route104_EventScript_1ECCB3:: @ 81ECCB3
lockall
setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
setvar VAR_0x405A, 8
setvar VAR_RUSTBORO_STATE, 8
setvar VAR_0x4063, 2
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
@@ -413,11 +413,11 @@ Route104_EventScript_1ED139:: @ 81ED139
call Route104_EventScript_2720A8
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
hideobjectat 7, MAP_ROUTE104
copyvar VAR_0x4096, VAR_0x8008
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
resetobjectpriority 2, MAP_DEWFORD_TOWN
moveobjectoffscreen 2
setvar VAR_0x408E, 0
setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0
goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4
goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE
end

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

@@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34
setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
compare VAR_0x4090, 1
compare VAR_BRINEY_HOUSE_STATE, 1
call_if_eq Route104_MrBrineysHouse_EventScript_229D50
call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_229D4C
end
@@ -75,11 +75,11 @@ Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D
Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT
call Route104_MrBrineysHouse_EventScript_271E95
setvar VAR_0x408E, 1
setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setvar VAR_0x405A, 8
setvar VAR_RUSTBORO_STATE, 8
setvar VAR_0x4063, 2
setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
setflag FLAG_HIDE_ROUTE_104_RIVAL

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

@@ -55,7 +55,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5
hideobjectat 1, MAP_ROUTE109
msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT
closemessage
copyvar VAR_0x4096, VAR_0x8008
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
resetobjectpriority 2, MAP_DEWFORD_TOWN
moveobjectoffscreen 2

6
data/maps/Route110/map.json
View File

@@ -567,7 +567,7 @@
"x": 33,
"y": 56,
"elevation": 3,
"var": "VAR_0x4069",
"var": "VAR_ROUTE110_STATE",
"var_value": "0",
"script": "Route110_EventScript_1EF74D"
},
@@ -576,7 +576,7 @@
"x": 34,
"y": 56,
"elevation": 3,
"var": "VAR_0x4069",
"var": "VAR_ROUTE110_STATE",
"var_value": "0",
"script": "Route110_EventScript_1EF758"
},
@@ -585,7 +585,7 @@
"x": 35,
"y": 56,
"elevation": 3,
"var": "VAR_0x4069",
"var": "VAR_ROUTE110_STATE",
"var_value": "0",
"script": "Route110_EventScript_1EF763"
},

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

@@ -496,7 +496,7 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC
compare VAR_0x8008, 3
call_if_eq Route110_EventScript_1EF985
removeobject 29
setvar VAR_0x4069, 1
setvar VAR_ROUTE110_STATE, 1
savebgm MUS_DUMMY
fadedefaultbgm
releaseall

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

@@ -3,6 +3,6 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903
.byte 0
Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909
setvar VAR_0x40B5, 1
setvar VAR_TRICK_HOUSE_STATE, 1
end

20
data/maps/Route110_TrickHouseEnd/scripts.inc
View File

@@ -59,7 +59,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem_std ITEM_RARE_CANDY
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -72,7 +72,7 @@ Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem_std ITEM_TIMER_BALL
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -85,7 +85,7 @@ Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem_std ITEM_HARD_STONE
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -98,7 +98,7 @@ Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem_std ITEM_SMOKE_BALL
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -111,7 +111,7 @@ Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem_std ITEM_TM12
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -124,7 +124,7 @@ Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem_std ITEM_MAGNET
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -137,7 +137,7 @@ Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC
msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
giveitem_std ITEM_PP_MAX
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -165,7 +165,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
waitmovement 0
delay 30
msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
call Route110_TrickHouseEnd_EventScript_26AFA5
compare VAR_RESULT, 0
call_if_eq Route110_TrickHouseEnd_EventScript_26B002
@@ -202,13 +202,13 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF
call Common_EventScript_BagIsFull
msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT
setvar VAR_0x40C1, 1
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
return
Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002
call Common_EventScript_NoRoomLeftForAnother
msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT
setvar VAR_0x40C1, 1
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
return
Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015

8
data/maps/Route110_TrickHouseEntrance/map.json
View File

@@ -57,7 +57,7 @@
"x": 4,
"y": 7,
"elevation": 3,
"var": "VAR_0x40A5",
"var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
"var_value": "0",
"script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
},
@@ -66,7 +66,7 @@
"x": 5,
"y": 6,
"elevation": 3,
"var": "VAR_0x40A5",
"var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
"var_value": "0",
"script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
},
@@ -75,7 +75,7 @@
"x": 6,
"y": 6,
"elevation": 3,
"var": "VAR_0x40A5",
"var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
"var_value": "0",
"script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
},
@@ -84,7 +84,7 @@
"x": 7,
"y": 7,
"elevation": 3,
"var": "VAR_0x40A5",
"var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
"var_value": "0",
"script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
}

110
data/maps/Route110_TrickHouseEntrance/scripts.inc
View File

@@ -6,19 +6,19 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
setflag FLAG_LANDMARK_TRICK_HOUSE
compare VAR_0x40B5, 1
compare VAR_TRICK_HOUSE_STATE, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3
compare VAR_0x40C1, 1
compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7
compare VAR_0x40A6, 1
compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3
compare VAR_0x40A7, 5
compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
compare VAR_0x40A7, 3
compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
compare VAR_0x40A7, 0
compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
switch VAR_0x40A7
switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
case 0, Route110_TrickHouseEntrance_EventScript_269BBB
case 1, Route110_TrickHouseEntrance_EventScript_269BC1
case 3, Route110_TrickHouseEntrance_EventScript_269BC7
@@ -26,24 +26,24 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
end
Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7
setvar VAR_0x40A5, 1
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
compare VAR_0x4044, 8
goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED
setvar VAR_0x40A7, 2
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
end
Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED
setvar VAR_0x40A7, 6
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6
end
Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3
setvar VAR_0x40B5, 0
setvar VAR_0x40A7, 5
setvar VAR_0x40A5, 1
setvar VAR_TRICK_HOUSE_STATE, 0
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
end
Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03
setvar VAR_0x40A7, 0
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
compare VAR_0x4044, 1
call_if_eq Route110_TrickHouseEntrance_EventScript_269B61
compare VAR_0x4044, 2
@@ -91,11 +91,11 @@ Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D
return
Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7
setvar VAR_0x40A7, 4
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4
return
Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD
setvar VAR_0x40A7, 3
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
return
Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3
@@ -103,30 +103,30 @@ Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3
end
Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB
setvar VAR_0x40A5, 0
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 0
end
Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1
setvar VAR_0x40A5, 1
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
end
Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7
setvar VAR_0x40A5, 1
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
end
Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD
setvar VAR_0x40A5, 1
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
end
Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3
map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269C15
map_script_2 VAR_0x40A7, 0, Route110_TrickHouseEntrance_EventScript_269C26
map_script_2 VAR_0x40A7, 1, Route110_TrickHouseEntrance_EventScript_269CCC
map_script_2 VAR_0x40A7, 2, Route110_TrickHouseEntrance_EventScript_269CD0
map_script_2 VAR_0x40A7, 3, Route110_TrickHouseEntrance_EventScript_269CD0
map_script_2 VAR_0x40A7, 4, Route110_TrickHouseEntrance_EventScript_269CCC
map_script_2 VAR_0x40A7, 5, Route110_TrickHouseEntrance_EventScript_269CCC
map_script_2 VAR_0x40A7, 6, Route110_TrickHouseEntrance_EventScript_269CDF
map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269C15
map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_269C26
map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_269CCC
map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_269CD0
map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_269CD0
map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_269CCC
map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_269CCC
map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_269CDF
.2byte 0
Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
@@ -199,7 +199,7 @@ Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF
end
Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269CF8
map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269CF8
.2byte 0
Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
@@ -216,8 +216,8 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
waitmovement 0
removeobject 1
setvar VAR_0x40A7, 1
setvar VAR_0x40A6, 0
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0
releaseall
end
@@ -227,7 +227,7 @@ Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39
Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B
lockall
switch VAR_0x40A7
switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
case 0, Route110_TrickHouseEntrance_EventScript_269D6E
case 2, Route110_TrickHouseEntrance_EventScript_269E8F
case 3, Route110_TrickHouseEntrance_EventScript_269E51
@@ -257,7 +257,7 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
compare VAR_0x4044, 7
call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D
closemessage
setvar VAR_0x40A6, 1
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
waitstate
releaseall
@@ -430,8 +430,8 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
end
Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023
setvar VAR_0x40C1, 0
setvar VAR_0x40A7, 3
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
releaseall
@@ -475,14 +475,14 @@ Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A
applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
waitmovement 0
removeobject 1
setvar VAR_0x40C1, 0
setvar VAR_0x40A7, 5
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
releaseall
end
Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3
lockall
switch VAR_0x40A7
switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
case 0, Route110_TrickHouseEntrance_EventScript_26A106
case 1, Route110_TrickHouseEntrance_EventScript_26A110
case 4, Route110_TrickHouseEntrance_EventScript_26A201
@@ -604,88 +604,88 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A
end
Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
compare VAR_0x40AB, 0
compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_0x40AB, 2
setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
setmetatile 13, 1, 523, 0
special DrawWholeMapView
releaseall
end
Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
compare VAR_0x40AC, 0
compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_0x40AC, 2
setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
setmetatile 13, 1, 523, 0
special DrawWholeMapView
releaseall
end
Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
compare VAR_0x40AD, 0
compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_0x40AD, 2
setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
setmetatile 13, 1, 523, 0
special DrawWholeMapView
releaseall
end
Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
compare VAR_0x40AE, 0
compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_0x40AE, 2
setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
setmetatile 13, 1, 523, 0
special DrawWholeMapView
releaseall
end
Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
compare VAR_0x40AF, 0
compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_0x40AF, 2
setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
setmetatile 13, 1, 523, 0
special DrawWholeMapView
releaseall
end
Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
compare VAR_0x40B0, 0
compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_0x40B0, 2
setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
setmetatile 13, 1, 523, 0
special DrawWholeMapView
releaseall
end
Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
compare VAR_0x40B1, 0
compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_0x40B1, 2
setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
setmetatile 13, 1, 523, 0
special DrawWholeMapView
releaseall
end
Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
compare VAR_0x40B2, 0
compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_0x40B2, 2
setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
setmetatile 13, 1, 523, 0
special DrawWholeMapView
releaseall
@@ -733,7 +733,7 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
call_if_eq Route110_TrickHouseEntrance_EventScript_26A439
compare VAR_0x4044, 2
call_if_eq Route110_TrickHouseEntrance_EventScript_26A449
setvar VAR_0x40A5, 1
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
end
Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429

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

@@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F
.byte 0
Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915
compare VAR_0x40AB, 2
compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921
end
@@ -13,13 +13,13 @@ Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921
Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B
lockall
compare VAR_0x40AB, 0
compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D
goto Route110_TrickHousePuzzle1_EventScript_26A3DB
end
Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D
setvar VAR_0x40AB, 1
setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1
goto Route110_TrickHousePuzzle1_EventScript_26A3E5
end

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

@@ -23,13 +23,13 @@ Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB
Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0
lockall
compare VAR_0x40AC, 0
compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2
goto Route110_TrickHousePuzzle2_EventScript_26A3DB
end
Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2
setvar VAR_0x40AC, 1
setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1
goto Route110_TrickHousePuzzle2_EventScript_26A3E5
end

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

@@ -291,13 +291,13 @@ Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0
Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7
lockall
compare VAR_0x40AD, 0
compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9
goto Route110_TrickHousePuzzle3_EventScript_26A3DB
end
Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9
setvar VAR_0x40AD, 1
setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1
goto Route110_TrickHousePuzzle3_EventScript_26A3E5
end

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

@@ -3,13 +3,13 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860
Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861
lockall
compare VAR_0x40AE, 0
compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873
goto Route110_TrickHousePuzzle4_EventScript_26A3DB
end
Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873
setvar VAR_0x40AE, 1
setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1
goto Route110_TrickHousePuzzle4_EventScript_26A3E5
end

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

@@ -13,13 +13,13 @@ Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6
Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15
lockall
compare VAR_0x40AF, 0
compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27
goto Route110_TrickHousePuzzle5_EventScript_26A3DB
end
Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27
setvar VAR_0x40AF, 1
setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1
goto Route110_TrickHousePuzzle5_EventScript_26A3E5
end

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

@@ -17,13 +17,13 @@ Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0
Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4
lockall
compare VAR_0x40B0, 0
compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6
goto Route110_TrickHousePuzzle6_EventScript_26A3DB
end
Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6
setvar VAR_0x40B0, 1
setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1
goto Route110_TrickHousePuzzle6_EventScript_26A3E5
end

14
data/maps/Route110_TrickHousePuzzle7/scripts.inc
View File

@@ -68,7 +68,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
return
Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198
compare VAR_0x40B6, 1
compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3
clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
@@ -81,33 +81,33 @@ Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3
end
Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4
compare VAR_0x40B6, 1
compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC
end
Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0
map_script_2 VAR_0x40B6, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA
map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA
.2byte 0
Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA
setvar VAR_0x40B6, 0
setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0
end
Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0
lockall
compare VAR_0x40B1, 0
compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2
goto Route110_TrickHousePuzzle7_EventScript_26A3DB
end
Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2
setvar VAR_0x40B1, 1
setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1
goto Route110_TrickHousePuzzle7_EventScript_26A3E5
end
Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED
lockall
setvar VAR_0x40B6, 1
setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19
waitstate
releaseall

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

@@ -3,13 +3,13 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801
Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802
lockall
compare VAR_0x40B2, 0
compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814
goto Route110_TrickHousePuzzle8_EventScript_26A3DB
end
Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814
setvar VAR_0x40B2, 1
setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1
goto Route110_TrickHousePuzzle8_EventScript_26A3E5
end

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

@@ -4,7 +4,7 @@ Route112_MapScripts:: @ 81F1DA8
Route112_MapScript1_1F1DAE: @ 81F1DAE
clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
setvar VAR_0x40BD, 0
setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
end
Route112_EventScript_1F1DB7:: @ 81F1DB7

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

@@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE
Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9
setescapewarp MAP_ROUTE112, 255, 28, 28
compare VAR_0x40A3, 2
compare VAR_CABLE_CAR_STATION_STATE, 2
call_if_eq Route112_CableCarStation_EventScript_22AADD
end
@@ -15,7 +15,7 @@ Route112_CableCarStation_EventScript_22AADD:: @ 822AADD
return
Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9
map_script_2 VAR_0x40A3, 2, Route112_CableCarStation_EventScript_22AAF3
map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_22AAF3
.2byte 0
Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
@@ -23,7 +23,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80
applymovement 1, Route112_CableCarStation_Movement_22AB76
waitmovement 0
setvar VAR_0x40A3, 0
setvar VAR_CABLE_CAR_STATION_STATE, 0
setobjectxyperm 1, 6, 7
setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
releaseall
@@ -46,7 +46,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38
applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B
waitmovement 0
setvar VAR_0x8004, 0
setvar VAR_0x40A3, 1
setvar VAR_CABLE_CAR_STATION_STATE, 1
incrementgamestat 48
special CableCarWarp
special CableCar

32
data/maps/Route113_GlassWorkshop/scripts.inc
View File

@@ -4,26 +4,26 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03
Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09
setflag FLAG_LANDMARK_GLASS_WORKSHOP
compare VAR_0x40BE, 1
compare VAR_GLASS_WORKSHOP_STATE, 1
call_if_eq Route113_GlassWorkshop_EventScript_26ED18
end
Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18
setvar VAR_0x40BE, 2
setvar VAR_GLASS_WORKSHOP_STATE, 2
return
Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E
lock
faceplayer
compare VAR_0x40BE, 10
compare VAR_GLASS_WORKSHOP_STATE, 10
goto_if_ge Route113_GlassWorkshop_EventScript_26F090
compare VAR_0x40BE, 2
compare VAR_GLASS_WORKSHOP_STATE, 2
goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E
compare VAR_0x40BE, 1
compare VAR_GLASS_WORKSHOP_STATE, 1
goto_if_eq Route113_GlassWorkshop_EventScript_26ED64
msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT
giveitem_std ITEM_SOOT_SACK
setvar VAR_0x40BE, 1
setvar VAR_GLASS_WORKSHOP_STATE, 1
msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT
release
end
@@ -76,7 +76,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E
msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route113_GlassWorkshop_EventScript_26F003
setvar VAR_0x40BE, 10
setvar VAR_GLASS_WORKSHOP_STATE, 10
subvar VAR_ASH_GATHER_COUNT, 250
goto Route113_GlassWorkshop_EventScript_26F00F
end
@@ -90,7 +90,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A
msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route113_GlassWorkshop_EventScript_26F003
setvar VAR_0x40BE, 11
setvar VAR_GLASS_WORKSHOP_STATE, 11
subvar VAR_ASH_GATHER_COUNT, 500
goto Route113_GlassWorkshop_EventScript_26F00F
end
@@ -104,7 +104,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96
msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route113_GlassWorkshop_EventScript_26F003
setvar VAR_0x40BE, 12
setvar VAR_GLASS_WORKSHOP_STATE, 12
subvar VAR_ASH_GATHER_COUNT, 500
goto Route113_GlassWorkshop_EventScript_26F00F
end
@@ -118,7 +118,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2
msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route113_GlassWorkshop_EventScript_26F003
setvar VAR_0x40BE, 13
setvar VAR_GLASS_WORKSHOP_STATE, 13
subvar VAR_ASH_GATHER_COUNT, 1000
goto Route113_GlassWorkshop_EventScript_26F00F
end
@@ -132,7 +132,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E
msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route113_GlassWorkshop_EventScript_26F003
setvar VAR_0x40BE, 14
setvar VAR_GLASS_WORKSHOP_STATE, 14
subvar VAR_ASH_GATHER_COUNT, 1000
goto Route113_GlassWorkshop_EventScript_26F00F
end
@@ -147,7 +147,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A
msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route113_GlassWorkshop_EventScript_26F003
setvar VAR_0x40BE, 15
setvar VAR_GLASS_WORKSHOP_STATE, 15
subvar VAR_ASH_GATHER_COUNT, 6000
goto Route113_GlassWorkshop_EventScript_26F00F
end
@@ -162,7 +162,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B
msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route113_GlassWorkshop_EventScript_26F003
setvar VAR_0x40BE, 16
setvar VAR_GLASS_WORKSHOP_STATE, 16
subvar VAR_ASH_GATHER_COUNT, 8000
goto Route113_GlassWorkshop_EventScript_26F00F
end
@@ -206,7 +206,7 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F
call_if_eq Route113_GlassWorkshop_EventScript_26F047
compare VAR_0x8009, 1
call_if_eq Route113_GlassWorkshop_EventScript_26F05F
setvar VAR_0x40BE, 2
setvar VAR_GLASS_WORKSHOP_STATE, 2
release
end
@@ -235,7 +235,7 @@ Route113_GlassWorkshop_EventScript_26F081:: @ 826F081
end
Route113_GlassWorkshop_EventScript_26F090:: @ 826F090
switch VAR_0x40BE
switch VAR_GLASS_WORKSHOP_STATE
case 10, Route113_GlassWorkshop_EventScript_26F0E3
case 11, Route113_GlassWorkshop_EventScript_26F0F7
case 12, Route113_GlassWorkshop_EventScript_26F10B
@@ -300,7 +300,7 @@ Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F
call_if_eq Route113_GlassWorkshop_EventScript_26F047
compare VAR_0x8009, 1
call_if_eq Route113_GlassWorkshop_EventScript_26F05F
setvar VAR_0x40BE, 2
setvar VAR_GLASS_WORKSHOP_STATE, 2
release
end

2
data/maps/Route116/map.json
View File

@@ -433,7 +433,7 @@
"x": 47,
"y": 9,
"elevation": 3,
"var": "VAR_0x406F",
"var": "VAR_ROUTE116_STATE",
"var_value": "1",
"script": "Route116_EventScript_1F2D95"
}

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

@@ -145,7 +145,7 @@ Route116_EventScript_1F2D84:: @ 81F2D84
lock
faceplayer
msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
setvar VAR_0x406F, 2
setvar VAR_ROUTE116_STATE, 2
release
end
@@ -155,7 +155,7 @@ Route116_EventScript_1F2D95:: @ 81F2D95
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
setvar VAR_0x406F, 2
setvar VAR_ROUTE116_STATE, 2
releaseall
end

6
data/maps/Route118/map.json
View File

@@ -326,7 +326,7 @@
"x": 43,
"y": 11,
"elevation": 3,
"var": "VAR_0x4071",
"var": "VAR_ROUTE118_STATE",
"var_value": "0",
"script": "Route118_EventScript_1F3E8E"
},
@@ -335,7 +335,7 @@
"x": 44,
"y": 11,
"elevation": 3,
"var": "VAR_0x4071",
"var": "VAR_ROUTE118_STATE",
"var_value": "0",
"script": "Route118_EventScript_1F3EAE"
},
@@ -344,7 +344,7 @@
"x": 45,
"y": 11,
"elevation": 3,
"var": "VAR_0x4071",
"var": "VAR_ROUTE118_STATE",
"var_value": "0",
"script": "Route118_EventScript_1F3EC4"
}

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

@@ -107,7 +107,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4
call_if_eq Route118_EventScript_1F3F3A
compare VAR_0x8008, 2
call_if_eq Route118_EventScript_1F3F4C
setvar VAR_0x4071, 1
setvar VAR_ROUTE118_STATE, 1
removeobject 19
releaseall
end

4
data/maps/Route119/map.json
View File

@@ -607,7 +607,7 @@
"x": 25,
"y": 31,
"elevation": 0,
"var": "VAR_0x4072",
"var": "VAR_ROUTE119_STATE",
"var_value": "0",
"script": "Route119_EventScript_1F4472"
},
@@ -616,7 +616,7 @@
"x": 26,
"y": 31,
"elevation": 0,
"var": "VAR_0x4072",
"var": "VAR_ROUTE119_STATE",
"var_value": "0",
"script": "Route119_EventScript_1F447D"
},

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

@@ -156,7 +156,7 @@ Route119_EventScript_1F460F:: @ 81F460F
compare VAR_TEMP_1, 2
call_if_eq Route119_EventScript_1F46EE
removeobject 25
setvar VAR_0x4072, 1
setvar VAR_ROUTE119_STATE, 1
savebgm MUS_DUMMY
fadedefaultbgm
delay 60

8
data/maps/Route121/map.json
View File

@@ -423,7 +423,7 @@
"x": 25,
"y": 5,
"elevation": 3,
"var": "VAR_0x4074",
"var": "VAR_ROUTE121_STATE",
"var_value": "0",
"script": "Route121_EventScript_1F5E18"
},
@@ -432,7 +432,7 @@
"x": 25,
"y": 6,
"elevation": 3,
"var": "VAR_0x4074",
"var": "VAR_ROUTE121_STATE",
"var_value": "0",
"script": "Route121_EventScript_1F5E18"
},
@@ -441,7 +441,7 @@
"x": 25,
"y": 7,
"elevation": 3,
"var": "VAR_0x4074",
"var": "VAR_ROUTE121_STATE",
"var_value": "0",
"script": "Route121_EventScript_1F5E18"
},
@@ -450,7 +450,7 @@
"x": 25,
"y": 8,
"elevation": 3,
"var": "VAR_0x4074",
"var": "VAR_ROUTE121_STATE",
"var_value": "0",
"script": "Route121_EventScript_1F5E18"
}

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

@@ -28,7 +28,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18
removeobject 12
removeobject 13
removeobject 14
setvar VAR_0x4074, 1
setvar VAR_ROUTE121_STATE, 1
releaseall
end

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

@@ -3,14 +3,14 @@ Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB
.byte 0
Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1
map_script_2 VAR_0x40A4, 1, Route121_SafariZoneEntrance_EventScript_22BBCB
map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_22BBCB
.2byte 0
Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB
lockall
applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD
waitmovement 0
setvar VAR_0x40A4, 0
setvar VAR_SAFARI_ZONE_STATE, 0
releaseall
end
@@ -81,7 +81,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18
waitmovement 0
special EnterSafariMode
setvar VAR_0x40A4, 2
setvar VAR_SAFARI_ZONE_STATE, 2
clearflag FLAG_GOOD_LUCK_SAFARI_ZONE
warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33
waitstate

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

@@ -8,7 +8,7 @@ Route128_MapScript1_1F6B43: @ 81F6B43
end
Route128_MapScript2_1F6B4D: @ 81F6B4D
map_script_2 VAR_0x407B, 1, Route128_EventScript_1F6B57
map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_1F6B57
.2byte 0
Route128_EventScript_1F6B57:: @ 81F6B57
@@ -74,7 +74,7 @@ Route128_EventScript_1F6B57:: @ 81F6B57
removeobject 3
waitfieldeffect 30
clearflag FLAG_SPECIAL_FLAG_0x4000
setvar VAR_0x407B, 2
setvar VAR_ROUTE128_STATE, 2
releaseall
end

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

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

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

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

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

@@ -3,18 +3,18 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857
.byte 0
RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D
compare VAR_0x40C4, 1
compare VAR_FOSSIL_RESURRECTION_STATE, 1
call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
end
RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869
setvar VAR_0x40C4, 2
setvar VAR_FOSSIL_RESURRECTION_STATE, 2
return
RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F
lock
faceplayer
compare VAR_0x40C4, 1
compare VAR_FOSSIL_RESURRECTION_STATE, 1
call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT
release
@@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F
RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886
lock
faceplayer
compare VAR_0x40C4, 1
compare VAR_FOSSIL_RESURRECTION_STATE, 1
call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6
msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT
@@ -38,7 +38,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6
RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0
lock
faceplayer
compare VAR_0x40C4, 1
compare VAR_FOSSIL_RESURRECTION_STATE, 1
call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0
msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT
@@ -53,7 +53,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0
RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA
lock
faceplayer
compare VAR_0x40C4, 1
compare VAR_FOSSIL_RESURRECTION_STATE, 1
call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT
release
@@ -62,9 +62,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA
RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1
lock
faceplayer
compare VAR_0x40C4, 2
compare VAR_FOSSIL_RESURRECTION_STATE, 2
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03
compare VAR_0x40C4, 1
compare VAR_FOSSIL_RESURRECTION_STATE, 1
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9
msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT
checkitem ITEM_ROOT_FOSSIL, 1
@@ -96,8 +96,8 @@ RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974
bufferitemname 0, ITEM_ROOT_FOSSIL
msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
takeitem ITEM_ROOT_FOSSIL, 1
setvar VAR_0x40C4, 1
setvar VAR_0x40C5, 1
setvar VAR_FOSSIL_RESURRECTION_STATE, 1
setvar VAR_WHICH_FOSSIL_REVIVED, 1
release
end
@@ -121,8 +121,8 @@ RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2
bufferitemname 0, ITEM_CLAW_FOSSIL
msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
takeitem ITEM_CLAW_FOSSIL, 1
setvar VAR_0x40C4, 1
setvar VAR_0x40C5, 2
setvar VAR_FOSSIL_RESURRECTION_STATE, 1
setvar VAR_WHICH_FOSSIL_REVIVED, 2
release
end
@@ -137,9 +137,9 @@ RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9
end
RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03
compare VAR_0x40C5, 1
compare VAR_WHICH_FOSSIL_REVIVED, 1
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A
compare VAR_0x40C5, 2
compare VAR_WHICH_FOSSIL_REVIVED, 2
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C
end
@@ -199,7 +199,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4
return
RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7
setvar VAR_0x40C4, 0
setvar VAR_FOSSIL_RESURRECTION_STATE, 0
setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
release
end
@@ -248,7 +248,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67
return
RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A
setvar VAR_0x40C4, 0
setvar VAR_FOSSIL_RESURRECTION_STATE, 0
setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
release
end
@@ -279,9 +279,9 @@ RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD
RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF
lock
faceplayer
compare VAR_0x40C4, 1
compare VAR_FOSSIL_RESURRECTION_STATE, 1
call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
compare VAR_0x405A, 6
compare VAR_RUSTBORO_STATE, 6
goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1
msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT
release

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

@@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D
.byte 0
RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D
compare VAR_0x408F, 0
compare VAR_DEVON_CORP_3F_STATE, 0
call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449
end
@@ -15,7 +15,7 @@ RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449
return
RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455
map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21245F
map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21245F
.2byte 0
RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
@@ -23,7 +23,7 @@ RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
end
RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464
map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21246E
map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21246E
.2byte 0
RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
@@ -65,10 +65,10 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setvar VAR_0x4096, 1
setvar VAR_BRINEY_LOCATION, 1
clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL
setvar VAR_0x408F, 1
setvar VAR_0x405A, 6
setvar VAR_DEVON_CORP_3F_STATE, 1
setvar VAR_RUSTBORO_STATE, 6
releaseall
end

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

@@ -18,11 +18,11 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66
msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT
setflag FLAG_DEFEATED_RUSTBORO_GYM
setflag FLAG_BADGE01_GET
setvar VAR_0x405A, 1
addvar VAR_0x4085, 1
setvar VAR_RUSTBORO_STATE, 1
addvar VAR_PETALBURG_GYM_STATE, 1
setvar VAR_0x8008, 1
call RustboroCity_Gym_EventScript_271F43
compare VAR_0x4085, 6
compare VAR_PETALBURG_GYM_STATE, 6
call_if_eq RustboroCity_Gym_EventScript_271E84
goto RustboroCity_Gym_EventScript_212FA4
end

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

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

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

@@ -4,7 +4,7 @@ SafariZone_South_MapScripts:: @ 823D279
.byte 0
SafariZone_South_MapScript2_23D284: @ 823D284
map_script_2 VAR_0x40A4, 2, SafariZone_South_EventScript_23D28E
map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_23D28E
.2byte 0
SafariZone_South_EventScript_23D28E:: @ 823D28E
@@ -14,12 +14,12 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E
applymovement 1, SafariZone_South_Movement_23D2C7
waitmovement 0
setobjectxyperm 1, 32, 34
setvar VAR_0x40A4, 0
setvar VAR_SAFARI_ZONE_STATE, 0
releaseall
end
SafariZone_South_MapScript1_23D2B1: @ 823D2B1
compare VAR_0x40A4, 2
compare VAR_SAFARI_ZONE_STATE, 2
call_if_eq SafariZone_South_EventScript_23D2BD
end
@@ -90,7 +90,7 @@ SafariZone_South_EventScript_23D359:: @ 823D359
end
SafariZone_South_EventScript_23D373:: @ 823D373
setvar VAR_0x40A4, 1
setvar VAR_SAFARI_ZONE_STATE, 1
special ExitSafariMode
warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
waitstate

2
data/maps/SeafloorCavern_Room9/map.json
View File

@@ -121,7 +121,7 @@
"x": 17,
"y": 42,
"elevation": 3,
"var": "VAR_0x40A2",
"var": "VAR_SEAFLOOR_CAVERN_STATE",
"var_value": "0",
"script": "SeafloorCavern_Room9_EventScript_234DC9"
}

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

@@ -118,7 +118,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A
waitmovement 0
msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT
setvar VAR_0x407B, 1
setvar VAR_ROUTE128_STATE, 1
setvar VAR_0x405E, 1
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
@@ -133,8 +133,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
setflag FLAG_SYS_WEATHER_CTRL
setflag FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN
setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
setvar VAR_0x40C6, 2
setvar VAR_0x40A2, 1
setvar VAR_STEVENS_HOUSE_STATE, 2
setvar VAR_SEAFLOOR_CAVERN_STATE, 1
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS

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

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

8
data/maps/SlateportCity_Harbor/map.json
View File

@@ -155,7 +155,7 @@
"x": 8,
"y": 11,
"elevation": 3,
"var": "VAR_0x40A0",
"var": "VAR_SLATEPORT_HARBOR_STATE",
"var_value": "1",
"script": "SlateportCity_Harbor_EventScript_20C9BB"
},
@@ -164,7 +164,7 @@
"x": 8,
"y": 12,
"elevation": 3,
"var": "VAR_0x40A0",
"var": "VAR_SLATEPORT_HARBOR_STATE",
"var_value": "1",
"script": "SlateportCity_Harbor_EventScript_20C9C7"
},
@@ -173,7 +173,7 @@
"x": 8,
"y": 13,
"elevation": 3,
"var": "VAR_0x40A0",
"var": "VAR_SLATEPORT_HARBOR_STATE",
"var_value": "1",
"script": "SlateportCity_Harbor_EventScript_20C9D3"
},
@@ -182,7 +182,7 @@
"x": 8,
"y": 14,
"elevation": 3,
"var": "VAR_0x40A0",
"var": "VAR_SLATEPORT_HARBOR_STATE",
"var_value": "1",
"script": "SlateportCity_Harbor_EventScript_20C9DF"
}

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

@@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D
SlateportCity_Harbor_MapScript1_20C983: @ 820C983
setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
setvar VAR_TEMP_1, 0
compare VAR_0x40A0, 1
compare VAR_SLATEPORT_HARBOR_STATE, 1
call_if_eq SlateportCity_Harbor_EventScript_20C9A9
call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5
end
@@ -62,7 +62,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
removeobject 6
removeobject 7
removeobject 8
setvar VAR_0x40A0, 2
setvar VAR_SLATEPORT_HARBOR_STATE, 2
setflag FLAG_MET_TEAM_AQUA_HARBOR
setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT
compare VAR_0x8008, 0
@@ -296,7 +296,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2
goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00
goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_20CCF6
goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_20CCE9
compare VAR_0x40A0, 2
compare VAR_SLATEPORT_HARBOR_STATE, 2
goto_if_eq SlateportCity_Harbor_EventScript_20CCDF
msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT
closemessage

4
data/maps/SlateportCity_OceanicMuseum_1F/map.json
View File

@@ -226,7 +226,7 @@
"x": 9,
"y": 7,
"elevation": 3,
"var": "VAR_0x40AA",
"var": "VAR_SLATEPORT_MUSEUM_1F_STATE",
"var_value": "0",
"script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F"
},
@@ -235,7 +235,7 @@
"x": 10,
"y": 7,
"elevation": 3,
"var": "VAR_0x40AA",
"var": "VAR_SLATEPORT_MUSEUM_1F_STATE",
"var_value": "0",
"script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0"
}

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

@@ -42,7 +42,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8
updatemoneybox 0, 0
nop
msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT
setvar VAR_0x40AA, 1
setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
hidemoneybox
nop
nop
@@ -63,7 +63,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18
SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39
msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT
setvar VAR_0x40AA, 1
setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
hidemoneybox
nop
nop

Some files were not shown because too many files have changed in this diff Show More