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

improve call_if macros

Browse Source
This commit is contained in:
Melody
2018-12-21 21:32:45 -05:00
parent ac2e4adf2d
commit 55005f1588
175 changed files with 1245 additions and 1400 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+42 -8
View File
@@ -1557,40 +1557,74 @@
@ Supplementary @ Supplementary
.macro goto_if_unset flag, dest .macro goto_if_unset flag:req, dest:req
checkflag \flag checkflag \flag
goto_if 0, \dest goto_if 0, \dest
.endm .endm
.macro goto_if_set flag, dest .macro goto_if_set flag:req, dest:req
checkflag \flag checkflag \flag
goto_if 1, \dest goto_if 1, \dest
.endm .endm
.macro goto_if_lt dest @ LESS THAN .macro goto_if_lt dest:req @ LESS THAN
goto_if 0, \dest goto_if 0, \dest
.endm .endm
.macro goto_if_eq dest @ EQUAL .macro goto_if_eq dest:req @ EQUAL
goto_if 1, \dest goto_if 1, \dest
.endm .endm
.macro goto_if_gt dest @ GREATER THAN .macro goto_if_gt dest:req @ GREATER THAN
goto_if 2, \dest goto_if 2, \dest
.endm .endm
.macro goto_if_le dest @ LESS THAN OR EQUAL .macro goto_if_le dest:req @ LESS THAN OR EQUAL
goto_if 3, \dest goto_if 3, \dest
.endm .endm
.macro goto_if_ge dest @ GREATER THAN OR EQUAL .macro goto_if_ge dest:req @ GREATER THAN OR EQUAL
goto_if 4, \dest goto_if 4, \dest
.endm .endm
.macro goto_if_ne dest @ NOT EQUAL .macro goto_if_ne dest:req @ NOT EQUAL
goto_if 5, \dest goto_if 5, \dest
.endm .endm
.macro call_if_unset flag:req, dest:req
checkflag \flag
call_if 0, \dest
.endm
.macro call_if_set flag:req, dest:req
checkflag \flag
call_if 1, \dest
.endm
.macro call_if_lt dest:req @ LESS THAN
call_if 0, \dest
.endm
.macro call_if_eq dest:req @ EQUAL
call_if 1, \dest
.endm
.macro call_if_gt dest:req @ GREATER THAN
call_if 2, \dest
.endm
.macro call_if_le dest:req @ LESS THAN OR EQUAL
call_if 3, \dest
.endm
.macro call_if_ge dest:req @ GREATER THAN OR EQUAL
call_if 4, \dest
.endm
.macro call_if_ne dest:req @ NOT EQUAL
call_if 5, \dest
.endm
.macro switch var:req .macro switch var:req
copyvar 0x8000, \var copyvar 0x8000, \var
.endm .endm
data/event_scripts.s
+44 -51
View File
@@ -1108,7 +1108,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
setflag FLAG_0x87F setflag FLAG_0x87F
call EverGrandeCity_HallOfFame_EventScript_271829 call EverGrandeCity_HallOfFame_EventScript_271829
compare VAR_0x40CC, 0 compare VAR_0x40CC, 0
call_if 1, EverGrandeCity_HallOfFame_EventScript_271839 call_if_eq EverGrandeCity_HallOfFame_EventScript_271839
clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
call EverGrandeCity_HallOfFame_EventScript_2718CC call EverGrandeCity_HallOfFame_EventScript_2718CC
setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
@@ -1123,14 +1123,12 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL
special sub_813BA60 special sub_813BA60
checkflag FLAG_0x123 call_if_unset FLAG_0x123, EverGrandeCity_HallOfFame_EventScript_271843
call_if 0, EverGrandeCity_HallOfFame_EventScript_271843 call_if_unset FLAG_0x12A, EverGrandeCity_HallOfFame_EventScript_27183F
checkflag FLAG_0x12A
call_if 0, EverGrandeCity_HallOfFame_EventScript_27183F
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
compare VAR_0x40D3, 0 compare VAR_0x40D3, 0
call_if 1, EverGrandeCity_HallOfFame_EventScript_271851 call_if_eq EverGrandeCity_HallOfFame_EventScript_271851
return return
EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829 EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829
@@ -1279,9 +1277,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271954:: @ 8271954
OldaleTown_PokemonCenter_1F_EventScript_27195A:: @ 827195A OldaleTown_PokemonCenter_1F_EventScript_27195A:: @ 827195A
incrementgamestat 15 incrementgamestat 15
compare VAR_0x8004, 0 compare VAR_0x8004, 0
call_if 1, OldaleTown_PokemonCenter_1F_EventScript_271987 call_if_eq OldaleTown_PokemonCenter_1F_EventScript_271987
compare VAR_0x8004, 1 compare VAR_0x8004, 1
call_if 1, OldaleTown_PokemonCenter_1F_EventScript_27198D call_if_eq OldaleTown_PokemonCenter_1F_EventScript_27198D
waitmessage waitmessage
call OldaleTown_PokemonCenter_1F_EventScript_271993 call OldaleTown_PokemonCenter_1F_EventScript_271993
goto_if_unset FLAG_0x111, OldaleTown_PokemonCenter_1F_EventScript_271A43 goto_if_unset FLAG_0x111, OldaleTown_PokemonCenter_1F_EventScript_271A43
@@ -1403,9 +1401,9 @@ EventScript_271AE3:: @ 8271AE3
checkitemtype VAR_0x8000 checkitemtype VAR_0x8000
call EventScript_271B08 call EventScript_271B08
compare VAR_0x8007, 1 compare VAR_0x8007, 1
call_if 1, EventScript_271B95 call_if_eq EventScript_271B95
compare VAR_0x8007, 0 compare VAR_0x8007, 0
call_if 1, EventScript_271BA9 call_if_eq EventScript_271BA9
return return
EventScript_271B08:: @ 8271B08 EventScript_271B08:: @ 8271B08
@@ -1420,31 +1418,31 @@ EventScript_271B08:: @ 8271B08
EventScript_271B45:: @ 8271B45 EventScript_271B45:: @ 8271B45
bufferstdstring 2, 14 bufferstdstring 2, 14
compare VAR_0x8007, 1 compare VAR_0x8007, 1
call_if 1, EventScript_271BAF call_if_eq EventScript_271BAF
return return
EventScript_271B55:: @ 8271B55 EventScript_271B55:: @ 8271B55
bufferstdstring 2, 15 bufferstdstring 2, 15
compare VAR_0x8007, 1 compare VAR_0x8007, 1
call_if 1, EventScript_271BAF call_if_eq EventScript_271BAF
return return
EventScript_271B65:: @ 8271B65 EventScript_271B65:: @ 8271B65
bufferstdstring 2, 16 bufferstdstring 2, 16
compare VAR_0x8007, 1 compare VAR_0x8007, 1
call_if 1, EventScript_271BAF call_if_eq EventScript_271BAF
return return
EventScript_271B75:: @ 8271B75 EventScript_271B75:: @ 8271B75
bufferstdstring 2, 17 bufferstdstring 2, 17
compare VAR_0x8007, 1 compare VAR_0x8007, 1
call_if 1, EventScript_271BB3 call_if_eq EventScript_271BB3
return return
EventScript_271B85:: @ 8271B85 EventScript_271B85:: @ 8271B85
bufferstdstring 2, 18 bufferstdstring 2, 18
compare VAR_0x8007, 1 compare VAR_0x8007, 1
call_if 1, EventScript_271BAF call_if_eq EventScript_271BAF
return return
EventScript_271B95:: @ 8271B95 EventScript_271B95:: @ 8271B95
@@ -1475,9 +1473,9 @@ Std_ObtainDecoration:: @ 8271BB7
EventScript_271BC5:: @ 8271BC5 EventScript_271BC5:: @ 8271BC5
bufferdecorationname 1, VAR_0x8000 bufferdecorationname 1, VAR_0x8000
compare VAR_0x8007, 1 compare VAR_0x8007, 1
call_if 1, EventScript_271BE0 call_if_eq EventScript_271BE0
compare VAR_0x8007, 0 compare VAR_0x8007, 0
call_if 1, EventScript_271BF7 call_if_eq EventScript_271BF7
return return
EventScript_271BE0:: @ 8271BE0 EventScript_271BE0:: @ 8271BE0
@@ -1504,9 +1502,9 @@ Std_FindItem:: @ 8271BFD
checkitemtype VAR_0x8000 checkitemtype VAR_0x8000
call EventScript_271B08 call EventScript_271B08
compare VAR_0x8007, 1 compare VAR_0x8007, 1
call_if 1, EventScript_271C3A call_if_eq EventScript_271C3A
compare VAR_0x8007, 0 compare VAR_0x8007, 0
call_if 1, EventScript_271CA1 call_if_eq EventScript_271CA1
release release
return return
@@ -1516,9 +1514,9 @@ EventScript_271C3A:: @ 8271C3A
specialvar VAR_RESULT, sub_81398C0 specialvar VAR_RESULT, sub_81398C0
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, EventScript_271C8F call_if_eq EventScript_271C8F
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, EventScript_271C9B call_if_eq EventScript_271C9B
waitfanfare waitfanfare
waitmessage waitmessage
bufferitemnameplural 1, VAR_0x8004, 32773 bufferitemnameplural 1, VAR_0x8004, 32773
@@ -1660,10 +1658,8 @@ EventScript_271DF9:: @ 8271DF9
EventScript_271E0E:: @ 8271E0E EventScript_271E0E:: @ 8271E0E
playse SE_PC_LOGIN playse SE_PC_LOGIN
checkflag FLAG_SYS_PC_LANETTE call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35
call_if 0, EventScript_271E35 call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E
checkflag FLAG_SYS_PC_LANETTE
call_if 1, EventScript_271E3E
msgbox gUnknown_082726A3, MSGBOX_DEFAULT msgbox gUnknown_082726A3, MSGBOX_DEFAULT
special ShowPokemonStorageSystem special ShowPokemonStorageSystem
waitstate waitstate
@@ -2093,21 +2089,21 @@ Route103_EventScript_2720AD:: @ 82720AD
goto_if_eq Route101_EventScript_27374E goto_if_eq Route101_EventScript_27374E
goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A
compare VAR_BIRCH_STATE, 0 compare VAR_BIRCH_STATE, 0
call_if 1, Route101_EventScript_27211A call_if_eq Route101_EventScript_27211A
compare VAR_BIRCH_STATE, 1 compare VAR_BIRCH_STATE, 1
call_if 1, Route101_EventScript_27211A call_if_eq Route101_EventScript_27211A
compare VAR_BIRCH_STATE, 2 compare VAR_BIRCH_STATE, 2
call_if 1, Route101_EventScript_272127 call_if_eq Route101_EventScript_272127
compare VAR_BIRCH_STATE, 3 compare VAR_BIRCH_STATE, 3
call_if 1, Route101_EventScript_272127 call_if_eq Route101_EventScript_272127
compare VAR_BIRCH_STATE, 4 compare VAR_BIRCH_STATE, 4
call_if 1, Route101_EventScript_272134 call_if_eq Route101_EventScript_272134
compare VAR_BIRCH_STATE, 5 compare VAR_BIRCH_STATE, 5
call_if 1, Route101_EventScript_272134 call_if_eq Route101_EventScript_272134
compare VAR_BIRCH_STATE, 6 compare VAR_BIRCH_STATE, 6
call_if 1, Route101_EventScript_27211A call_if_eq Route101_EventScript_27211A
compare VAR_BIRCH_STATE, 7 compare VAR_BIRCH_STATE, 7
call_if 1, Route101_EventScript_27211A call_if_eq Route101_EventScript_27211A
return return
Route101_EventScript_27211A:: @ 827211A Route101_EventScript_27211A:: @ 827211A
@@ -2241,9 +2237,9 @@ FarawayIsland_Entrance_EventScript_272250:: @ 8272250
NavelRock_Harbor_EventScript_272250:: @ 8272250 NavelRock_Harbor_EventScript_272250:: @ 8272250
SouthernIsland_Exterior_EventScript_272250:: @ 8272250 SouthernIsland_Exterior_EventScript_272250:: @ 8272250
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 1, BattleFrontier_OutsideWest_EventScript_242A21 call_if_eq BattleFrontier_OutsideWest_EventScript_242A21
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if 1, BattleFrontier_OutsideWest_EventScript_242A2C call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C
delay 30 delay 30
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat 255, MAP_PETALBURG_CITY
call BattleFrontier_OutsideWest_EventScript_2721E2 call BattleFrontier_OutsideWest_EventScript_2721E2
@@ -3199,8 +3195,7 @@ EventScript_2736D9:: @ 82736D9
special sub_80B05B4 special sub_80B05B4
waitstate waitstate
fadescreen 1 fadescreen 1
checkflag FLAG_0x06C call_if_set FLAG_0x06C, EventScript_2736F4
call_if 1, EventScript_2736F4
special sp0C8_whiteout_maybe special sp0C8_whiteout_maybe
waitstate waitstate
end end
@@ -3384,10 +3379,8 @@ Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0
RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0 RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0
bufferboxname 0, 16438 bufferboxname 0, 16438
bufferspeciesname 1, VAR_TEMP_1 bufferspeciesname 1, VAR_TEMP_1
checkflag FLAG_SYS_PC_LANETTE call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB
call_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6
checkflag FLAG_SYS_PC_LANETTE
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6
return return
LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB
@@ -4518,9 +4511,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
multichoice 20, 8, 45, 1 multichoice 20, 8, 45, 1
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC38 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC41 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41
msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
@@ -9105,9 +9098,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
setvar VAR_0x8004, 25 setvar VAR_0x8004, 25
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattlePikeFunction special CallBattlePikeFunction
@@ -9127,9 +9120,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C
waitstate waitstate
end end
@@ -9169,9 +9162,9 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
setvar VAR_0x8004, 25 setvar VAR_0x8004, 25
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 5, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattlePikeFunction special CallBattlePikeFunction
@@ -9191,9 +9184,9 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C
waitstate waitstate
end end
data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+2 -4
View File
@@ -8,10 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F
end end
AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98
checkflag FLAG_0x0EF call_if_unset FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DAB
call_if 0, AbandonedShip_Corridors_B1F_EventScript_237DAB call_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DB5
checkflag FLAG_0x0EF
call_if 1, AbandonedShip_Corridors_B1F_EventScript_237DB5
end end
AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB
data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+8 -16
View File
@@ -8,22 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977
end end
AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980
checkflag FLAG_0x0F0 call_if_unset FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1
call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 call_if_unset FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB
checkflag FLAG_0x0F1 call_if_unset FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238A05
call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB call_if_unset FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F
checkflag FLAG_0x0F2 call_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 call_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
checkflag FLAG_0x0F3 call_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F call_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
checkflag FLAG_0x0F0
call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
checkflag FLAG_0x0F1
call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
checkflag FLAG_0x0F2
call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
checkflag FLAG_0x0F3
call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
end end
AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9 AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+7 -7
View File
@@ -11,11 +11,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59
getplayerxy VAR_TEMP_2, VAR_TEMP_3 getplayerxy VAR_TEMP_2, VAR_TEMP_3
setvar VAR_TEMP_4, 1 setvar VAR_TEMP_4, 1
compare VAR_TEMP_2, 21 compare VAR_TEMP_2, 21
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD1 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD1
compare VAR_TEMP_2, 36 compare VAR_TEMP_2, 36
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD7 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD7
compare VAR_TEMP_3, 2 compare VAR_TEMP_3, 2
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CDD call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CDD
switch VAR_TEMP_4 switch VAR_TEMP_4
case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3
case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C
@@ -45,7 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
dofieldeffect 54 dofieldeffect 54
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3
waitfieldeffect 54 waitfieldeffect 54
delay 10 delay 10
end end
@@ -59,7 +59,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32
delay 20 delay 20
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DB3 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3
waitfieldeffect 54 waitfieldeffect 54
delay 10 delay 10
end end
@@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
dofieldeffect 54 dofieldeffect 54
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3
waitfieldeffect 54 waitfieldeffect 54
delay 10 delay 10
end end
@@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
dofieldeffect 54 dofieldeffect 54
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3
waitfieldeffect 54 waitfieldeffect 54
delay 10 delay 10
end end
data/maps/AncientTomb/scripts.inc
+3 -6
View File
@@ -5,8 +5,7 @@ AncientTomb_MapScripts:: @ 8238FB3
.byte 0 .byte 0
AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_MapScript1_238FC3: @ 8238FC3
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_238FCD
call_if 1, AncientTomb_EventScript_238FCD
end end
AncientTomb_EventScript_238FCD:: @ 8238FCD AncientTomb_EventScript_238FCD:: @ 8238FCD
@@ -18,8 +17,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD
AncientTomb_MapScript1_238FE1: @ 8238FE1 AncientTomb_MapScript1_238FE1: @ 8238FE1
setflag FLAG_LANDMARK_ANCIENT_TOMB setflag FLAG_LANDMARK_ANCIENT_TOMB
checkflag FLAG_0x1BD call_if_unset FLAG_0x1BD, AncientTomb_EventScript_238FEE
call_if 0, AncientTomb_EventScript_238FEE
end end
AncientTomb_EventScript_238FEE:: @ 8238FEE AncientTomb_EventScript_238FEE:: @ 8238FEE
@@ -27,8 +25,7 @@ AncientTomb_EventScript_238FEE:: @ 8238FEE
return return
AncientTomb_MapScript1_238FF2: @ 8238FF2 AncientTomb_MapScript1_238FF2: @ 8238FF2
checkflag FLAG_SYS_BRAILLE_FLY call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_238FFC
call_if 0, AncientTomb_EventScript_238FFC
end end
AncientTomb_EventScript_238FFC:: @ 8238FFC AncientTomb_EventScript_238FFC:: @ 8238FFC
data/maps/AquaHideout_B1F/scripts.inc
+3 -6
View File
@@ -4,8 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 82339A7
.byte 0 .byte 0
AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_2339BC
call_if 1, AquaHideout_B1F_EventScript_2339BC
end end
AquaHideout_B1F_EventScript_2339BC:: @ 82339BC AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
@@ -16,10 +15,8 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
return return
AquaHideout_B1F_MapScript1_2339D0: @ 82339D0 AquaHideout_B1F_MapScript1_2339D0: @ 82339D0
checkflag FLAG_0x1C4 call_if_unset FLAG_0x1C4, AquaHideout_B1F_EventScript_2339E3
call_if 0, AquaHideout_B1F_EventScript_2339E3 call_if_unset FLAG_0x1C5, AquaHideout_B1F_EventScript_2339E7
checkflag FLAG_0x1C5
call_if 0, AquaHideout_B1F_EventScript_2339E7
end end
AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 AquaHideout_B1F_EventScript_2339E3:: @ 82339E3
data/maps/AquaHideout_B2F/scripts.inc
+1 -2
View File
@@ -3,8 +3,7 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF
.byte 0 .byte 0
AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
checkflag FLAG_0x070 call_if_set FLAG_0x070, AquaHideout_B2F_EventScript_233DDF
call_if 1, AquaHideout_B2F_EventScript_233DDF
end end
AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+6 -6
View File
@@ -155,17 +155,17 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special CallFrontierUtilFunc special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870 call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257870
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877 call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257877
compare VAR_RESULT, 3 compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25787E
compare VAR_RESULT, 4 compare VAR_RESULT, 4
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885 call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257885
compare VAR_RESULT, 5 compare VAR_RESULT, 5
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25788C
compare VAR_RESULT, 6 compare VAR_RESULT, 6
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893 call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257893
call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+2 -2
View File
@@ -215,9 +215,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallFrontierUtilFunc special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256005
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256050
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+12 -12
View File
@@ -13,7 +13,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
special CallFrontierUtilFunc special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C919
call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC
end end
@@ -42,7 +42,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A
lockall lockall
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C938
applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
waitmovement 0 waitmovement 0
call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5
@@ -119,11 +119,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special CallBattleDomeFunction special CallBattleDomeFunction
compare VAR_TEMP_2, 0 compare VAR_TEMP_2, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
compare VAR_TEMP_2, 1 compare VAR_TEMP_2, 1
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5
compare VAR_TEMP_2, 2 compare VAR_TEMP_2, 2
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9
playse SE_W227B playse SE_W227B
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
delay 60 delay 60
@@ -166,9 +166,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
waitmovement 0 waitmovement 0
compare VAR_TEMP_2, 0 compare VAR_TEMP_2, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3
compare VAR_TEMP_2, 1 compare VAR_TEMP_2, 1
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC
playse SE_W227B playse SE_W227B
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
delay 60 delay 60
@@ -573,7 +573,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF
BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0 BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0
compare VAR_TEMP_9, 1 compare VAR_TEMP_9, 1
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC
end end
BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC
@@ -582,13 +582,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC
BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502 BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502
compare VAR_TEMP_F, 0 compare VAR_TEMP_F, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F
compare VAR_TEMP_F, 1 compare VAR_TEMP_F, 1
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C530
compare VAR_TEMP_F, 2 compare VAR_TEMP_F, 2
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C594
compare VAR_TEMP_F, 3 compare VAR_TEMP_F, 3
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C652
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+18 -18
View File
@@ -183,15 +183,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47
BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59
special SavePlayerParty special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CFD
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D06
BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72 BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D0F
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D15
waitmessage waitmessage
multichoice 17, 6, 23, 0 multichoice 17, 6, 23, 0
switch VAR_RESULT switch VAR_RESULT
@@ -273,9 +273,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D1B
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D24
goto BattleFrontier_BattleDomeLobby_EventScript_249A72 goto BattleFrontier_BattleDomeLobby_EventScript_249A72
BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15 BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15
@@ -310,26 +310,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C
BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CDD
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CE5
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D2D
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D33
waitdooranim waitdooranim
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CED
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CF5
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D39
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D3F
waitdooranim waitdooranim
return return
@@ -435,13 +435,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
setvar VAR_0x8005, 9 setvar VAR_0x8005, 9
special CallBattleDomeFunction special CallBattleDomeFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DD2
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB
compare VAR_RESULT, 3 compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
fadescreen 1 fadescreen 1
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special CallBattleDomeFunction special CallBattleDomeFunction
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+2 -2
View File
@@ -9,9 +9,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
special CallFrontierUtilFunc special CallFrontierUtilFunc
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special CallFrontierUtilFunc special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+8 -8
View File
@@ -156,15 +156,15 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD
BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED
special SavePlayerParty special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1 call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587B1
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587BA
BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606 BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3 call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C3
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9 call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C9
waitmessage waitmessage
multichoice 17, 6, 23, 0 multichoice 17, 6, 23, 0
switch VAR_RESULT switch VAR_RESULT
@@ -219,9 +219,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A
msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_25875C
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762 call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258762
applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC
waitmovement 0 waitmovement 0
@@ -240,9 +240,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762
BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587CF
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8 call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587D8
goto BattleFrontier_BattleFactoryLobby_EventScript_258606 goto BattleFrontier_BattleFactoryLobby_EventScript_258606
BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783 BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+35 -35
View File
@@ -56,9 +56,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74
closemessage closemessage
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B
waitmovement 0 waitmovement 0
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11
waitstate waitstate
@@ -104,17 +104,17 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special CallFrontierUtilFunc special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24
compare VAR_RESULT, 3 compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B
compare VAR_RESULT, 4 compare VAR_RESULT, 4
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32
compare VAR_RESULT, 5 compare VAR_RESULT, 5
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39
compare VAR_RESULT, 6 compare VAR_RESULT, 6
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6
@@ -250,41 +250,41 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B
compare VAR_0x8005, 2 compare VAR_0x8005, 2
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74
compare VAR_0x8005, 3 compare VAR_0x8005, 3
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D
compare VAR_0x8005, 4 compare VAR_0x8005, 4
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86
compare VAR_0x8005, 5 compare VAR_0x8005, 5
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F
compare VAR_0x8005, 6 compare VAR_0x8005, 6
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98
compare VAR_0x8005, 7 compare VAR_0x8005, 7
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1
compare VAR_0x8005, 8 compare VAR_0x8005, 8
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA
compare VAR_0x8005, 10 compare VAR_0x8005, 10
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3
compare VAR_0x8005, 11 compare VAR_0x8005, 11
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC
compare VAR_0x8005, 12 compare VAR_0x8005, 12
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5
compare VAR_0x8005, 13 compare VAR_0x8005, 13
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE
compare VAR_0x8005, 14 compare VAR_0x8005, 14
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7
compare VAR_0x8005, 15 compare VAR_0x8005, 15
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0
compare VAR_0x8005, 16 compare VAR_0x8005, 16
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9
compare VAR_0x8005, 17 compare VAR_0x8005, 17
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2
compare VAR_0x8005, 18 compare VAR_0x8005, 18
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB
return return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62
@@ -361,23 +361,23 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004
compare VAR_0x8006, 0 compare VAR_0x8006, 0
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068
compare VAR_0x8006, 1 compare VAR_0x8006, 1
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071
compare VAR_0x8006, 2 compare VAR_0x8006, 2
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A
compare VAR_0x8006, 3 compare VAR_0x8006, 3
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083
compare VAR_0x8006, 4 compare VAR_0x8006, 4
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C
compare VAR_0x8006, 5 compare VAR_0x8006, 5
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095
compare VAR_0x8006, 6 compare VAR_0x8006, 6
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E
compare VAR_0x8006, 7 compare VAR_0x8006, 7
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7
compare VAR_0x8006, 8 compare VAR_0x8006, 8
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0 call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0
return return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+6 -6
View File
@@ -112,17 +112,17 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special CallFrontierUtilFunc special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D
compare VAR_RESULT, 3 compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74 call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74
compare VAR_RESULT, 4 compare VAR_RESULT, 4
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B
compare VAR_RESULT, 5 compare VAR_RESULT, 5
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82 call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82
compare VAR_RESULT, 6 compare VAR_RESULT, 6
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89 call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89
call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42
data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+5 -5
View File
@@ -15,15 +15,15 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
special CallBattlePalaceFunction special CallBattlePalaceFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F58B
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F594 call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F594
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F59D call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F59D
compare VAR_RESULT, 3 compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6 call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6
compare VAR_RESULT, 4 compare VAR_RESULT, 4
call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF
closemessage closemessage
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+10 -10
View File
@@ -154,15 +154,15 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817 goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817
special SavePlayerParty special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB6
waitmessage waitmessage
multichoice 17, 6, 23, 0 multichoice 17, 6, 23, 0
switch VAR_RESULT switch VAR_RESULT
@@ -299,24 +299,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6
BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC23
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC29
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC2F
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC35
waitdooranim waitdooranim
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC3B
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC41
waitdooranim waitdooranim
return return
data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
+10 -10
View File
@@ -321,9 +321,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605
special CallBattlePikeFunction special CallBattlePikeFunction
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
compare VAR_0x8004, 0 compare VAR_0x8004, 0
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643
compare VAR_0x8004, 1 compare VAR_0x8004, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT
closemessage closemessage
releaseall releaseall
@@ -338,13 +338,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758
compare VAR_RESULT, 3 compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F
compare VAR_RESULT, 4 compare VAR_RESULT, 4
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special CallBattlePikeFunction special CallBattlePikeFunction
waitstate waitstate
@@ -375,9 +375,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special CallBattlePikeFunction special CallBattlePikeFunction
waitstate waitstate
@@ -608,9 +608,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+1 -1
View File
@@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2
BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
special sub_81B95E0 special sub_81B95E0
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB
clearflag FLAG_SPECIAL_FLAG_0x4004 clearflag FLAG_SPECIAL_FLAG_0x4004
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special CallFrontierUtilFunc special CallFrontierUtilFunc
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+1 -1
View File
@@ -76,7 +76,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special CallFrontierUtilFunc special CallFrontierUtilFunc
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+3 -3
View File
@@ -6,9 +6,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
compare VAR_FRONTIER_BATTLE_MODE, 2 compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
end end
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
@@ -158,7 +158,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special CallFrontierUtilFunc special CallFrontierUtilFunc
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+6 -6
View File
@@ -6,9 +6,9 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A
BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
compare VAR_FRONTIER_BATTLE_MODE, 2 compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71 call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D71
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91 call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D91
end end
BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
@@ -88,13 +88,13 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
compare VAR_FRONTIER_BATTLE_MODE, 2 compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EA8
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EB2
return return
BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+4 -4
View File
@@ -25,13 +25,13 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55
compare VAR_FRONTIER_BATTLE_MODE, 2 compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A5F
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72 call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A72
return return
BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+20 -20
View File
@@ -213,7 +213,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
lock lock
faceplayer faceplayer
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E930
message BattleFrontier_BattleTowerLobby_Text_23F737 message BattleFrontier_BattleTowerLobby_Text_23F737
waitmessage waitmessage
message BattleFrontier_BattleTowerLobby_Text_23F754 message BattleFrontier_BattleTowerLobby_Text_23F754
@@ -806,13 +806,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0
BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D4
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D9
compare VAR_FRONTIER_BATTLE_MODE, 2 compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1DE
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1E3
return return
BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4 BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4
@@ -833,13 +833,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3
BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F215
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F21B
compare VAR_FRONTIER_BATTLE_MODE, 2 compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F221
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F227
return return
BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215 BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215
@@ -860,13 +860,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227
BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F25A
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F260
compare VAR_FRONTIER_BATTLE_MODE, 2 compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F266
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F26C
return return
BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A
@@ -887,13 +887,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C
BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272 BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272
compare VAR_FRONTIER_BATTLE_MODE, 0 compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F29F
compare VAR_FRONTIER_BATTLE_MODE, 1 compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2A5
compare VAR_FRONTIER_BATTLE_MODE, 2 compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2AB
compare VAR_FRONTIER_BATTLE_MODE, 3 compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2B1
return return
BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F
@@ -972,11 +972,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351
BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366
special CloseLink special CloseLink
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F394
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F39D
compare VAR_0x8005, 2 compare VAR_0x8005, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3A6
msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT
release release
end end
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+2 -2
View File
@@ -191,9 +191,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
waitbuttonpress waitbuttonpress
closemessage closemessage
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
setflag FLAG_0x152 setflag FLAG_0x152
warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3
data/maps/BattleFrontier_Lounge1/scripts.inc
+2 -4
View File
@@ -4,10 +4,8 @@ BattleFrontier_Lounge1_MapScripts:: @ 825E774
BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775 BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775
lock lock
faceplayer faceplayer
checkflag FLAG_0x153 call_if_unset FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7AD
call_if 0, BattleFrontier_Lounge1_EventScript_25E7AD call_if_set FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7B6
checkflag FLAG_0x153
call_if 1, BattleFrontier_Lounge1_EventScript_25E7B6
setflag FLAG_0x153 setflag FLAG_0x153
goto BattleFrontier_Lounge1_EventScript_25E792 goto BattleFrontier_Lounge1_EventScript_25E792
end end
data/maps/BattleFrontier_Lounge2/scripts.inc
+12 -12
View File
@@ -17,29 +17,29 @@ BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F
BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D
compare VAR_FRONTIER_MANIAC_FACILITY, 0 compare VAR_FRONTIER_MANIAC_FACILITY, 0
call_if 1, BattleFrontier_Lounge2_EventScript_26070A call_if_eq BattleFrontier_Lounge2_EventScript_26070A
compare VAR_FRONTIER_MANIAC_FACILITY, 1 compare VAR_FRONTIER_MANIAC_FACILITY, 1
call_if 1, BattleFrontier_Lounge2_EventScript_26070F call_if_eq BattleFrontier_Lounge2_EventScript_26070F
compare VAR_FRONTIER_MANIAC_FACILITY, 2 compare VAR_FRONTIER_MANIAC_FACILITY, 2
call_if 1, BattleFrontier_Lounge2_EventScript_260714 call_if_eq BattleFrontier_Lounge2_EventScript_260714
compare VAR_FRONTIER_MANIAC_FACILITY, 3 compare VAR_FRONTIER_MANIAC_FACILITY, 3
call_if 1, BattleFrontier_Lounge2_EventScript_260719 call_if_eq BattleFrontier_Lounge2_EventScript_260719
compare VAR_FRONTIER_MANIAC_FACILITY, 4 compare VAR_FRONTIER_MANIAC_FACILITY, 4
call_if 1, BattleFrontier_Lounge2_EventScript_26071E call_if_eq BattleFrontier_Lounge2_EventScript_26071E
compare VAR_FRONTIER_MANIAC_FACILITY, 5 compare VAR_FRONTIER_MANIAC_FACILITY, 5
call_if 1, BattleFrontier_Lounge2_EventScript_260723 call_if_eq BattleFrontier_Lounge2_EventScript_260723
compare VAR_FRONTIER_MANIAC_FACILITY, 6 compare VAR_FRONTIER_MANIAC_FACILITY, 6
call_if 1, BattleFrontier_Lounge2_EventScript_260728 call_if_eq BattleFrontier_Lounge2_EventScript_260728
compare VAR_FRONTIER_MANIAC_FACILITY, 7 compare VAR_FRONTIER_MANIAC_FACILITY, 7
call_if 1, BattleFrontier_Lounge2_EventScript_26072D call_if_eq BattleFrontier_Lounge2_EventScript_26072D
compare VAR_FRONTIER_MANIAC_FACILITY, 8 compare VAR_FRONTIER_MANIAC_FACILITY, 8
call_if 1, BattleFrontier_Lounge2_EventScript_260732 call_if_eq BattleFrontier_Lounge2_EventScript_260732
compare VAR_FRONTIER_MANIAC_FACILITY, 9 compare VAR_FRONTIER_MANIAC_FACILITY, 9
call_if 1, BattleFrontier_Lounge2_EventScript_260737 call_if_eq BattleFrontier_Lounge2_EventScript_260737
compare VAR_FRONTIER_MANIAC_FACILITY, 3 compare VAR_FRONTIER_MANIAC_FACILITY, 3
call_if 3, BattleFrontier_Lounge2_EventScript_2606F8 call_if_le BattleFrontier_Lounge2_EventScript_2606F8
compare VAR_FRONTIER_MANIAC_FACILITY, 4 compare VAR_FRONTIER_MANIAC_FACILITY, 4
call_if 4, BattleFrontier_Lounge2_EventScript_260701 call_if_ge BattleFrontier_Lounge2_EventScript_260701
special sub_8139F20 special sub_8139F20
waitmessage waitmessage
waitbuttonpress waitbuttonpress
data/maps/BattleFrontier_Lounge3/scripts.inc
+10 -17
View File
@@ -85,20 +85,13 @@ BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96
BattleFrontier_Lounge3_EventScript_261EA0:: @ 8261EA0 BattleFrontier_Lounge3_EventScript_261EA0:: @ 8261EA0
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
checkflag FLAG_SYS_TOWER_SILVER call_if_set FLAG_SYS_TOWER_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 call_if_set FLAG_SYS_DOME_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_DOME_SILVER call_if_set FLAG_SYS_PALACE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 call_if_set FLAG_SYS_ARENA_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_PALACE_SILVER call_if_set FLAG_SYS_FACTORY_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 call_if_set FLAG_SYS_PIKE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_ARENA_SILVER call_if_set FLAG_SYS_PYRAMID_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_FACTORY_SILVER
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_PIKE_SILVER
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_PYRAMID_SILVER
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
return return
BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5 BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5
@@ -128,11 +121,11 @@ BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12
BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E
msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0
call_if 1, BattleFrontier_Lounge3_EventScript_261F80 call_if_eq BattleFrontier_Lounge3_EventScript_261F80
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1
call_if 1, BattleFrontier_Lounge3_EventScript_261F8A call_if_eq BattleFrontier_Lounge3_EventScript_261F8A
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2
call_if 1, BattleFrontier_Lounge3_EventScript_261F94 call_if_eq BattleFrontier_Lounge3_EventScript_261F94
msgbox BattleFrontier_Lounge3_Text_2633D4, 9 msgbox BattleFrontier_Lounge3_Text_2633D4, 9
special sub_813A9D0 special sub_813A9D0
msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT
data/maps/BattleFrontier_OutsideEast/scripts.inc
+2 -4
View File
@@ -4,8 +4,7 @@ BattleFrontier_OutsideEast_MapScripts:: @ 8242C04
.byte 0 .byte 0
BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_242C19
call_if 1, BattleFrontier_OutsideEast_EventScript_242C19
end end
BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
@@ -18,8 +17,7 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
setvar VAR_0x40BC, 0 setvar VAR_0x40BC, 0
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
checkflag FLAG_0x1C6 call_if_unset FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242C3F
call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F
end end
BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F
data/maps/BattleFrontier_OutsideWest/scripts.inc
+8 -8
View File
@@ -145,13 +145,13 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
faceplayer faceplayer
delay 20 delay 20
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 1, BattleFrontier_OutsideWest_EventScript_23D5C5 call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT
release release
end end
@@ -170,13 +170,13 @@ BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6
message BattleFrontier_OutsideWest_Text_23DCB0 message BattleFrontier_OutsideWest_Text_23DCB0
waitmessage waitmessage
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, BattleFrontier_OutsideWest_EventScript_23D5FD call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 1, BattleFrontier_OutsideWest_EventScript_23D608 call_if_eq BattleFrontier_OutsideWest_EventScript_23D608
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if 1, BattleFrontier_OutsideWest_EventScript_23D613 call_if_eq BattleFrontier_OutsideWest_EventScript_23D613
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, BattleFrontier_OutsideWest_EventScript_23D61E call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E
waitbuttonpress waitbuttonpress
release release
end end
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+4 -4
View File
@@ -173,13 +173,13 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
closemessage closemessage
delay 30 delay 30
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, BattleFrontier_ScottsHouse_EventScript_263A13 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 1, BattleFrontier_ScottsHouse_EventScript_263A1E call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34
msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E
waitmovement 0 waitmovement 0
data/maps/BirthIsland_Exterior/scripts.inc
+3 -6
View File
@@ -13,10 +13,8 @@ BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_0x4034, 0 setvar VAR_0x4034, 0
setvar VAR_0x4035, 0 setvar VAR_0x4035, 0
checkflag FLAG_0x1AD call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E
call_if 1, BirthIsland_Exterior_EventScript_267F4E call_if_unset FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F55
checkflag FLAG_0x1AD
call_if 0, BirthIsland_Exterior_EventScript_267F55
end end
BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
@@ -31,8 +29,7 @@ BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
return return
BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BirthIsland_Exterior_EventScript_267F6F
call_if 1, BirthIsland_Exterior_EventScript_267F6F
end end
BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
data/maps/CaveOfOrigin_1F/scripts.inc
+1 -2
View File
@@ -3,7 +3,6 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768
.byte 0 .byte 0
CaveOfOrigin_1F_MapScript1_23576E: @ 823576E CaveOfOrigin_1F_MapScript1_23576E: @ 823576E
checkflag FLAG_0x071 call_if_set FLAG_0x071, CaveOfOrigin_1F_EventScript_2722C1
call_if 1, CaveOfOrigin_1F_EventScript_2722C1
end end
data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
+1 -2
View File
@@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
.byte 0 .byte 0
CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E
checkflag FLAG_0x071 call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
call_if 1, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
end end
data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
+1 -2
View File
@@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
.byte 0 .byte 0
CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E
checkflag FLAG_0x071 call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
call_if 1, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
end end
data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
+1 -2
View File
@@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
.byte 0 .byte 0
CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E
checkflag FLAG_0x071 call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
call_if 1, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
end end
data/maps/DesertRuins/scripts.inc
+3 -6
View File
@@ -5,8 +5,7 @@ DesertRuins_MapScripts:: @ 822D95B
.byte 0 .byte 0
DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_MapScript1_22D96B: @ 822D96B
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_22D975
call_if 1, DesertRuins_EventScript_22D975
end end
DesertRuins_EventScript_22D975:: @ 822D975 DesertRuins_EventScript_22D975:: @ 822D975
@@ -17,8 +16,7 @@ DesertRuins_EventScript_22D975:: @ 822D975
return return
DesertRuins_MapScript1_22D989: @ 822D989 DesertRuins_MapScript1_22D989: @ 822D989
checkflag FLAG_SYS_BRAILLE_STRENGTH call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D993
call_if 0, DesertRuins_EventScript_22D993
end end
DesertRuins_EventScript_22D993:: @ 822D993 DesertRuins_EventScript_22D993:: @ 822D993
@@ -32,8 +30,7 @@ DesertRuins_EventScript_22D993:: @ 822D993
DesertRuins_MapScript1_22D9CA: @ 822D9CA DesertRuins_MapScript1_22D9CA: @ 822D9CA
setflag FLAG_LANDMARK_DESERT_RUINS setflag FLAG_LANDMARK_DESERT_RUINS
checkflag FLAG_0x1BB call_if_unset FLAG_0x1BB, DesertRuins_EventScript_22D9D7
call_if 0, DesertRuins_EventScript_22D9D7
end end
DesertRuins_EventScript_22D9D7:: @ 822D9D7 DesertRuins_EventScript_22D9D7:: @ 822D9D7
data/maps/DewfordTown/scripts.inc
+2 -4
View File
@@ -174,10 +174,8 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN
checkflag FLAG_0x095 call_if_unset FLAG_0x095, DewfordTown_EventScript_1E9790
call_if 0, DewfordTown_EventScript_1E9790 call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799
checkflag FLAG_0x095
call_if 1, DewfordTown_EventScript_1E9799
closemessage closemessage
copyvar VAR_0x4096, VAR_0x8008 copyvar VAR_0x4096, VAR_0x8008
resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 255, MAP_DEWFORD_TOWN
data/maps/DewfordTown_Gym/scripts.inc
+1 -1
View File
@@ -175,7 +175,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
setflag FLAG_BADGE02_GET setflag FLAG_BADGE02_GET
addvar VAR_0x4085, 1 addvar VAR_0x4085, 1
compare VAR_0x4085, 6 compare VAR_0x4085, 6
call_if 1, DewfordTown_Gym_EventScript_271E84 call_if_eq DewfordTown_Gym_EventScript_271E84
setvar VAR_0x8008, 2 setvar VAR_0x8008, 2
call DewfordTown_Gym_EventScript_271F43 call DewfordTown_Gym_EventScript_271F43
call DewfordTown_Gym_EventScript_1FC855 call DewfordTown_Gym_EventScript_1FC855
data/maps/DewfordTown_Hall/scripts.inc
+2 -2
View File
@@ -218,9 +218,9 @@ DewfordTown_Hall_EventScript_1FD772:: @ 81FD772
DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, DewfordTown_Hall_EventScript_1FD7AA call_if_eq DewfordTown_Hall_EventScript_1FD7AA
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 1, DewfordTown_Hall_EventScript_1FD7B5 call_if_eq DewfordTown_Hall_EventScript_1FD7B5
return return
DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA
data/maps/EverGrandeCity/scripts.inc
+1 -2
View File
@@ -3,8 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B
.byte 0 .byte 0
EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21
checkflag FLAG_SYS_WEATHER_CTRL call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A
call_if 1, EverGrandeCity_EventScript_27207A
end end
EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+4 -4
View File
@@ -54,9 +54,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61
playse SE_DOOR playse SE_DOOR
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228ABC call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228ABC
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228AC1 call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC1
addobject 2 addobject 2
call EverGrandeCity_ChampionsRoom_EventScript_228BFD call EverGrandeCity_ChampionsRoom_EventScript_228BFD
checkplayergender checkplayergender
@@ -129,9 +129,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BEB
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4 call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BF4
closemessage closemessage
applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C20 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C20
data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+2 -3
View File
@@ -24,10 +24,9 @@ EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5
end end
EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2
checkflag FLAG_0x4FE call_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_2286E7
call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286E7
compare VAR_0x409C, 4 compare VAR_0x409C, 4
call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286ED call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED
end end
EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7 EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7
data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+2 -3
View File
@@ -24,10 +24,9 @@ EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B
end end
EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448
checkflag FLAG_0x4FD call_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_22845D
call_if 1, EverGrandeCity_GlaciasRoom_EventScript_22845D
compare VAR_0x409C, 3 compare VAR_0x409C, 3
call_if 1, EverGrandeCity_GlaciasRoom_EventScript_228463 call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463
end end
EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D
data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+2 -3
View File
@@ -24,10 +24,9 @@ EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D
end end
EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA
checkflag FLAG_0x4FC call_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281BF
call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281BF
compare VAR_0x409C, 2 compare VAR_0x409C, 2
call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281C5 call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5
end end
EverGrandeCity_PhoebesRoom_EventScript_2281BF:: @ 82281BF EverGrandeCity_PhoebesRoom_EventScript_2281BF:: @ 82281BF
data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+4 -5
View File
@@ -5,8 +5,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
checkflag FLAG_0x1CF call_if_unset FLAG_0x1CF, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
end end
EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
@@ -36,11 +35,11 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
addvar VAR_0x40D1, 1 addvar VAR_0x40D1, 1
setflag FLAG_0x1CF setflag FLAG_0x1CF
playse SE_KAIDAN playse SE_KAIDAN
data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+3 -4
View File
@@ -6,8 +6,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2 setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
setflag FLAG_LANDMARK_POKEMON_LEAGUE setflag FLAG_LANDMARK_POKEMON_LEAGUE
checkflag FLAG_0x107 call_if_unset FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
end end
EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED
@@ -51,9 +50,9 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
goto_if_set FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB goto_if_set FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB
getplayerxy VAR_TEMP_0, VAR_TEMP_1 getplayerxy VAR_TEMP_0, VAR_TEMP_1
compare VAR_TEMP_0, 11 compare VAR_TEMP_0, 11
call_if 4, EverGrandeCity_PokemonLeague_1F_EventScript_229698 call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_229698
compare VAR_TEMP_0, 8 compare VAR_TEMP_0, 8
call_if 3, EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 call_if_le EverGrandeCity_PokemonLeague_1F_EventScript_2296A3
message EverGrandeCity_PokemonLeague_1F_Text_2296E8 message EverGrandeCity_PokemonLeague_1F_Text_2296E8
waitmessage waitmessage
delay 120 delay 120
data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+2 -3
View File
@@ -11,10 +11,9 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
end end
EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
checkflag FLAG_0x4FB call_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F32
call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F32
compare VAR_0x409C, 1 compare VAR_0x409C, 1
call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F38 call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38
end end
EverGrandeCity_SidneysRoom_EventScript_227F32:: @ 8227F32 EverGrandeCity_SidneysRoom_EventScript_227F32:: @ 8227F32
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+2 -2
View File
@@ -117,9 +117,9 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special CallFrontierUtilFunc special CallFrontierUtilFunc
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43 call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B43
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B4A call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B4A
multichoice 20, 6, 104, 1 multichoice 20, 6, 104, 1
switch VAR_RESULT switch VAR_RESULT
case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8 case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8
data/maps/FallarborTown_House1/scripts.inc
+2 -4
View File
@@ -13,10 +13,8 @@ FallarborTown_House1_EventScript_200F13:: @ 8200F13
end end
FallarborTown_House1_EventScript_200F38:: @ 8200F38 FallarborTown_House1_EventScript_200F38:: @ 8200F38
checkflag FLAG_TEMP_2 call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_200F8B
call_if 0, FallarborTown_House1_EventScript_200F8B call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_200F9C
checkflag FLAG_TEMP_2
call_if 1, FallarborTown_House1_EventScript_200F9C
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq FallarborTown_House1_EventScript_200FA5 goto_if_eq FallarborTown_House1_EventScript_200FA5
msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT
data/maps/FarawayIsland_Interior/scripts.inc
+7 -10
View File
@@ -6,8 +6,7 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA
.byte 0 .byte 0
FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D19
call_if 1, FarawayIsland_Interior_EventScript_267D19
end end
FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 FarawayIsland_Interior_EventScript_267D19:: @ 8267D19
@@ -28,8 +27,7 @@ FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B
return return
FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D5E
call_if 1, FarawayIsland_Interior_EventScript_267D5E
end end
FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
@@ -42,8 +40,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
setvar VAR_0x403A, 0 setvar VAR_0x403A, 0
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
checkflag FLAG_0x1CA call_if_unset FLAG_0x1CA, FarawayIsland_Interior_EventScript_267D86
call_if 0, FarawayIsland_Interior_EventScript_267D86
end end
FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
@@ -129,13 +126,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
waitse waitse
playmoncry SPECIES_MEW, 2 playmoncry SPECIES_MEW, 2
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, FarawayIsland_Interior_EventScript_267EAF call_if_eq FarawayIsland_Interior_EventScript_267EAF
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 1, FarawayIsland_Interior_EventScript_267EBA call_if_eq FarawayIsland_Interior_EventScript_267EBA
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if 1, FarawayIsland_Interior_EventScript_267EC5 call_if_eq FarawayIsland_Interior_EventScript_267EC5
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, FarawayIsland_Interior_EventScript_267ED0 call_if_eq FarawayIsland_Interior_EventScript_267ED0
special sub_81D4BEC special sub_81D4BEC
delay 40 delay 40
waitmoncry waitmoncry
data/maps/FieryPath/scripts.inc
+1 -2
View File
@@ -3,8 +3,7 @@ FieryPath_MapScripts:: @ 8230F24
.byte 0 .byte 0
FieryPath_MapScript1_230F2A: @ 8230F2A FieryPath_MapScript1_230F2A: @ 8230F2A
checkflag FLAG_LANDMARK_FIERY_PATH call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37
call_if 0, FieryPath_EventScript_230F37
setflag FLAG_LANDMARK_FIERY_PATH setflag FLAG_LANDMARK_FIERY_PATH
end end
data/maps/FortreeCity_House2/scripts.inc
+1 -2
View File
@@ -5,8 +5,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB
lock lock
faceplayer faceplayer
goto_if_set FLAG_0x108, FortreeCity_House2_EventScript_21786E goto_if_set FLAG_0x108, FortreeCity_House2_EventScript_21786E
checkflag FLAG_0x076 call_if_unset FLAG_0x076, FortreeCity_House2_EventScript_217862
call_if 0, FortreeCity_House2_EventScript_217862
msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT
multichoice 21, 8, 54, 1 multichoice 21, 8, 54, 1
switch VAR_RESULT switch VAR_RESULT
data/maps/GraniteCave_StevensRoom/scripts.inc
+5 -5
View File
@@ -11,7 +11,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT
giveitem_std ITEM_TM47 giveitem_std ITEM_TM47
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C call_if_eq GraniteCave_StevensRoom_EventScript_22DD3C
msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT
closemessage closemessage
delay 30 delay 30
@@ -24,13 +24,13 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 1, GraniteCave_StevensRoom_EventScript_22DD2A call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 call_if_eq GraniteCave_StevensRoom_EventScript_22DD18
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 call_if_eq GraniteCave_StevensRoom_EventScript_22DD18
playse SE_KAIDAN playse SE_KAIDAN
removeobject 1 removeobject 1
release release
data/maps/IslandCave/scripts.inc
+5 -10
View File
@@ -5,8 +5,7 @@ IslandCave_MapScripts:: @ 8238E2A
.byte 0 .byte 0
IslandCave_MapScript1_238E3A: @ 8238E3A IslandCave_MapScript1_238E3A: @ 8238E3A
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_238E44
call_if 1, IslandCave_EventScript_238E44
end end
IslandCave_EventScript_238E44:: @ 8238E44 IslandCave_EventScript_238E44:: @ 8238E44
@@ -17,8 +16,7 @@ IslandCave_EventScript_238E44:: @ 8238E44
return return
IslandCave_MapScript1_238E58: @ 8238E58 IslandCave_MapScript1_238E58: @ 8238E58
checkflag FLAG_SYS_BRAILLE_WAIT call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238E62
call_if 0, IslandCave_EventScript_238E62
end end
IslandCave_EventScript_238E62:: @ 8238E62 IslandCave_EventScript_238E62:: @ 8238E62
@@ -33,8 +31,7 @@ IslandCave_EventScript_238E62:: @ 8238E62
IslandCave_MapScript1_238E99: @ 8238E99 IslandCave_MapScript1_238E99: @ 8238E99
setflag FLAG_LANDMARK_ISLAND_CAVE setflag FLAG_LANDMARK_ISLAND_CAVE
call IslandCave_EventScript_238F45 call IslandCave_EventScript_238F45
checkflag FLAG_0x1BC call_if_unset FLAG_0x1BC, IslandCave_EventScript_238EAB
call_if 0, IslandCave_EventScript_238EAB
end end
IslandCave_EventScript_238EAB:: @ 8238EAB IslandCave_EventScript_238EAB:: @ 8238EAB
@@ -55,8 +52,7 @@ IslandCave_EventScript_238EAF:: @ 8238EAF
IslandCave_EventScript_238EEF:: @ 8238EEF IslandCave_EventScript_238EEF:: @ 8238EEF
lockall lockall
checkflag FLAG_TEMP_3 call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
call_if 1, IslandCave_EventScript_238F45
goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F13 goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F13
braillemessage IslandCave_Braille_2A6CD4 braillemessage IslandCave_Braille_2A6CD4
setflag FLAG_TEMP_2 setflag FLAG_TEMP_2
@@ -71,8 +67,7 @@ IslandCave_EventScript_238F13:: @ 8238F13
IslandCave_EventScript_238F1D:: @ 8238F1D IslandCave_EventScript_238F1D:: @ 8238F1D
lockall lockall
checkflag FLAG_TEMP_3 call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
call_if 1, IslandCave_EventScript_238F45
braillemessage IslandCave_Braille_2A6CD4 braillemessage IslandCave_Braille_2A6CD4
goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F41 goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F41
setflag FLAG_TEMP_2 setflag FLAG_TEMP_2
data/maps/JaggedPass/scripts.inc
+2 -2
View File
@@ -7,7 +7,7 @@ JaggedPass_MapScripts:: @ 8230656
JaggedPass_MapScript1_230666: @ 8230666 JaggedPass_MapScript1_230666: @ 8230666
setstepcallback 1 setstepcallback 1
compare VAR_0x40C8, 0 compare VAR_0x40C8, 0
call_if 1, JaggedPass_EventScript_230674 call_if_eq JaggedPass_EventScript_230674
end end
JaggedPass_EventScript_230674:: @ 8230674 JaggedPass_EventScript_230674:: @ 8230674
@@ -22,7 +22,7 @@ JaggedPass_EventScript_230685:: @ 8230685
JaggedPass_MapScript1_23068B: @ 823068B JaggedPass_MapScript1_23068B: @ 823068B
compare VAR_0x40BD, 1 compare VAR_0x40BD, 1
call_if 1, JaggedPass_EventScript_230697 call_if_eq JaggedPass_EventScript_230697
end end
JaggedPass_EventScript_230697:: @ 8230697 JaggedPass_EventScript_230697:: @ 8230697
data/maps/LavaridgeTown/scripts.inc
+12 -14
View File
@@ -5,16 +5,14 @@ LavaridgeTown_MapScripts:: @ 81EA4D3
LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
setflag FLAG_VISITED_LAVARIDGE_TOWN setflag FLAG_VISITED_LAVARIDGE_TOWN
checkflag FLAG_0x06C call_if_set FLAG_0x06C, LavaridgeTown_EventScript_1EA514
call_if 1, LavaridgeTown_EventScript_1EA514 call_if_set FLAG_0x08B, LavaridgeTown_EventScript_1EA53F
checkflag FLAG_0x08B
call_if 1, LavaridgeTown_EventScript_1EA53F
call LavaridgeTown_EventScript_271ED7 call LavaridgeTown_EventScript_271ED7
call LavaridgeTown_EventScript_271EFB call LavaridgeTown_EventScript_271EFB
compare VAR_0x4053, 1 compare VAR_0x4053, 1
call_if 1, LavaridgeTown_EventScript_1EA518 call_if_eq LavaridgeTown_EventScript_1EA518
compare VAR_0x4053, 1 compare VAR_0x4053, 1
call_if 1, LavaridgeTown_EventScript_1EA543 call_if_eq LavaridgeTown_EventScript_1EA543
end end
LavaridgeTown_EventScript_1EA514:: @ 81EA514 LavaridgeTown_EventScript_1EA514:: @ 81EA514
@@ -50,19 +48,19 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551
lockall lockall
getplayerxy VAR_0x8008, VAR_0x8009 getplayerxy VAR_0x8008, VAR_0x8009
compare VAR_0x8008, 9 compare VAR_0x8008, 9
call_if 1, LavaridgeTown_EventScript_1EA63A call_if_eq LavaridgeTown_EventScript_1EA63A
compare VAR_0x8008, 9 compare VAR_0x8008, 9
call_if 5, LavaridgeTown_EventScript_1EA65C call_if_ne LavaridgeTown_EventScript_1EA65C
delay 20 delay 20
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LavaridgeTown_EventScript_1EA630 call_if_eq LavaridgeTown_EventScript_1EA630
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LavaridgeTown_EventScript_1EA635 call_if_eq LavaridgeTown_EventScript_1EA635
compare VAR_0x8008, 9 compare VAR_0x8008, 9
call_if 1, LavaridgeTown_EventScript_1EA6A1 call_if_eq LavaridgeTown_EventScript_1EA6A1
compare VAR_0x8008, 9 compare VAR_0x8008, 9
call_if 5, LavaridgeTown_EventScript_1EA6AC call_if_ne LavaridgeTown_EventScript_1EA6AC
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LavaridgeTown_EventScript_1EA5B5 goto_if_eq LavaridgeTown_EventScript_1EA5B5
@@ -92,9 +90,9 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
addobject 7 addobject 7
delay 30 delay 30
compare VAR_0x8008, 9 compare VAR_0x8008, 9
call_if 1, LavaridgeTown_EventScript_1EA6B7 call_if_eq LavaridgeTown_EventScript_1EA6B7
compare VAR_0x8008, 9 compare VAR_0x8008, 9
call_if 5, LavaridgeTown_EventScript_1EA6C9 call_if_ne LavaridgeTown_EventScript_1EA6C9
removeobject 7 removeobject 7
setvar VAR_0x4053, 2 setvar VAR_0x4053, 2
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_SPECIAL_FLAG_0x4000
data/maps/LavaridgeTown_Gym_1F/scripts.inc
+1 -1
View File
@@ -78,7 +78,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
setflag FLAG_BADGE04_GET setflag FLAG_BADGE04_GET
addvar VAR_0x4085, 1 addvar VAR_0x4085, 1
compare VAR_0x4085, 6 compare VAR_0x4085, 6
call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84 call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84
setvar VAR_0x8008, 4 setvar VAR_0x8008, 4
call LavaridgeTown_Gym_1F_EventScript_271F43 call LavaridgeTown_Gym_1F_EventScript_271F43
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
data/maps/LilycoveCity/scripts.inc
+14 -22
View File
@@ -7,14 +7,12 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47
setflag FLAG_VISITED_LILYCOVE_CITY setflag FLAG_VISITED_LILYCOVE_CITY
setvar VAR_0x4086, 0 setvar VAR_0x4086, 0
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
checkflag FLAG_SYS_WEATHER_CTRL call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A
call_if 1, LilycoveCity_EventScript_27207A
call LilycoveCity_EventScript_271ED7 call LilycoveCity_EventScript_271ED7
end end
LilycoveCity_MapScript1_1E2B61: @ 81E2B61 LilycoveCity_MapScript1_1E2B61: @ 81E2B61
checkflag FLAG_0x070 call_if_unset FLAG_0x070, LilycoveCity_EventScript_1E2B6B
call_if 0, LilycoveCity_EventScript_1E2B6B
end end
LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
@@ -241,10 +239,8 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE
LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
playbgm MUS_GIRL_SUP, 1 playbgm MUS_GIRL_SUP, 1
checkflag FLAG_0x11E call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2E48
call_if 1, LilycoveCity_EventScript_1E2E48 call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2E51
checkflag FLAG_0x11E
call_if 0, LilycoveCity_EventScript_1E2E51
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LilycoveCity_EventScript_1E2E5A goto_if_eq LilycoveCity_EventScript_1E2E5A
msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT
@@ -272,10 +268,8 @@ LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A
LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
playbgm MUS_BOY_SUP, 1 playbgm MUS_BOY_SUP, 1
checkflag FLAG_0x11E call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2EBB
call_if 1, LilycoveCity_EventScript_1E2EBB call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2EC4
checkflag FLAG_0x11E
call_if 0, LilycoveCity_EventScript_1E2EC4
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LilycoveCity_EventScript_1E2ECD goto_if_eq LilycoveCity_EventScript_1E2ECD
msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT
@@ -334,12 +328,11 @@ LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E
LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E
msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
checkflag FLAG_BADGE06_GET call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76
call_if 1, LilycoveCity_EventScript_1E2F76
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_EventScript_1E2F86 call_if_eq LilycoveCity_EventScript_1E2F86
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LilycoveCity_EventScript_1E2F8F call_if_eq LilycoveCity_EventScript_1E2F8F
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
goto LilycoveCity_EventScript_1E3006 goto LilycoveCity_EventScript_1E3006
@@ -369,12 +362,11 @@ LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1
LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA
msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
checkflag FLAG_BADGE06_GET call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76
call_if 1, LilycoveCity_EventScript_1E2F76
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_EventScript_1E2FE2 call_if_eq LilycoveCity_EventScript_1E2FE2
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LilycoveCity_EventScript_1E2FEB call_if_eq LilycoveCity_EventScript_1E2FEB
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
goto LilycoveCity_EventScript_1E3006 goto LilycoveCity_EventScript_1E3006
@@ -414,9 +406,9 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D
faceplayer faceplayer
msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LilycoveCity_EventScript_1E304F call_if_eq LilycoveCity_EventScript_1E304F
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_EventScript_1E3058 call_if_eq LilycoveCity_EventScript_1E3058
release release
end end
data/maps/LilycoveCity_ContestLobby/scripts.inc
+9 -9
View File
@@ -58,7 +58,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA
setvar VAR_0x4099, 0 setvar VAR_0x4099, 0
specialvar VAR_RESULT, GiveMonArtistRibbon specialvar VAR_RESULT, GiveMonArtistRibbon
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LilycoveCity_ContestLobby_EventScript_21A314 call_if_eq LilycoveCity_ContestLobby_EventScript_21A314
applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
waitmovement 0 waitmovement 0
removeobject 4 removeobject 4
@@ -230,7 +230,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A
setvar VAR_0x4099, 0 setvar VAR_0x4099, 0
specialvar VAR_RESULT, GiveMonArtistRibbon specialvar VAR_RESULT, GiveMonArtistRibbon
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4 call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4
applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
waitmovement 0 waitmovement 0
removeobject 11 removeobject 11
@@ -760,9 +760,9 @@ LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15
waitmessage waitmessage
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
compare VAR_TEMP_C, 0 compare VAR_TEMP_C, 0
call_if 1, LilycoveCity_ContestLobby_EventScript_21AABB call_if_eq LilycoveCity_ContestLobby_EventScript_21AABB
compare VAR_TEMP_C, 1 compare VAR_TEMP_C, 1
call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0 call_if_eq LilycoveCity_ContestLobby_EventScript_21AAC0
compare VAR_TEMP_C, 2 compare VAR_TEMP_C, 2
goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F
compare VAR_RESULT, 4 compare VAR_RESULT, 4
@@ -842,15 +842,15 @@ LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17
LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B
compare VAR_CONTEST_CATEGORY, 0 compare VAR_CONTEST_CATEGORY, 0
call_if 1, LilycoveCity_ContestLobby_EventScript_21AB88 call_if_eq LilycoveCity_ContestLobby_EventScript_21AB88
compare VAR_CONTEST_CATEGORY, 1 compare VAR_CONTEST_CATEGORY, 1
call_if 1, LilycoveCity_ContestLobby_EventScript_21AB8E call_if_eq LilycoveCity_ContestLobby_EventScript_21AB8E
compare VAR_CONTEST_CATEGORY, 2 compare VAR_CONTEST_CATEGORY, 2
call_if 1, LilycoveCity_ContestLobby_EventScript_21AB94 call_if_eq LilycoveCity_ContestLobby_EventScript_21AB94
compare VAR_CONTEST_CATEGORY, 3 compare VAR_CONTEST_CATEGORY, 3
call_if 1, LilycoveCity_ContestLobby_EventScript_21AB9A call_if_eq LilycoveCity_ContestLobby_EventScript_21AB9A
compare VAR_CONTEST_CATEGORY, 4 compare VAR_CONTEST_CATEGORY, 4
call_if 1, LilycoveCity_ContestLobby_EventScript_21ABA0 call_if_eq LilycoveCity_ContestLobby_EventScript_21ABA0
goto LilycoveCity_ContestLobby_EventScript_21ABA6 goto LilycoveCity_ContestLobby_EventScript_21ABA6
end end
data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+2 -4
View File
@@ -4,10 +4,8 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2
LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3
lock lock
faceplayer faceplayer
checkflag FLAG_TEMP_2 call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9
call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9 call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
checkflag FLAG_TEMP_2
call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
specialvar VAR_RESULT, sub_80C08E4 specialvar VAR_RESULT, sub_80C08E4
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702
data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+1 -2
View File
@@ -5,8 +5,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
checkflag FLAG_TEMP_2 call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR
special sub_8139B60 special sub_8139B60
message gUnknown_08272C1D message gUnknown_08272C1D
data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+9 -9
View File
@@ -5,9 +5,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207
LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D
getpricereduction 3 getpricereduction 3
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220227 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22022B call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22022B
end end
LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227 LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227
@@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268
faceplayer faceplayer
getpricereduction 3 getpricereduction 3
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220282 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282
msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT
release release
end end
@@ -127,22 +127,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328
LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
compare VAR_TEMP_1, 0 compare VAR_TEMP_1, 0
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220305 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220305
compare VAR_TEMP_1, 1 compare VAR_TEMP_1, 1
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22030C call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22030C
compare VAR_TEMP_1, 2 compare VAR_TEMP_1, 2
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220313 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220313
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442
checkitemspace VAR_TEMP_0, 1 checkitemspace VAR_TEMP_0, 1
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450
compare VAR_TEMP_1, 0 compare VAR_TEMP_1, 0
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22031A call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22031A
compare VAR_TEMP_1, 1 compare VAR_TEMP_1, 1
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220321 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220321
compare VAR_TEMP_1, 2 compare VAR_TEMP_1, 2
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220328 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220328
updatemoneybox 0, 0 updatemoneybox 0, 0
nop nop
bufferitemname 0, VAR_TEMP_0 bufferitemname 0, VAR_TEMP_0
data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+6 -6
View File
@@ -36,18 +36,18 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1
incrementgamestat 46 incrementgamestat 46
compare VAR_0x8006, 0 compare VAR_0x8006, 0
call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F77B call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F77B
compare VAR_0x8006, 1 compare VAR_0x8006, 1
call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F784 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F784
bufferitemname 0, VAR_0x8005 bufferitemname 0, VAR_0x8005
compare VAR_0x8004, 1 compare VAR_0x8004, 1
call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7B9 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7B9
compare VAR_0x8004, 2 compare VAR_0x8004, 2
call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7C2 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7C2
compare VAR_0x8004, 3 compare VAR_0x8004, 3
call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7CB call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7CB
compare VAR_0x8004, 4 compare VAR_0x8004, 4
call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7D4
giveitem_std VAR_0x8005 giveitem_std VAR_0x8005
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD
data/maps/LilycoveCity_Harbor/scripts.inc
+20 -20
View File
@@ -152,13 +152,13 @@ LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A
LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C
setvar VAR_TEMP_B, 0 setvar VAR_TEMP_B, 0
compare VAR_TEMP_E, 2 compare VAR_TEMP_E, 2
call_if 1, LilycoveCity_Harbor_EventScript_21E28E call_if_eq LilycoveCity_Harbor_EventScript_21E28E
compare VAR_TEMP_D, 2 compare VAR_TEMP_D, 2
call_if 1, LilycoveCity_Harbor_EventScript_21E294 call_if_eq LilycoveCity_Harbor_EventScript_21E294
compare VAR_TEMP_C, 2 compare VAR_TEMP_C, 2
call_if 1, LilycoveCity_Harbor_EventScript_21E29A call_if_eq LilycoveCity_Harbor_EventScript_21E29A
compare VAR_TEMP_9, 2 compare VAR_TEMP_9, 2
call_if 1, LilycoveCity_Harbor_EventScript_21E2A0 call_if_eq LilycoveCity_Harbor_EventScript_21E2A0
return return
LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E
@@ -180,13 +180,13 @@ LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0
LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6 LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6
setvar VAR_TEMP_A, 0 setvar VAR_TEMP_A, 0
compare VAR_TEMP_E, 1 compare VAR_TEMP_E, 1
call_if 1, LilycoveCity_Harbor_EventScript_21E2D8 call_if_eq LilycoveCity_Harbor_EventScript_21E2D8
compare VAR_TEMP_D, 1 compare VAR_TEMP_D, 1
call_if 1, LilycoveCity_Harbor_EventScript_21E2DE call_if_eq LilycoveCity_Harbor_EventScript_21E2DE
compare VAR_TEMP_C, 1 compare VAR_TEMP_C, 1
call_if 1, LilycoveCity_Harbor_EventScript_21E2E4 call_if_eq LilycoveCity_Harbor_EventScript_21E2E4
compare VAR_TEMP_9, 1 compare VAR_TEMP_9, 1
call_if 1, LilycoveCity_Harbor_EventScript_21E2EA call_if_eq LilycoveCity_Harbor_EventScript_21E2EA
return return
LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8 LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8
@@ -254,25 +254,25 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350
applymovement 4, LilycoveCity_Harbor_Movement_27259A applymovement 4, LilycoveCity_Harbor_Movement_27259A
waitmovement 0 waitmovement 0
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, LilycoveCity_Harbor_EventScript_21E656 call_if_eq LilycoveCity_Harbor_EventScript_21E656
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, LilycoveCity_Harbor_EventScript_21E661 call_if_eq LilycoveCity_Harbor_EventScript_21E661
addobject 5 addobject 5
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, LilycoveCity_Harbor_EventScript_21E675 call_if_eq LilycoveCity_Harbor_EventScript_21E675
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, LilycoveCity_Harbor_EventScript_21E680 call_if_eq LilycoveCity_Harbor_EventScript_21E680
msgbox LilycoveCity_Harbor_Text_2C6951, MSGBOX_DEFAULT msgbox LilycoveCity_Harbor_Text_2C6951, MSGBOX_DEFAULT
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, LilycoveCity_Harbor_EventScript_21E68B call_if_eq LilycoveCity_Harbor_EventScript_21E68B
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, LilycoveCity_Harbor_EventScript_21E696 call_if_eq LilycoveCity_Harbor_EventScript_21E696
msgbox LilycoveCity_Harbor_Text_2C69AA, MSGBOX_DEFAULT msgbox LilycoveCity_Harbor_Text_2C69AA, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 call_if_eq LilycoveCity_Harbor_EventScript_21E6A1
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, LilycoveCity_Harbor_EventScript_21E6BA call_if_eq LilycoveCity_Harbor_EventScript_21E6BA
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
call LilycoveCity_Harbor_EventScript_2721E2 call LilycoveCity_Harbor_EventScript_2721E2
warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
@@ -359,9 +359,9 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514
delay 30 delay 30
removeobject 4 removeobject 4
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, LilycoveCity_Harbor_EventScript_21E61B call_if_eq LilycoveCity_Harbor_EventScript_21E61B
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, LilycoveCity_Harbor_EventScript_21E610 call_if_eq LilycoveCity_Harbor_EventScript_21E610
delay 30 delay 30
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat 255, MAP_PETALBURG_CITY
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
@@ -420,9 +420,9 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC
delay 30 delay 30
hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, LilycoveCity_Harbor_EventScript_21E61B call_if_eq LilycoveCity_Harbor_EventScript_21E61B
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, LilycoveCity_Harbor_EventScript_21E610 call_if_eq LilycoveCity_Harbor_EventScript_21E610
delay 30 delay 30
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat 255, MAP_PETALBURG_CITY
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+16 -16
View File
@@ -74,35 +74,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA
@@ -122,35 +122,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
compare VAR_0x8005, 5 compare VAR_0x8005, 5
goto_if_ge LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4 goto_if_ge LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4
return return
data/maps/LittlerootTown/scripts.inc
+49 -50
View File
@@ -8,23 +8,22 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
setflag FLAG_VISITED_LITTLEROOT_TOWN setflag FLAG_VISITED_LITTLEROOT_TOWN
call LittlerootTown_EventScript_271ED7 call LittlerootTown_EventScript_271ED7
compare VAR_0x4092, 2 compare VAR_0x4092, 2
call_if 1, LittlerootTown_EventScript_1E7E67 call_if_eq LittlerootTown_EventScript_1E7E67
checkflag FLAG_0x052 call_if_unset FLAG_0x052, LittlerootTown_EventScript_1E7E6F
call_if 0, LittlerootTown_EventScript_1E7E6F
compare VAR_0x4050, 3 compare VAR_0x4050, 3
call_if 1, LittlerootTown_EventScript_1E7E92 call_if_eq LittlerootTown_EventScript_1E7E92
compare VAR_0x4082, 4 compare VAR_0x4082, 4
call_if 1, LittlerootTown_EventScript_1E7E5C call_if_eq LittlerootTown_EventScript_1E7E5C
compare VAR_0x408C, 4 compare VAR_0x408C, 4
call_if 1, LittlerootTown_EventScript_1E7E5C call_if_eq LittlerootTown_EventScript_1E7E5C
compare VAR_0x40C7, 1 compare VAR_0x40C7, 1
call_if 1, LittlerootTown_EventScript_1E7E53 call_if_eq LittlerootTown_EventScript_1E7E53
compare VAR_0x408D, 3 compare VAR_0x408D, 3
call_if 1, LittlerootTown_EventScript_1E7E4F call_if_eq LittlerootTown_EventScript_1E7E4F
compare VAR_0x40D3, 1 compare VAR_0x40D3, 1
call_if 1, LittlerootTown_EventScript_1E7E4B call_if_eq LittlerootTown_EventScript_1E7E4B
compare VAR_0x40D3, 2 compare VAR_0x40D3, 2
call_if 1, LittlerootTown_EventScript_1E7E45 call_if_eq LittlerootTown_EventScript_1E7E45
end end
LittlerootTown_EventScript_1E7E45:: @ 81E7E45 LittlerootTown_EventScript_1E7E45:: @ 81E7E45
@@ -70,9 +69,9 @@ LittlerootTown_EventScript_1E7E92:: @ 81E7E92
setobjectmovementtype 4, 8 setobjectmovementtype 4, 8
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_EventScript_1E7EB1 call_if_eq LittlerootTown_EventScript_1E7EB1
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_EventScript_1E7EB9 call_if_eq LittlerootTown_EventScript_1E7EB9
return return
LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1 LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1
@@ -383,9 +382,9 @@ LittlerootTown_EventScript_1E8163:: @ 81E8163
lockall lockall
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_EventScript_1E817D call_if_eq LittlerootTown_EventScript_1E817D
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_EventScript_1E8186 call_if_eq LittlerootTown_EventScript_1E8186
releaseall releaseall
end end
@@ -401,9 +400,9 @@ LittlerootTown_EventScript_1E818F:: @ 81E818F
lockall lockall
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_EventScript_1E81A9 call_if_eq LittlerootTown_EventScript_1E81A9
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_EventScript_1E81B2 call_if_eq LittlerootTown_EventScript_1E81B2
releaseall releaseall
end end
@@ -456,27 +455,27 @@ LittlerootTown_EventScript_1E8205:: @ 81E8205
LittlerootTown_EventScript_1E8211:: @ 81E8211 LittlerootTown_EventScript_1E8211:: @ 81E8211
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_EventScript_1E8297 call_if_eq LittlerootTown_EventScript_1E8297
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_EventScript_1E82A2 call_if_eq LittlerootTown_EventScript_1E82A2
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_EventScript_1E8281 call_if_eq LittlerootTown_EventScript_1E8281
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_EventScript_1E828C call_if_eq LittlerootTown_EventScript_1E828C
msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT
closemessage closemessage
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_EventScript_1E82AD call_if_eq LittlerootTown_EventScript_1E82AD
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_EventScript_1E82F0 call_if_eq LittlerootTown_EventScript_1E82F0
call LittlerootTown_EventScript_1E8693 call LittlerootTown_EventScript_1E8693
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_EventScript_1E8405 call_if_eq LittlerootTown_EventScript_1E8405
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_EventScript_1E8448 call_if_eq LittlerootTown_EventScript_1E8448
goto LittlerootTown_EventScript_1E8686 goto LittlerootTown_EventScript_1E8686
end end
@@ -502,32 +501,32 @@ LittlerootTown_EventScript_1E82A2:: @ 81E82A2
LittlerootTown_EventScript_1E82AD:: @ 81E82AD LittlerootTown_EventScript_1E82AD:: @ 81E82AD
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, LittlerootTown_EventScript_1E8333 call_if_eq LittlerootTown_EventScript_1E8333
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, LittlerootTown_EventScript_1E8348 call_if_eq LittlerootTown_EventScript_1E8348
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, LittlerootTown_EventScript_1E835D call_if_eq LittlerootTown_EventScript_1E835D
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, LittlerootTown_EventScript_1E8372 call_if_eq LittlerootTown_EventScript_1E8372
compare VAR_0x8008, 4 compare VAR_0x8008, 4
call_if 1, LittlerootTown_EventScript_1E8387 call_if_eq LittlerootTown_EventScript_1E8387
compare VAR_0x8008, 5 compare VAR_0x8008, 5
call_if 1, LittlerootTown_EventScript_1E839C call_if_eq LittlerootTown_EventScript_1E839C
return return
LittlerootTown_EventScript_1E82F0:: @ 81E82F0 LittlerootTown_EventScript_1E82F0:: @ 81E82F0
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, LittlerootTown_EventScript_1E8333 call_if_eq LittlerootTown_EventScript_1E8333
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, LittlerootTown_EventScript_1E8348 call_if_eq LittlerootTown_EventScript_1E8348
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, LittlerootTown_EventScript_1E83B1 call_if_eq LittlerootTown_EventScript_1E83B1
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, LittlerootTown_EventScript_1E83C6 call_if_eq LittlerootTown_EventScript_1E83C6
compare VAR_0x8008, 4 compare VAR_0x8008, 4
call_if 1, LittlerootTown_EventScript_1E83DB call_if_eq LittlerootTown_EventScript_1E83DB
compare VAR_0x8008, 5 compare VAR_0x8008, 5
call_if 1, LittlerootTown_EventScript_1E83F0 call_if_eq LittlerootTown_EventScript_1E83F0
return return
LittlerootTown_EventScript_1E8333:: @ 81E8333 LittlerootTown_EventScript_1E8333:: @ 81E8333
@@ -602,32 +601,32 @@ LittlerootTown_EventScript_1E83F0:: @ 81E83F0
LittlerootTown_EventScript_1E8405:: @ 81E8405 LittlerootTown_EventScript_1E8405:: @ 81E8405
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, LittlerootTown_EventScript_1E848B call_if_eq LittlerootTown_EventScript_1E848B
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, LittlerootTown_EventScript_1E8496 call_if_eq LittlerootTown_EventScript_1E8496
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, LittlerootTown_EventScript_1E84A1 call_if_eq LittlerootTown_EventScript_1E84A1
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, LittlerootTown_EventScript_1E84C7 call_if_eq LittlerootTown_EventScript_1E84C7
compare VAR_0x8008, 4 compare VAR_0x8008, 4
call_if 1, LittlerootTown_EventScript_1E84ED call_if_eq LittlerootTown_EventScript_1E84ED
compare VAR_0x8008, 5 compare VAR_0x8008, 5
call_if 1, LittlerootTown_EventScript_1E8513 call_if_eq LittlerootTown_EventScript_1E8513
return return
LittlerootTown_EventScript_1E8448:: @ 81E8448 LittlerootTown_EventScript_1E8448:: @ 81E8448
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, LittlerootTown_EventScript_1E848B call_if_eq LittlerootTown_EventScript_1E848B
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, LittlerootTown_EventScript_1E8496 call_if_eq LittlerootTown_EventScript_1E8496
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, LittlerootTown_EventScript_1E8539 call_if_eq LittlerootTown_EventScript_1E8539
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, LittlerootTown_EventScript_1E855F call_if_eq LittlerootTown_EventScript_1E855F
compare VAR_0x8008, 4 compare VAR_0x8008, 4
call_if 1, LittlerootTown_EventScript_1E8585 call_if_eq LittlerootTown_EventScript_1E8585
compare VAR_0x8008, 5 compare VAR_0x8008, 5
call_if 1, LittlerootTown_EventScript_1E85AB call_if_eq LittlerootTown_EventScript_1E85AB
return return
LittlerootTown_EventScript_1E848B:: @ 81E848B LittlerootTown_EventScript_1E848B:: @ 81E848B
@@ -891,9 +890,9 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D
faceplayer faceplayer
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_EventScript_1E8281 call_if_eq LittlerootTown_EventScript_1E8281
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_EventScript_1E828C call_if_eq LittlerootTown_EventScript_1E828C
call LittlerootTown_EventScript_1E8693 call LittlerootTown_EventScript_1E8693
applymovement 4, LittlerootTown_Movement_2725A6 applymovement 4, LittlerootTown_Movement_2725A6
waitmovement 0 waitmovement 0
data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+12 -13
View File
@@ -6,9 +6,8 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755
LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
compare VAR_0x4092, 6 compare VAR_0x4092, 6
call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_1F777A call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A
checkflag FLAG_0x112 call_if_set FLAG_0x112, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
end end
LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
@@ -28,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A
LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4
compare VAR_0x4092, 3 compare VAR_0x4092, 3
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77DE call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE
compare VAR_0x4092, 5 compare VAR_0x4092, 5
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6
compare VAR_0x4092, 6 compare VAR_0x4092, 6
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2
end end
LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6
@@ -152,22 +151,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A
waitmovement 0 waitmovement 0
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981 call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981
playbgm MUS_BOY_SUP, 1 playbgm MUS_BOY_SUP, 1
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F798C
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F7997
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79A2
msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79C1
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79D3
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79E5
playse SE_KAIDAN playse SE_KAIDAN
removeobject 7 removeobject 7
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+7 -7
View File
@@ -5,11 +5,11 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3
LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
compare VAR_0x408D, 2 compare VAR_0x408D, 2
call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8457 call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457
compare VAR_0x408D, 3 compare VAR_0x408D, 3
call_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F841A call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A
compare VAR_0x4092, 4 compare VAR_0x4092, 4
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2926FE call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE
call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 call LittlerootTown_BrendansHouse_2F_EventScript_275CE1
setvar VAR_0x4089, 0 setvar VAR_0x4089, 0
end end
@@ -74,13 +74,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
delay 10 delay 10
playbgm MUS_BOY_SUP, 1 playbgm MUS_BOY_SUP, 1
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8536 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8565 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594
setvar VAR_0x408D, 3 setvar VAR_0x408D, 3
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+12 -13
View File
@@ -6,9 +6,8 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5
LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5
compare VAR_0x4092, 6 compare VAR_0x4092, 6
call_if 0, LittlerootTown_MaysHouse_1F_EventScript_1F88CA call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA
checkflag FLAG_0x112 call_if_set FLAG_0x112, LittlerootTown_MaysHouse_1F_EventScript_1F88DD
call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F88DD
end end
LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA
@@ -28,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA
LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4
compare VAR_0x4092, 3 compare VAR_0x4092, 3
call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F892E call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E
compare VAR_0x4092, 5 compare VAR_0x4092, 5
call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8916 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916
compare VAR_0x4092, 6 compare VAR_0x4092, 6
call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8922 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922
end end
LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916
@@ -189,22 +188,22 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A
waitmovement 0 waitmovement 0
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A
playbgm MUS_GIRL_SUP, 1 playbgm MUS_GIRL_SUP, 1
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B35
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B40
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B4B
msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B6A
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B7C call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B7C
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B8E
playse SE_KAIDAN playse SE_KAIDAN
removeobject 7 removeobject 7
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+9 -9
View File
@@ -5,11 +5,11 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296
LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
compare VAR_0x408D, 2 compare VAR_0x408D, 2
call_if 0, LittlerootTown_MaysHouse_2F_EventScript_1F930A call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A
compare VAR_0x408D, 3 compare VAR_0x408D, 3
call_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F92CD call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD
compare VAR_0x4092, 4 compare VAR_0x4092, 4
call_if 1, LittlerootTown_MaysHouse_2F_EventScript_2926FE call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE
call LittlerootTown_MaysHouse_2F_EventScript_275CE1 call LittlerootTown_MaysHouse_2F_EventScript_275CE1
setvar VAR_0x4089, 0 setvar VAR_0x4089, 0
end end
@@ -75,13 +75,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
delay 10 delay 10
playbgm MUS_GIRL_SUP, 1 playbgm MUS_GIRL_SUP, 1
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA
compare VAR_FACING, 1 compare VAR_FACING, 1
call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93E9 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9418 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440
setvar VAR_0x408D, 3 setvar VAR_0x408D, 3
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
@@ -272,9 +272,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7
waitmovement 0 waitmovement 0
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F951D call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F951D
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F952F call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F952F
setflag FLAG_0x125 setflag FLAG_0x125
releaseall releaseall
end end
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+14 -14
View File
@@ -172,9 +172,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
waitmovement 0 waitmovement 0
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C
playse SE_PC_ON playse SE_PC_ON
waitse waitse
delay 20 delay 20
@@ -534,9 +534,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
waitmovement 0 waitmovement 0
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F
setvar VAR_0x4084, 5 setvar VAR_0x4084, 5
setflag FLAG_0x074 setflag FLAG_0x074
setvar VAR_0x4051, 1 setvar VAR_0x4051, 1
@@ -549,7 +549,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, MSGBOX_DEFAULT
giveitem_std ITEM_POKE_BALL, 5 giveitem_std ITEM_POKE_BALL, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, MSGBOX_DEFAULT
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
return return
@@ -558,7 +558,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, MSGBOX_DEFAULT
giveitem_std ITEM_POKE_BALL, 5 giveitem_std ITEM_POKE_BALL, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, MSGBOX_DEFAULT
setvar VAR_RESULT, 1 setvar VAR_RESULT, 1
return return
@@ -606,9 +606,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA428
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA431
release release
end end
@@ -623,9 +623,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431
LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA453
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C
release release
end end
@@ -640,9 +640,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C
LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA487
release release
end end
@@ -657,9 +657,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487
LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2
release release
end end
data/maps/MarineCave_End/scripts.inc
+2 -4
View File
@@ -4,8 +4,7 @@ MarineCave_End_MapScripts:: @ 823AFDF
.byte 0 .byte 0
MarineCave_End_MapScript1_23AFEA: @ 823AFEA MarineCave_End_MapScript1_23AFEA: @ 823AFEA
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MarineCave_End_EventScript_23AFF4
call_if 1, MarineCave_End_EventScript_23AFF4
end end
MarineCave_End_EventScript_23AFF4:: @ 823AFF4 MarineCave_End_EventScript_23AFF4:: @ 823AFF4
@@ -16,8 +15,7 @@ MarineCave_End_EventScript_23AFF4:: @ 823AFF4
return return
MarineCave_End_MapScript1_23B008: @ 823B008 MarineCave_End_MapScript1_23B008: @ 823B008
checkflag FLAG_0x1BE call_if_unset FLAG_0x1BE, MarineCave_End_EventScript_23B012
call_if 0, MarineCave_End_EventScript_23B012
end end
MarineCave_End_EventScript_23B012:: @ 823B012 MarineCave_End_EventScript_23B012:: @ 823B012
data/maps/MauvilleCity/scripts.inc
+6 -7
View File
@@ -9,8 +9,7 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B
setflag FLAG_SYS_TV_START setflag FLAG_SYS_TV_START
clearflag FLAG_0x063 clearflag FLAG_0x063
setvar VAR_0x4093, 0 setvar VAR_0x4093, 0
checkflag FLAG_GOT_TM24_FROM_WATTSON call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9
call_if 1, MauvilleCity_EventScript_1DF3A9
end end
MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
@@ -105,7 +104,7 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452
MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, MauvilleCity_EventScript_1DF63A call_if_eq MauvilleCity_EventScript_1DF63A
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq MauvilleCity_EventScript_1DF683 goto_if_eq MauvilleCity_EventScript_1DF683
closemessage closemessage
@@ -162,18 +161,18 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
setvar VAR_0x40F2, 0 setvar VAR_0x40F2, 0
setflag FLAG_0x088 setflag FLAG_0x088
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, MauvilleCity_EventScript_1DF5F3 call_if_eq MauvilleCity_EventScript_1DF5F3
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, MauvilleCity_EventScript_1DF601 call_if_eq MauvilleCity_EventScript_1DF601
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
closemessage closemessage
addvar VAR_0x40D1, 1 addvar VAR_0x40D1, 1
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, MauvilleCity_EventScript_1DF616 call_if_eq MauvilleCity_EventScript_1DF616
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, MauvilleCity_EventScript_1DF628 call_if_eq MauvilleCity_EventScript_1DF628
removeobject 11 removeobject 11
releaseall releaseall
end end
data/maps/MauvilleCity_Gym/scripts.inc
+1 -1
View File
@@ -96,7 +96,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
setflag FLAG_BADGE03_GET setflag FLAG_BADGE03_GET
addvar VAR_0x4085, 1 addvar VAR_0x4085, 1
compare VAR_0x4085, 6 compare VAR_0x4085, 6
call_if 1, MauvilleCity_Gym_EventScript_271E84 call_if_eq MauvilleCity_Gym_EventScript_271E84
setvar VAR_0x8008, 3 setvar VAR_0x8008, 3
call MauvilleCity_Gym_EventScript_271F43 call MauvilleCity_Gym_EventScript_271F43
special MauvilleGymSpecial3 special MauvilleGymSpecial3
data/maps/MeteorFalls_1F_1R/scripts.inc
+1 -2
View File
@@ -3,8 +3,7 @@ MeteorFalls_1F_1R_MapScripts:: @ 822BD2A
.byte 0 .byte 0
MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30
checkflag FLAG_SYS_GAME_CLEAR call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_22BD3A
call_if 1, MeteorFalls_1F_1R_EventScript_22BD3A
end end
MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A
data/maps/MossdeepCity/scripts.inc
+3 -4
View File
@@ -7,8 +7,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C
clearflag FLAG_0x065 clearflag FLAG_0x065
clearflag FLAG_0x066 clearflag FLAG_0x066
clearflag FLAG_0x067 clearflag FLAG_0x067
checkflag FLAG_SYS_WEATHER_CTRL call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A
call_if 1, MossdeepCity_EventScript_27207A
end end
MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2
@@ -257,9 +256,9 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85
msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, MossdeepCity_EventScript_1E4CB0 call_if_eq MossdeepCity_EventScript_1E4CB0
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, MossdeepCity_EventScript_1E4CC2 call_if_eq MossdeepCity_EventScript_1E4CC2
addvar VAR_0x40D1, 1 addvar VAR_0x40D1, 1
removeobject 16 removeobject 16
release release
data/maps/MossdeepCity_House2/scripts.inc
+2 -2
View File
@@ -20,9 +20,9 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1
setflag FLAG_0x0E0 setflag FLAG_0x0E0
clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, MossdeepCity_House2_EventScript_222124 call_if_eq MossdeepCity_House2_EventScript_222124
compare VAR_FACING, 3 compare VAR_FACING, 3
call_if 1, MossdeepCity_House2_EventScript_22212F call_if_eq MossdeepCity_House2_EventScript_22212F
removeobject 3 removeobject 3
release release
end end
data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+4 -4
View File
@@ -56,9 +56,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
specialvar VAR_RESULT, GetWeekCount specialvar VAR_RESULT, GetWeekCount
buffernumberstring 0, VAR_RESULT buffernumberstring 0, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012 call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223012
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22301B call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B
closemessage closemessage
applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
waitmovement 0 waitmovement 0
@@ -78,9 +78,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024
specialvar VAR_RESULT, GetWeekCount specialvar VAR_RESULT, GetWeekCount
buffernumberstring 0, VAR_RESULT buffernumberstring 0, VAR_RESULT
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051 call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223051
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22305A call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A
closemessage closemessage
applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
waitmovement 0 waitmovement 0
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+4 -4
View File
@@ -5,9 +5,9 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58
MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63
compare VAR_0x405D, 2 compare VAR_0x405D, 2
call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D7A call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A
compare VAR_0x409F, 2 compare VAR_0x409F, 2
call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D9F call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F
end end
MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A
@@ -350,9 +350,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175
lockall lockall
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_224193 call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_224193
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_22419A call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A
closemessage closemessage
clearflag FLAG_0x075 clearflag FLAG_0x075
releaseall releaseall
data/maps/MossdeepCity_StevensHouse/scripts.inc
+2 -3
View File
@@ -5,8 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 8222784
.byte 0 .byte 0
MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794 MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794
checkflag FLAG_SYS_GAME_CLEAR call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_22279E
call_if 0, MossdeepCity_StevensHouse_EventScript_22279E
end end
MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
@@ -15,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8
compare VAR_0x40C6, 2 compare VAR_0x40C6, 2
call_if 1, MossdeepCity_StevensHouse_EventScript_2227B4 call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4
end end
MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4
data/maps/MtChimney/scripts.inc
+7 -9
View File
@@ -14,10 +14,8 @@ MtChimney_MapScript1_22EDD2: @ 822EDD2
MtChimney_EventScript_22EDD5:: @ 822EDD5 MtChimney_EventScript_22EDD5:: @ 822EDD5
lock lock
faceplayer faceplayer
checkflag FLAG_0x0DB call_if_unset FLAG_0x0DB, MtChimney_EventScript_22EDF9
call_if 0, MtChimney_EventScript_22EDF9 call_if_set FLAG_0x0DB, MtChimney_EventScript_22EE02
checkflag FLAG_0x0DB
call_if 1, MtChimney_EventScript_22EE02
closemessage closemessage
applymovement 1, MtChimney_Movement_2725A2 applymovement 1, MtChimney_Movement_2725A2
waitmovement 0 waitmovement 0
@@ -59,17 +57,17 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
setobjectxyperm 1, 10, 12 setobjectxyperm 1, 10, 12
addobject 1 addobject 1
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, MtChimney_EventScript_22EEC7 call_if_eq MtChimney_EventScript_22EEC7
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, MtChimney_EventScript_22EED2 call_if_eq MtChimney_EventScript_22EED2
applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4 applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4
waitmovement 0 waitmovement 0
msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 4 compare VAR_FACING, 4
call_if 1, MtChimney_EventScript_22EEDD call_if_eq MtChimney_EventScript_22EEDD
compare VAR_FACING, 2 compare VAR_FACING, 2
call_if 1, MtChimney_EventScript_22EEE8 call_if_eq MtChimney_EventScript_22EEE8
removeobject 1 removeobject 1
setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
setflag FLAG_0x08B setflag FLAG_0x08B
@@ -112,7 +110,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3
msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT
checkitemspace ITEM_LAVA_COOKIE, 1 checkitemspace ITEM_LAVA_COOKIE, 1
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, MtChimney_EventScript_22EF5E call_if_eq MtChimney_EventScript_22EF5E
giveitem_std ITEM_LAVA_COOKIE giveitem_std ITEM_LAVA_COOKIE
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq MtChimney_EventScript_22EF51 goto_if_eq MtChimney_EventScript_22EF51
data/maps/MtChimney_CableCarStation/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA
MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05
compare VAR_0x40A3, 1 compare VAR_0x40A3, 1
call_if 1, MtChimney_CableCarStation_EventScript_22AC11 call_if_eq MtChimney_CableCarStation_EventScript_22AC11
end end
MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11
data/maps/MtPyre_Summit/scripts.inc
+21 -21
View File
@@ -4,7 +4,7 @@ MtPyre_Summit_MapScripts:: @ 8231FF7
MtPyre_Summit_MapScript1_231FFD: @ 8231FFD MtPyre_Summit_MapScript1_231FFD: @ 8231FFD
compare VAR_0x40B9, 2 compare VAR_0x40B9, 2
call_if 1, MtPyre_Summit_EventScript_232009 call_if_eq MtPyre_Summit_EventScript_232009
end end
MtPyre_Summit_EventScript_232009:: @ 8232009 MtPyre_Summit_EventScript_232009:: @ 8232009
@@ -38,11 +38,11 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
waitmovement 0 waitmovement 0
delay 50 delay 50
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, MtPyre_Summit_EventScript_2320E0 call_if_eq MtPyre_Summit_EventScript_2320E0
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, MtPyre_Summit_EventScript_2320EB call_if_eq MtPyre_Summit_EventScript_2320EB
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, MtPyre_Summit_EventScript_2320EC call_if_eq MtPyre_Summit_EventScript_2320EC
msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT
closemessage closemessage
fadescreen 1 fadescreen 1
@@ -58,11 +58,11 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
delay 20 delay 20
setvar VAR_0x40B9, 1 setvar VAR_0x40B9, 1
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, MtPyre_Summit_EventScript_2320F7 call_if_eq MtPyre_Summit_EventScript_2320F7
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, MtPyre_Summit_EventScript_23210C call_if_eq MtPyre_Summit_EventScript_23210C
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, MtPyre_Summit_EventScript_232117 call_if_eq MtPyre_Summit_EventScript_232117
msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT
giveitem_std ITEM_MAGMA_EMBLEM giveitem_std ITEM_MAGMA_EMBLEM
setflag FLAG_0x0D4 setflag FLAG_0x0D4
@@ -134,18 +134,18 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C
goto_if_set FLAG_0x09E, MtPyre_Summit_EventScript_232167 goto_if_set FLAG_0x09E, MtPyre_Summit_EventScript_232167
msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, MtPyre_Summit_EventScript_232187 call_if_eq MtPyre_Summit_EventScript_232187
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, MtPyre_Summit_EventScript_232190 call_if_eq MtPyre_Summit_EventScript_232190
release release
end end
MtPyre_Summit_EventScript_232167:: @ 8232167 MtPyre_Summit_EventScript_232167:: @ 8232167
msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, MtPyre_Summit_EventScript_232199 call_if_eq MtPyre_Summit_EventScript_232199
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, MtPyre_Summit_EventScript_232190 call_if_eq MtPyre_Summit_EventScript_232190
release release
end end
@@ -166,7 +166,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2
faceplayer faceplayer
goto_if_set FLAG_0x103, MtPyre_Summit_EventScript_2321E2 goto_if_set FLAG_0x103, MtPyre_Summit_EventScript_2321E2
compare VAR_0x40B9, 3 compare VAR_0x40B9, 3
call_if 4, MtPyre_Summit_EventScript_2321CB call_if_ge MtPyre_Summit_EventScript_2321CB
goto_if_set FLAG_0x081, MtPyre_Summit_EventScript_2321D8 goto_if_set FLAG_0x081, MtPyre_Summit_EventScript_2321D8
msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT
release release
@@ -211,11 +211,11 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
waitmovement 0 waitmovement 0
delay 60 delay 60
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, MtPyre_Summit_EventScript_2322C4 call_if_eq MtPyre_Summit_EventScript_2322C4
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, MtPyre_Summit_EventScript_2322DD call_if_eq MtPyre_Summit_EventScript_2322DD
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, MtPyre_Summit_EventScript_2322F6 call_if_eq MtPyre_Summit_EventScript_2322F6
playse SE_PIN playse SE_PIN
applymovement 8, MtPyre_Summit_Movement_272598 applymovement 8, MtPyre_Summit_Movement_272598
waitmovement 0 waitmovement 0
@@ -223,19 +223,19 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
waitmovement 0 waitmovement 0
delay 30 delay 30
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, MtPyre_Summit_EventScript_23230F call_if_eq MtPyre_Summit_EventScript_23230F
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, MtPyre_Summit_EventScript_232328 call_if_eq MtPyre_Summit_EventScript_232328
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, MtPyre_Summit_EventScript_232341 call_if_eq MtPyre_Summit_EventScript_232341
msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, MtPyre_Summit_EventScript_23235A call_if_eq MtPyre_Summit_EventScript_23235A
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, MtPyre_Summit_EventScript_232376 call_if_eq MtPyre_Summit_EventScript_232376
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, MtPyre_Summit_EventScript_232392 call_if_eq MtPyre_Summit_EventScript_232392
delay 30 delay 30
applymovement 2, MtPyre_Summit_Movement_2323B6 applymovement 2, MtPyre_Summit_Movement_2323B6
applymovement 8, MtPyre_Summit_Movement_2323BD applymovement 8, MtPyre_Summit_Movement_2323BD
data/maps/NavelRock_Bottom/scripts.inc
+3 -6
View File
@@ -4,10 +4,8 @@ NavelRock_Bottom_MapScripts:: @ 8269255
.byte 0 .byte 0
NavelRock_Bottom_MapScript1_269260: @ 8269260 NavelRock_Bottom_MapScript1_269260: @ 8269260
checkflag FLAG_0x091 call_if_set FLAG_0x091, NavelRock_Bottom_EventScript_269273
call_if 1, NavelRock_Bottom_EventScript_269273 call_if_unset FLAG_0x091, NavelRock_Bottom_EventScript_269277
checkflag FLAG_0x091
call_if 0, NavelRock_Bottom_EventScript_269277
end end
NavelRock_Bottom_EventScript_269273:: @ 8269273 NavelRock_Bottom_EventScript_269273:: @ 8269273
@@ -20,8 +18,7 @@ NavelRock_Bottom_EventScript_269277:: @ 8269277
return return
NavelRock_Bottom_MapScript1_269284: @ 8269284 NavelRock_Bottom_MapScript1_269284: @ 8269284
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Bottom_EventScript_26928E
call_if 1, NavelRock_Bottom_EventScript_26928E
end end
NavelRock_Bottom_EventScript_26928E:: @ 826928E NavelRock_Bottom_EventScript_26928E:: @ 826928E
data/maps/NavelRock_Top/scripts.inc
+3 -6
View File
@@ -4,10 +4,8 @@ NavelRock_Top_MapScripts:: @ 8269113
.byte 0 .byte 0
NavelRock_Top_MapScript1_26911E: @ 826911E NavelRock_Top_MapScript1_26911E: @ 826911E
checkflag FLAG_0x092 call_if_set FLAG_0x092, NavelRock_Top_EventScript_269131
call_if 1, NavelRock_Top_EventScript_269131 call_if_unset FLAG_0x092, NavelRock_Top_EventScript_26913A
checkflag FLAG_0x092
call_if 0, NavelRock_Top_EventScript_26913A
end end
NavelRock_Top_EventScript_269131:: @ 8269131 NavelRock_Top_EventScript_269131:: @ 8269131
@@ -23,8 +21,7 @@ NavelRock_Top_EventScript_26913A:: @ 826913A
return return
NavelRock_Top_MapScript1_269151: @ 8269151 NavelRock_Top_MapScript1_269151: @ 8269151
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Top_EventScript_26915B
call_if 1, NavelRock_Top_EventScript_26915B
end end
NavelRock_Top_EventScript_26915B:: @ 826915B NavelRock_Top_EventScript_26915B:: @ 826915B
data/maps/NewMauville_Entrance/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ NewMauville_Entrance_MapScripts:: @ 82372AD
NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
compare VAR_0x40BA, 0 compare VAR_0x40BA, 0
call_if 1, NewMauville_Entrance_EventScript_2372C4 call_if_eq NewMauville_Entrance_EventScript_2372C4
end end
NewMauville_Entrance_EventScript_2372C4:: @ 82372C4 NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
data/maps/NewMauville_Inside/scripts.inc
+7 -11
View File
@@ -6,11 +6,10 @@ NewMauville_Inside_MapScripts:: @ 82373D7
NewMauville_Inside_MapScript1_2373E7: @ 82373E7 NewMauville_Inside_MapScript1_2373E7: @ 82373E7
compare VAR_TEMP_1, 1 compare VAR_TEMP_1, 1
call_if 1, NewMauville_Inside_EventScript_237489 call_if_eq NewMauville_Inside_EventScript_237489
compare VAR_TEMP_2, 1 compare VAR_TEMP_2, 1
call_if 1, NewMauville_Inside_EventScript_2375D7 call_if_eq NewMauville_Inside_EventScript_2375D7
checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_237407
call_if 1, NewMauville_Inside_EventScript_237407
end end
NewMauville_Inside_EventScript_237407:: @ 8237407 NewMauville_Inside_EventScript_237407:: @ 8237407
@@ -23,12 +22,9 @@ NewMauville_Inside_EventScript_237407:: @ 8237407
NewMauville_Inside_MapScript1_23741B: @ 823741B NewMauville_Inside_MapScript1_23741B: @ 823741B
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
setvar VAR_TEMP_2, 0 setvar VAR_TEMP_2, 0
checkflag FLAG_0x1C1 call_if_unset FLAG_0x1C1, NewMauville_Inside_EventScript_237441
call_if 0, NewMauville_Inside_EventScript_237441 call_if_unset FLAG_0x1C2, NewMauville_Inside_EventScript_237445
checkflag FLAG_0x1C2 call_if_unset FLAG_0x1C3, NewMauville_Inside_EventScript_237449
call_if 0, NewMauville_Inside_EventScript_237445
checkflag FLAG_0x1C3
call_if 0, NewMauville_Inside_EventScript_237449
end end
NewMauville_Inside_EventScript_237441:: @ 8237441 NewMauville_Inside_EventScript_237441:: @ 8237441
@@ -45,7 +41,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449
NewMauville_Inside_MapScript1_23744D: @ 823744D NewMauville_Inside_MapScript1_23744D: @ 823744D
compare VAR_0x40BA, 2 compare VAR_0x40BA, 2
call_if 1, NewMauville_Inside_EventScript_23773A call_if_eq NewMauville_Inside_EventScript_23773A
end end
NewMauville_Inside_EventScript_237459:: @ 8237459 NewMauville_Inside_EventScript_237459:: @ 8237459
data/maps/OldaleTown/scripts.inc
+5 -8
View File
@@ -5,12 +5,9 @@ OldaleTown_MapScripts:: @ 81E8EA2
OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8
call OldaleTown_EventScript_271ED7 call OldaleTown_EventScript_271ED7
setflag FLAG_VISITED_OLDALE_TOWN setflag FLAG_VISITED_OLDALE_TOWN
checkflag FLAG_0x074 call_if_unset FLAG_0x074, OldaleTown_EventScript_1E8ED2
call_if 0, OldaleTown_EventScript_1E8ED2 call_if_unset FLAG_0x084, OldaleTown_EventScript_1E8EDE
checkflag FLAG_0x084 call_if_set FLAG_0x074, OldaleTown_EventScript_1E8ECC
call_if 0, OldaleTown_EventScript_1E8EDE
checkflag FLAG_0x074
call_if 1, OldaleTown_EventScript_1E8ECC
end end
OldaleTown_EventScript_1E8ECC:: @ 81E8ECC OldaleTown_EventScript_1E8ECC:: @ 81E8ECC
@@ -277,9 +274,9 @@ OldaleTown_EventScript_1E910C:: @ 81E910C
OldaleTown_EventScript_1E911A:: @ 81E911A OldaleTown_EventScript_1E911A:: @ 81E911A
closemessage closemessage
compare VAR_0x8009, 0 compare VAR_0x8009, 0
call_if 1, OldaleTown_EventScript_1E9148 call_if_eq OldaleTown_EventScript_1E9148
compare VAR_0x8009, 1 compare VAR_0x8009, 1
call_if 1, OldaleTown_EventScript_1E915E call_if_eq OldaleTown_EventScript_1E915E
applymovement 4, OldaleTown_Movement_1E9177 applymovement 4, OldaleTown_Movement_1E9177
waitmovement 0 waitmovement 0
removeobject 4 removeobject 4
data/maps/PacifidlogTown_House2/scripts.inc
+3 -5
View File
@@ -7,10 +7,8 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792
dodailyevents dodailyevents
call PacifidlogTown_House2_EventScript_2037DE call PacifidlogTown_House2_EventScript_2037DE
goto_if_set FLAG_0x12B, PacifidlogTown_House2_EventScript_20387E goto_if_set FLAG_0x12B, PacifidlogTown_House2_EventScript_20387E
checkflag FLAG_0x12C call_if_set FLAG_0x12C, PacifidlogTown_House2_EventScript_2037F8
call_if 1, PacifidlogTown_House2_EventScript_2037F8 call_if_unset FLAG_0x12C, PacifidlogTown_House2_EventScript_203801
checkflag FLAG_0x12C
call_if 0, PacifidlogTown_House2_EventScript_203801
setflag FLAG_0x12C setflag FLAG_0x12C
specialvar VAR_RESULT, GetLeadMonFriendshipScore specialvar VAR_RESULT, GetLeadMonFriendshipScore
compare VAR_RESULT, 4 compare VAR_RESULT, 4
@@ -25,7 +23,7 @@ PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE
goto_if_unset FLAG_0x12B, PacifidlogTown_House2_EventScript_27374E goto_if_unset FLAG_0x12B, PacifidlogTown_House2_EventScript_27374E
specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, PacifidlogTown_House2_EventScript_203812 call_if_eq PacifidlogTown_House2_EventScript_203812
return return
PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8
data/maps/PetalburgCity/scripts.inc
+16 -16
View File
@@ -1,13 +1,13 @@
PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7
setflag FLAG_VISITED_PETALBURG_CITY setflag FLAG_VISITED_PETALBURG_CITY
compare VAR_0x4057, 0 compare VAR_0x4057, 0
call_if 1, PetalburgCity_EventScript_1DC307 call_if_eq PetalburgCity_EventScript_1DC307
compare VAR_0x4057, 2 compare VAR_0x4057, 2
call_if 1, PetalburgCity_EventScript_1DC30F call_if_eq PetalburgCity_EventScript_1DC30F
compare VAR_0x4057, 4 compare VAR_0x4057, 4
call_if 1, PetalburgCity_EventScript_1DC30F call_if_eq PetalburgCity_EventScript_1DC30F
compare VAR_0x4085, 8 compare VAR_0x4085, 8
call_if 1, PetalburgCity_EventScript_1DC316 call_if_eq PetalburgCity_EventScript_1DC316
end end
PetalburgCity_EventScript_1DC307:: @ 81DC307 PetalburgCity_EventScript_1DC307:: @ 81DC307
@@ -267,23 +267,23 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
applymovement 8, PetalburgCity_Movement_27259A applymovement 8, PetalburgCity_Movement_27259A
waitmovement 0 waitmovement 0
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, PetalburgCity_EventScript_1DC57F call_if_eq PetalburgCity_EventScript_1DC57F
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_EventScript_1DC594 call_if_eq PetalburgCity_EventScript_1DC594
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_EventScript_1DC59F call_if_eq PetalburgCity_EventScript_1DC59F
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_EventScript_1DC5B4 call_if_eq PetalburgCity_EventScript_1DC5B4
msgbox PetalburgCity_Text_1DC881, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1DC881, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, PetalburgCity_EventScript_1DC5C9 call_if_eq PetalburgCity_EventScript_1DC5C9
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_EventScript_1DC5DB call_if_eq PetalburgCity_EventScript_1DC5DB
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_EventScript_1DC5ED call_if_eq PetalburgCity_EventScript_1DC5ED
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_EventScript_1DC5FF call_if_eq PetalburgCity_EventScript_1DC5FF
msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT
applymovement 8, PetalburgCity_Movement_2725A8 applymovement 8, PetalburgCity_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8
@@ -560,13 +560,13 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9
msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, PetalburgCity_EventScript_1DC78E call_if_eq PetalburgCity_EventScript_1DC78E
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_EventScript_1DC7A0 call_if_eq PetalburgCity_EventScript_1DC7A0
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_EventScript_1DC7B2 call_if_eq PetalburgCity_EventScript_1DC7B2
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_EventScript_1DC7C4 call_if_eq PetalburgCity_EventScript_1DC7C4
setvar VAR_0x40C9, 1 setvar VAR_0x40C9, 1
removeobject 9 removeobject 9
releaseall releaseall
data/maps/PetalburgCity_Gym/scripts.inc
+60 -61
View File
@@ -9,26 +9,26 @@ PetalburgCity_Gym_MapScript1_20489E: @ 820489E
compare VAR_0x4085, 6 compare VAR_0x4085, 6
goto_if_eq PetalburgCity_Gym_EventScript_2048B5 goto_if_eq PetalburgCity_Gym_EventScript_2048B5
compare VAR_0x4085, 7 compare VAR_0x4085, 7
call_if 4, PetalburgCity_Gym_EventScript_2048FF call_if_ge PetalburgCity_Gym_EventScript_2048FF
end end
PetalburgCity_Gym_EventScript_2048B5:: @ 82048B5 PetalburgCity_Gym_EventScript_2048B5:: @ 82048B5
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
call PetalburgCity_Gym_EventScript_20555E call PetalburgCity_Gym_EventScript_20555E
checktrainerflag TRAINER_RANDALL checktrainerflag TRAINER_RANDALL
call_if 1, PetalburgCity_Gym_EventScript_20557F call_if_eq PetalburgCity_Gym_EventScript_20557F
checktrainerflag TRAINER_MARY checktrainerflag TRAINER_MARY
call_if 1, PetalburgCity_Gym_EventScript_2055A0 call_if_eq PetalburgCity_Gym_EventScript_2055A0
checktrainerflag TRAINER_PARKER checktrainerflag TRAINER_PARKER
call_if 1, PetalburgCity_Gym_EventScript_2055C1 call_if_eq PetalburgCity_Gym_EventScript_2055C1
checktrainerflag TRAINER_ALEXIA checktrainerflag TRAINER_ALEXIA
call_if 1, PetalburgCity_Gym_EventScript_2055E2 call_if_eq PetalburgCity_Gym_EventScript_2055E2
checktrainerflag TRAINER_GEORGE checktrainerflag TRAINER_GEORGE
call_if 1, PetalburgCity_Gym_EventScript_205603 call_if_eq PetalburgCity_Gym_EventScript_205603
checktrainerflag TRAINER_JODY checktrainerflag TRAINER_JODY
call_if 1, PetalburgCity_Gym_EventScript_205624 call_if_eq PetalburgCity_Gym_EventScript_205624
checktrainerflag TRAINER_BERKE checktrainerflag TRAINER_BERKE
call_if 1, PetalburgCity_Gym_EventScript_205645 call_if_eq PetalburgCity_Gym_EventScript_205645
end end
PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF
@@ -45,11 +45,10 @@ PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF
PetalburgCity_Gym_MapScript1_20492D: @ 820492D PetalburgCity_Gym_MapScript1_20492D: @ 820492D
compare VAR_0x4085, 1 compare VAR_0x4085, 1
call_if 1, PetalburgCity_Gym_EventScript_20494D call_if_eq PetalburgCity_Gym_EventScript_20494D
compare VAR_0x4085, 6 compare VAR_0x4085, 6
call_if 0, PetalburgCity_Gym_EventScript_204955 call_if_lt PetalburgCity_Gym_EventScript_204955
checkflag FLAG_SYS_GAME_CLEAR call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20495D
call_if 1, PetalburgCity_Gym_EventScript_20495D
end end
PetalburgCity_Gym_EventScript_20494D:: @ 820494D PetalburgCity_Gym_EventScript_20494D:: @ 820494D
@@ -156,65 +155,65 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC
addobject 10 addobject 10
playse SE_DOOR playse SE_DOOR
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, PetalburgCity_Gym_EventScript_204C31 call_if_eq PetalburgCity_Gym_EventScript_204C31
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_Gym_EventScript_204C43 call_if_eq PetalburgCity_Gym_EventScript_204C43
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_Gym_EventScript_204C5F call_if_eq PetalburgCity_Gym_EventScript_204C5F
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_Gym_EventScript_204C5F call_if_eq PetalburgCity_Gym_EventScript_204C5F
msgbox PetalburgCity_Gym_Text_2058B1, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_2058B1, MSGBOX_DEFAULT
msgbox PetalburgCity_Gym_Text_2058DB, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_2058DB, MSGBOX_DEFAULT
msgbox PetalburgCity_Gym_Text_205910, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205910, MSGBOX_DEFAULT
msgbox PetalburgCity_Gym_Text_2059D8, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_2059D8, MSGBOX_DEFAULT
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, PetalburgCity_Gym_EventScript_204CC7 call_if_eq PetalburgCity_Gym_EventScript_204CC7
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_Gym_EventScript_204CD2 call_if_eq PetalburgCity_Gym_EventScript_204CD2
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_Gym_EventScript_204CE4 call_if_eq PetalburgCity_Gym_EventScript_204CE4
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_Gym_EventScript_204CF6 call_if_eq PetalburgCity_Gym_EventScript_204CF6
msgbox PetalburgCity_Gym_Text_2059E8, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_2059E8, MSGBOX_DEFAULT
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, PetalburgCity_Gym_EventScript_204D08 call_if_eq PetalburgCity_Gym_EventScript_204D08
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_Gym_EventScript_204D13 call_if_eq PetalburgCity_Gym_EventScript_204D13
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_Gym_EventScript_204D1E call_if_eq PetalburgCity_Gym_EventScript_204D1E
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_Gym_EventScript_204D29 call_if_eq PetalburgCity_Gym_EventScript_204D29
msgbox PetalburgCity_Gym_Text_205A46, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205A46, MSGBOX_DEFAULT
msgbox PetalburgCity_Gym_Text_205A89, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205A89, MSGBOX_DEFAULT
msgbox PetalburgCity_Gym_Text_205AF4, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205AF4, MSGBOX_DEFAULT
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, PetalburgCity_Gym_EventScript_204D72 call_if_eq PetalburgCity_Gym_EventScript_204D72
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_Gym_EventScript_204D73 call_if_eq PetalburgCity_Gym_EventScript_204D73
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_Gym_EventScript_204D7E call_if_eq PetalburgCity_Gym_EventScript_204D7E
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_Gym_EventScript_204D7F call_if_eq PetalburgCity_Gym_EventScript_204D7F
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, PetalburgCity_Gym_EventScript_204D34 call_if_eq PetalburgCity_Gym_EventScript_204D34
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_Gym_EventScript_204D3F call_if_eq PetalburgCity_Gym_EventScript_204D3F
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_Gym_EventScript_204D34 call_if_eq PetalburgCity_Gym_EventScript_204D34
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_Gym_EventScript_204D34 call_if_eq PetalburgCity_Gym_EventScript_204D34
msgbox PetalburgCity_Gym_Text_205B0F, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205B0F, MSGBOX_DEFAULT
closemessage closemessage
setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_SPECIAL_FLAG_0x4001
playbgm MUS_TSURETEK, 0 playbgm MUS_TSURETEK, 0
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, PetalburgCity_Gym_EventScript_204C78 call_if_eq PetalburgCity_Gym_EventScript_204C78
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_Gym_EventScript_204C91 call_if_eq PetalburgCity_Gym_EventScript_204C91
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_Gym_EventScript_204CA3 call_if_eq PetalburgCity_Gym_EventScript_204CA3
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_Gym_EventScript_204CB5 call_if_eq PetalburgCity_Gym_EventScript_204CB5
removeobject 10 removeobject 10
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
setvar VAR_0x4085, 1 setvar VAR_0x4085, 1
@@ -472,30 +471,30 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13
waitmovement 0 waitmovement 0
delay 10 delay 10
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_Gym_EventScript_204FED call_if_eq PetalburgCity_Gym_EventScript_204FED
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_Gym_EventScript_205009 call_if_eq PetalburgCity_Gym_EventScript_205009
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_Gym_EventScript_205025 call_if_eq PetalburgCity_Gym_EventScript_205025
msgbox PetalburgCity_Gym_Text_206377, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_206377, MSGBOX_DEFAULT
closemessage closemessage
delay 20 delay 20
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_Gym_EventScript_204FCC call_if_eq PetalburgCity_Gym_EventScript_204FCC
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_Gym_EventScript_204FD7 call_if_eq PetalburgCity_Gym_EventScript_204FD7
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_Gym_EventScript_204FE2 call_if_eq PetalburgCity_Gym_EventScript_204FE2
msgbox PetalburgCity_Gym_Text_2063CA, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_2063CA, MSGBOX_DEFAULT
closemessage closemessage
setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_SPECIAL_FLAG_0x4001
playbgm MUS_TSURETEK, 0 playbgm MUS_TSURETEK, 0
compare VAR_0x8008, 1 compare VAR_0x8008, 1
call_if 1, PetalburgCity_Gym_EventScript_205041 call_if_eq PetalburgCity_Gym_EventScript_205041
compare VAR_0x8008, 2 compare VAR_0x8008, 2
call_if 1, PetalburgCity_Gym_EventScript_20505A call_if_eq PetalburgCity_Gym_EventScript_20505A
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if 1, PetalburgCity_Gym_EventScript_20506C call_if_eq PetalburgCity_Gym_EventScript_20506C
removeobject 11 removeobject 11
setvar VAR_0x4057, 4 setvar VAR_0x4057, 4
clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
@@ -1077,72 +1076,72 @@ PetalburgCity_Gym_EventScript_205555:: @ 8205555
PetalburgCity_Gym_EventScript_20555E:: @ 820555E PetalburgCity_Gym_EventScript_20555E:: @ 820555E
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if 1, PetalburgCity_Gym_EventScript_205746 call_if_eq PetalburgCity_Gym_EventScript_205746
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if 1, PetalburgCity_Gym_EventScript_20574B call_if_eq PetalburgCity_Gym_EventScript_20574B
call PetalburgCity_Gym_EventScript_205666 call PetalburgCity_Gym_EventScript_205666
return return
PetalburgCity_Gym_EventScript_20557F:: @ 820557F PetalburgCity_Gym_EventScript_20557F:: @ 820557F
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if 1, PetalburgCity_Gym_EventScript_205746 call_if_eq PetalburgCity_Gym_EventScript_205746
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if 1, PetalburgCity_Gym_EventScript_20574B call_if_eq PetalburgCity_Gym_EventScript_20574B
call PetalburgCity_Gym_EventScript_20568B call PetalburgCity_Gym_EventScript_20568B
return return
PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0 PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if 1, PetalburgCity_Gym_EventScript_205746 call_if_eq PetalburgCity_Gym_EventScript_205746
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if 1, PetalburgCity_Gym_EventScript_20574B call_if_eq PetalburgCity_Gym_EventScript_20574B
call PetalburgCity_Gym_EventScript_2056B0 call PetalburgCity_Gym_EventScript_2056B0
return return
PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1 PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if 1, PetalburgCity_Gym_EventScript_205746 call_if_eq PetalburgCity_Gym_EventScript_205746
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if 1, PetalburgCity_Gym_EventScript_20574B call_if_eq PetalburgCity_Gym_EventScript_20574B
call PetalburgCity_Gym_EventScript_2056D5 call PetalburgCity_Gym_EventScript_2056D5
return return
PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2 PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if 1, PetalburgCity_Gym_EventScript_205746 call_if_eq PetalburgCity_Gym_EventScript_205746
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if 1, PetalburgCity_Gym_EventScript_20574B call_if_eq PetalburgCity_Gym_EventScript_20574B
call PetalburgCity_Gym_EventScript_2056E8 call PetalburgCity_Gym_EventScript_2056E8
return return
PetalburgCity_Gym_EventScript_205603:: @ 8205603 PetalburgCity_Gym_EventScript_205603:: @ 8205603
setvar VAR_0x8004, 6 setvar VAR_0x8004, 6
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if 1, PetalburgCity_Gym_EventScript_205746 call_if_eq PetalburgCity_Gym_EventScript_205746
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if 1, PetalburgCity_Gym_EventScript_20574B call_if_eq PetalburgCity_Gym_EventScript_20574B
call PetalburgCity_Gym_EventScript_20570D call PetalburgCity_Gym_EventScript_20570D
return return
PetalburgCity_Gym_EventScript_205624:: @ 8205624 PetalburgCity_Gym_EventScript_205624:: @ 8205624
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if 1, PetalburgCity_Gym_EventScript_205746 call_if_eq PetalburgCity_Gym_EventScript_205746
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if 1, PetalburgCity_Gym_EventScript_20574B call_if_eq PetalburgCity_Gym_EventScript_20574B
call PetalburgCity_Gym_EventScript_205720 call PetalburgCity_Gym_EventScript_205720
return return
PetalburgCity_Gym_EventScript_205645:: @ 8205645 PetalburgCity_Gym_EventScript_205645:: @ 8205645
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
compare VAR_0x8005, 0 compare VAR_0x8005, 0
call_if 1, PetalburgCity_Gym_EventScript_205746 call_if_eq PetalburgCity_Gym_EventScript_205746
compare VAR_0x8005, 1 compare VAR_0x8005, 1
call_if 1, PetalburgCity_Gym_EventScript_20574B call_if_eq PetalburgCity_Gym_EventScript_20574B
call PetalburgCity_Gym_EventScript_205733 call PetalburgCity_Gym_EventScript_205733
return return
data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -36,11 +36,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C
PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38
compare VAR_STARTER_MON, 0 compare VAR_STARTER_MON, 0
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A5B
compare VAR_STARTER_MON, 1 compare VAR_STARTER_MON, 1
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64 call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A64
compare VAR_STARTER_MON, 2 compare VAR_STARTER_MON, 2
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A6D
release release
end end
data/maps/Route101/scripts.inc
+2 -2
View File
@@ -239,9 +239,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_SPECIAL_FLAG_0x4000
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, Route101_EventScript_1EBE85 call_if_eq Route101_EventScript_1EBE85
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, Route101_EventScript_1EBE89 call_if_eq Route101_EventScript_1EBE89
warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
waitstate waitstate
release release
data/maps/Route103/scripts.inc
+1 -2
View File
@@ -9,8 +9,7 @@ Route103_MapScript1_1EC399: @ 81EC399
end end
Route103_MapScript1_1EC3A4: @ 81EC3A4 Route103_MapScript1_1EC3A4: @ 81EC3A4
checkflag FLAG_SYS_GAME_CLEAR call_if_set FLAG_SYS_GAME_CLEAR, Route103_EventScript_1EC3AE
call_if 1, Route103_EventScript_1EC3AE
end end
Route103_EventScript_1EC3AE:: @ 81EC3AE Route103_EventScript_1EC3AE:: @ 81EC3AE
data/maps/Route104/scripts.inc
+2 -2
View File
@@ -156,7 +156,7 @@ Route104_EventScript_1ECDED:: @ 81ECDED
Route104_EventScript_1ECE1C:: @ 81ECE1C Route104_EventScript_1ECE1C:: @ 81ECE1C
msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, Route104_EventScript_1ECE31 call_if_eq Route104_EventScript_1ECE31
releaseall releaseall
end end
@@ -231,7 +231,7 @@ Route104_EventScript_1ECF09:: @ 81ECF09
Route104_EventScript_1ECF38:: @ 81ECF38 Route104_EventScript_1ECF38:: @ 81ECF38
msgbox Route104_Text_1EE120, MSGBOX_DEFAULT msgbox Route104_Text_1EE120, MSGBOX_DEFAULT
compare VAR_0x8008, 0 compare VAR_0x8008, 0
call_if 1, Route104_EventScript_1ECE31 call_if_eq Route104_EventScript_1ECE31
releaseall releaseall
end end
data/maps/Route104_MrBrineysHouse/scripts.inc
+3 -5
View File
@@ -5,9 +5,8 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34
setflag FLAG_LANDMARK_MR_BRINEY_HOUSE setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
compare VAR_0x4090, 1 compare VAR_0x4090, 1
call_if 1, Route104_MrBrineysHouse_EventScript_229D50 call_if_eq Route104_MrBrineysHouse_EventScript_229D50
checkflag FLAG_0x0BC call_if_set FLAG_0x0BC, Route104_MrBrineysHouse_EventScript_229D4C
call_if 1, Route104_MrBrineysHouse_EventScript_229D4C
end end
Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C
@@ -24,8 +23,7 @@ Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50
Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67
lock lock
faceplayer faceplayer
checkflag FLAG_0x093 call_if_unset FLAG_0x093, Route104_MrBrineysHouse_EventScript_229D8A
call_if 0, Route104_MrBrineysHouse_EventScript_229D8A
goto_if_unset FLAG_0x0BD, Route104_MrBrineysHouse_EventScript_229DE1 goto_if_unset FLAG_0x0BD, Route104_MrBrineysHouse_EventScript_229DE1
goto_if_unset FLAG_0x095, Route104_MrBrineysHouse_EventScript_229DFA goto_if_unset FLAG_0x095, Route104_MrBrineysHouse_EventScript_229DFA
goto Route104_MrBrineysHouse_EventScript_229DAE goto Route104_MrBrineysHouse_EventScript_229DAE
data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+4 -4
View File
@@ -22,18 +22,18 @@ Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373
setflag FLAG_0x07F setflag FLAG_0x07F
msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB
release release
end end
Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2
msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB
release release
end end
data/maps/Route105/scripts.inc
+6 -7
View File
@@ -5,12 +5,11 @@ Route105_MapScripts:: @ 81EE1DB
.byte 0 .byte 0
Route105_MapScript1_1EE1EB: @ 81EE1EB Route105_MapScript1_1EE1EB: @ 81EE1EB
checkflag FLAG_0x0E4 call_if_unset FLAG_0x0E4, Route105_EventScript_1EE20B
call_if 0, Route105_EventScript_1EE20B
compare VAR_0x4037, 9 compare VAR_0x4037, 9
call_if 1, Route105_EventScript_2739AB call_if_eq Route105_EventScript_2739AB
compare VAR_0x4037, 10 compare VAR_0x4037, 10
call_if 1, Route105_EventScript_273A18 call_if_eq Route105_EventScript_273A18
end end
Route105_EventScript_1EE20B:: @ 81EE20B Route105_EventScript_1EE20B:: @ 81EE20B
@@ -20,11 +19,11 @@ Route105_EventScript_1EE20B:: @ 81EE20B
Route105_MapScript1_1EE21E: @ 81EE21E Route105_MapScript1_1EE21E: @ 81EE21E
compare VAR_0x4039, 1 compare VAR_0x4039, 1
call_if 1, Route105_EventScript_273D13 call_if_eq Route105_EventScript_273D13
compare VAR_0x4037, 9 compare VAR_0x4037, 9
call_if 1, Route105_EventScript_273D17 call_if_eq Route105_EventScript_273D17
compare VAR_0x4037, 10 compare VAR_0x4037, 10
call_if 1, Route105_EventScript_273D17 call_if_eq Route105_EventScript_273D17
end end
Route105_MapScript2_1EE240: @ 81EE240 Route105_MapScript2_1EE240: @ 81EE240

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