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

Merge pull request #778 from GriffinRichards/document-eventscripts

Browse Source 
Document some of event_scripts.s
This commit is contained in:
PikalaxALT
2019-09-27 10:18:27 -04:00
committed by GitHub
parent 208e1c9689 0c1f1281da
commit 3d9bad5558
170 changed files with 2607 additions and 2584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+232 -1443
View File
File diff suppressed because it is too large Load Diff
data/maps/AncientTomb/scripts.inc
+4 -4
View File
@@ -47,7 +47,7 @@ AncientTomb_EventScript_239033:: @ 8239033
end
AncientTomb_EventScript_239046:: @ 8239046
msgbox gUnknown_0827304E, MSGBOX_DEFAULT
msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
releaseall
end
@@ -84,11 +84,11 @@ AncientTomb_EventScript_23905A:: @ 823905A
AncientTomb_EventScript_2390A1:: @ 82390A1
setflag FLAG_DEFEATED_REGISTEEL
goto AncientTomb_EventScript_27376D
goto Common_EventScript_RemoveStaticPokemon
end
AncientTomb_EventScript_2390AA:: @ 82390AA
setvar VAR_0x8004, 403
goto AncientTomb_EventScript_273776
setvar VAR_0x8004, SPECIES_REGISTEEL
goto Common_EventScript_LegendaryFlewAway
end
data/maps/AquaHideout_B1F/scripts.inc
+2 -2
View File
@@ -51,7 +51,7 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F
setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
goto AquaHideout_B1F_EventScript_27376D
goto Common_EventScript_RemoveStaticPokemon
end
AquaHideout_B1F_EventScript_233A38:: @ 8233A38
@@ -78,7 +78,7 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C
setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
goto AquaHideout_B1F_EventScript_27376D
goto Common_EventScript_RemoveStaticPokemon
end
AquaHideout_B1F_EventScript_233A85:: @ 8233A85
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+6 -6
View File
@@ -304,7 +304,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end
@@ -384,7 +384,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end
@@ -465,7 +465,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end
@@ -548,7 +548,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8
@@ -994,7 +994,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6
return
BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
incrementgamestat 30
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
message BattleFrontier_BattleTowerLobby_Text_24144D
waitmessage
@@ -1057,7 +1057,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
return
BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
incrementgamestat 30
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
message BattleFrontier_BattleTowerLobby_Text_24144D
waitmessage
data/maps/BattleFrontier_Mart/scripts.inc
+2 -2
View File
@@ -4,10 +4,10 @@ BattleFrontier_Mart_MapScripts:: @ 8267ACB
BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart BattleFrontier_Mart_Pokemart_267AE4
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/BattleFrontier_OutsideEast/scripts.inc
+1 -1
View File
@@ -145,7 +145,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60
setflag FLAG_DEFEATED_SUDOWOODO
goto IslandCave_EventScript_27376D
goto Common_EventScript_RemoveStaticPokemon
end
BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69
data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908
setvar VAR_0x800B, 1
call BattleFrontier_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/BirthIsland_Exterior/scripts.inc
+7 -7
View File
@@ -79,9 +79,9 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
delay 40
waitmoncry
setvar VAR_LAST_TALKED, 2
setvar VAR_0x8004, 410
setvar VAR_0x8005, 30
setvar VAR_0x8006, 0
setvar VAR_0x8004, SPECIES_DEOXYS
setvar VAR_0x8005, 30 @level
setvar VAR_0x8006, ITEM_NONE
special CreateObedientEnemyMon
setflag FLAG_SYS_CTRL_OBJ_DELETE
special BattleSetup_StartLegendaryBattle
@@ -100,13 +100,13 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
BirthIsland_Exterior_EventScript_26803B:: @ 826803B
setflag FLAG_DEFEATED_DEOXYS
setvar VAR_0x8004, 410
goto BirthIsland_Exterior_EventScript_273776
setvar VAR_0x8004, SPECIES_DEOXYS
goto Common_EventScript_LegendaryFlewAway
end
BirthIsland_Exterior_EventScript_268049:: @ 8268049
setvar VAR_0x8004, 410
goto BirthIsland_Exterior_EventScript_273776
setvar VAR_0x8004, SPECIES_DEOXYS
goto Common_EventScript_LegendaryFlewAway
end
BirthIsland_Exterior_Movement_268054: @ 8268054
data/maps/DesertRuins/scripts.inc
+4 -4
View File
@@ -47,7 +47,7 @@ DesertRuins_EventScript_22D9DB:: @ 822D9DB
end
DesertRuins_EventScript_22D9EE:: @ 822D9EE
msgbox gUnknown_0827304E, MSGBOX_DEFAULT
msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
releaseall
end
@@ -84,11 +84,11 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
DesertRuins_EventScript_22DA49:: @ 822DA49
setflag FLAG_DEFEATED_REGIROCK
goto DesertRuins_EventScript_27376D
goto Common_EventScript_RemoveStaticPokemon
end
DesertRuins_EventScript_22DA52:: @ 822DA52
setvar VAR_0x8004, 401
goto DesertRuins_EventScript_273776
setvar VAR_0x8004, SPECIES_REGIROCK
goto Common_EventScript_LegendaryFlewAway
end
data/maps/DewfordTown/scripts.inc
+5 -5
View File
@@ -124,12 +124,12 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
call DewfordTown_EventScript_2720A0
call Common_EventScript_PlayBrineysBoatMusic
applymovement 4, DewfordTown_Movement_1E97A2
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2
waitmovement 0
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
call DewfordTown_EventScript_2720A8
call Common_EventScript_StopBrineysBoatMusic
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914
waitmovement 0
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
@@ -156,11 +156,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
call DewfordTown_EventScript_2720A0
call Common_EventScript_PlayBrineysBoatMusic
applymovement 4, DewfordTown_Movement_1E9865
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865
waitmovement 0
call DewfordTown_EventScript_2720A8
call Common_EventScript_StopBrineysBoatMusic
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918
waitmovement 0
@@ -619,7 +619,7 @@ DewfordTown_EventScript_1E9952:: @ 81E9952
end
DewfordTown_EventScript_1E997D:: @ 81E997D
incrementgamestat 2
incrementgamestat GAME_STAT_STARTED_TRENDS
compare VAR_0x8004, 0
goto_if_eq DewfordTown_EventScript_1E999E
msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT
data/maps/DewfordTown_Gym/scripts.inc
+1 -1
View File
@@ -177,7 +177,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
compare VAR_PETALBURG_GYM_STATE, 6
call_if_eq DewfordTown_Gym_EventScript_271E84
setvar VAR_0x8008, 2
call DewfordTown_Gym_EventScript_271F43
call Common_EventScript_SetGymTrainers
call DewfordTown_Gym_EventScript_1FC855
closemessage
delay 30
data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -5,12 +5,12 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E
setrespawn HEAL_LOCATION_DEWFORD_TOWN
call DewfordTown_PokemonCenter_1F_EventScript_2718DE
call Common_EventScript_UpdateBrineyLocation
end
DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537
setvar VAR_0x800B, 1
call DewfordTown_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
.byte 0
EverGrandeCity_ChampionsRoom_OnTransition: @ 82289FF
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalGfxId
end
EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59
setvar VAR_0x800B, 1
call EverGrandeCity_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+3 -3
View File
@@ -16,7 +16,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED
EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC
setvar VAR_0x800B, 1
call EverGrandeCity_PokemonLeague_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
@@ -25,10 +25,10 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC
EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/FallarborTown_House1/scripts.inc
+2 -2
View File
@@ -21,8 +21,8 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38
giveitem_std ITEM_TM27
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setvar VAR_0x8004, 280
call FallarborTown_House1_EventScript_2723E4
setvar VAR_0x8004, ITEM_METEORITE
call Common_EventScript_PlayerHandedOverTheItem
setflag FLAG_RECEIVED_TM27
msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT
release
data/maps/FallarborTown_Mart/scripts.inc
+2 -2
View File
@@ -4,10 +4,10 @@ FallarborTown_Mart_MapScripts:: @ 81FFCBE
FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart FallarborTown_Mart_Pokemart_1FFCD8
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -5,12 +5,12 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8
setrespawn HEAL_LOCATION_FALLARBOR_TOWN
call FallarborTown_PokemonCenter_1F_EventScript_2718DE
call Common_EventScript_UpdateBrineyLocation
end
FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1
setvar VAR_0x800B, 1
call FallarborTown_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/FarawayIsland_Interior/scripts.inc
+7 -7
View File
@@ -136,9 +136,9 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
special sub_81D4BEC
delay 40
waitmoncry
setvar VAR_0x8004, 151
setvar VAR_0x8005, 30
setvar VAR_0x8006, 0
setvar VAR_0x8004, SPECIES_MEW
setvar VAR_0x8005, 30 @level
setvar VAR_0x8006, ITEM_NONE
special CreateObedientEnemyMon
setflag FLAG_SYS_CTRL_OBJ_DELETE
special BattleSetup_StartLegendaryBattle
@@ -159,13 +159,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
FarawayIsland_Interior_EventScript_267E96:: @ 8267E96
setflag FLAG_DEFEATED_MEW
setvar VAR_0x8004, 151
goto FarawayIsland_Interior_EventScript_273776
setvar VAR_0x8004, SPECIES_MEW
goto Common_EventScript_LegendaryFlewAway
end
FarawayIsland_Interior_EventScript_267EA4:: @ 8267EA4
setvar VAR_0x8004, 151
goto FarawayIsland_Interior_EventScript_273776
setvar VAR_0x8004, SPECIES_MEW
goto Common_EventScript_LegendaryFlewAway
end
FarawayIsland_Interior_EventScript_267EAF:: @ 8267EAF
data/maps/FortreeCity_DecorationShop/scripts.inc
+4 -4
View File
@@ -12,10 +12,10 @@ FortreeCity_DecorationShop_EventScript_218017:: @ 8218017
FortreeCity_DecorationShop_EventScript_218020:: @ 8218020
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Desks
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -36,10 +36,10 @@ FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038
FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Chairs
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/FortreeCity_Gym/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
setflag FLAG_DEFEATED_FORTREE_GYM
setflag FLAG_BADGE06_GET
setvar VAR_0x8008, 6
call FortreeCity_Gym_EventScript_271F43
call Common_EventScript_SetGymTrainers
call FortreeCity_Gym_EventScript_21666A
closemessage
delay 30
data/maps/FortreeCity_Mart/scripts.inc
+2 -2
View File
@@ -4,10 +4,10 @@ FortreeCity_Mart_MapScripts:: @ 8217665
FortreeCity_Mart_EventScript_217666:: @ 8217666
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart FortreeCity_Mart_Pokemart_217680
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3
FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7
setvar VAR_0x800B, 1
call FortreeCity_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/GraniteCave_StevensRoom/scripts.inc
+2 -2
View File
@@ -5,8 +5,8 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
lock
faceplayer
msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT
setvar VAR_0x8004, 274
call GraniteCave_StevensRoom_EventScript_2723E4
setvar VAR_0x8004, ITEM_LETTER
call Common_EventScript_PlayerHandedOverTheItem
setflag FLAG_DELIVERED_STEVEN_LETTER
msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT
giveitem_std ITEM_TM47
data/maps/IslandCave/scripts.inc
+4 -4
View File
@@ -61,7 +61,7 @@ IslandCave_EventScript_238EEF:: @ 8238EEF
end
IslandCave_EventScript_238F13:: @ 8238F13
msgbox gUnknown_0827304E, MSGBOX_DEFAULT
msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
releaseall
end
@@ -113,10 +113,10 @@ IslandCave_EventScript_238F58:: @ 8238F58
IslandCave_EventScript_238F9F:: @ 8238F9F
setflag FLAG_DEFEATED_REGICE
goto IslandCave_EventScript_27376D
goto Common_EventScript_RemoveStaticPokemon
end
IslandCave_EventScript_238FA8:: @ 8238FA8
setvar VAR_0x8004, 402
goto IslandCave_EventScript_273776
setvar VAR_0x8004, SPECIES_REGICE
goto Common_EventScript_LegendaryFlewAway
end
data/maps/LavaridgeTown/scripts.inc
+3 -3
View File
@@ -7,8 +7,8 @@ LavaridgeTown_OnTransition: @ 81EA4DE
setflag FLAG_VISITED_LAVARIDGE_TOWN
call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514
call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalOnBikeGender
call Common_EventScript_SetupRivalGfxId
call Common_EventScript_SetupRivalOnBikeGfxId
compare VAR_LAVARIDGE_TOWN_STATE, 1
call_if_eq LavaridgeTown_EventScript_1EA518
compare VAR_LAVARIDGE_TOWN_STATE, 1
@@ -216,7 +216,7 @@ LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA
end
LavaridgeTown_EventScript_1EA70B:: @ 81EA70B
incrementgamestat 49
incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS
end
LavaridgeTown_EventScript_1EA70E:: @ 81EA70E
data/maps/LavaridgeTown_Gym_1F/scripts.inc
+1 -1
View File
@@ -80,7 +80,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
compare VAR_PETALBURG_GYM_STATE, 6
call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84
setvar VAR_0x8008, 4
call LavaridgeTown_Gym_1F_EventScript_271F43
call Common_EventScript_SetGymTrainers
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
setvar VAR_LAVARIDGE_TOWN_STATE, 1
call LavaridgeTown_Gym_1F_EventScript_1FE841
data/maps/LavaridgeTown_HerbShop/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7
message LavaridgeTown_HerbShop_Text_1FE53E
waitmessage
pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/LavaridgeTown_Mart/scripts.inc
+2 -2
View File
@@ -4,10 +4,10 @@ LavaridgeTown_Mart_MapScripts:: @ 81FF9CD
LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart LavaridgeTown_Mart_Pokemart_1FF9E8
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -5,12 +5,12 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05
setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE
call Common_EventScript_UpdateBrineyLocation
end
LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E
setvar VAR_0x800B, 1
call LavaridgeTown_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/LilycoveCity/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ LilycoveCity_OnTransition: @ 81E2B47
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalGfxId
end
LilycoveCity_MapScript1_1E2B61: @ 81E2B61
data/maps/LilycoveCity_ContestLobby/scripts.inc
+2 -2
View File
@@ -81,7 +81,7 @@ LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4
end
LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314
incrementgamestat 42
incrementgamestat GAME_STAT_RECEIVED_RIBBONS
special sub_80F8390
applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A
waitmovement 0
@@ -253,7 +253,7 @@ LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4
end
LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4
incrementgamestat 42
incrementgamestat GAME_STAT_RECEIVED_RIBBONS
setflag FLAG_SYS_RIBBON_GET
special sub_80F8390
applymovement 11, LilycoveCity_ContestLobby_Movement_21A547
data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR
special ShowDeptStoreElevatorFloorSelect
message gUnknown_08272C1D
message gText_WhichFloorWouldYouLike
waitmessage
setvar VAR_0x8004, 0
specialvar VAR_RESULT, GetDeptStoreDefaultFloorChoice
data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+3 -3
View File
@@ -21,10 +21,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022B:: @ 822022B
LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -190,7 +190,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442
end
LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450
msgbox gUnknown_08272A89, MSGBOX_DEFAULT
msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E
end
data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
waitmovement 0
compare VAR_0x8004, 0
goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1
incrementgamestat 46
incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY
compare VAR_0x8006, 0
call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F77B
compare VAR_0x8006, 1
data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
+4 -4
View File
@@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F
LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -43,10 +43,10 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60
LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
+4 -4
View File
@@ -4,10 +4,10 @@ LilycoveCity_DepartmentStore_3F_MapScripts:: @ 821FC64
LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -25,10 +25,10 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C
LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
+4 -4
View File
@@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD
LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -36,10 +36,10 @@ LilycoveCity_DepartmentStore_4F_Pokemart_21FE20: @ 821FE20
LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
+8 -8
View File
@@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A
LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Dolls
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -44,10 +44,10 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0
LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Cushions
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -69,10 +69,10 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4
LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Posters
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -94,10 +94,10 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024
LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Mats
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -26,7 +26,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5E4:: @ 821C5E4
LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8
setvar VAR_0x800B, 1
call LilycoveCity_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/LittlerootTown/scripts.inc
+1 -1
View File
@@ -6,7 +6,7 @@ LittlerootTown_MapScripts:: @ 81E7DCB
LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
setflag FLAG_VISITED_LITTLEROOT_TOWN
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalGfxId
compare VAR_LITTLEROOT_INTRO_STATE, 2
call_if_eq LittlerootTown_EventScript_1E7E67
call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+3 -3
View File
@@ -10,7 +10,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A
compare VAR_LITTLEROOT_INTRO_STATE, 4
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE
call LittlerootTown_BrendansHouse_2F_EventScript_275CE1
call SecretBase_EventScript_SetDecorationFlags
setvar VAR_SECRET_BASE_INITIALIZED, 0
end
@@ -50,7 +50,7 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq EventScript_275D0C
goto_if_eq SecretBase_EventScript_InitDecorations
end
LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481
@@ -271,7 +271,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F
end
LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C
msgbox gUnknown_08272CD5, MSGBOX_DEFAULT
msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT
releaseall
end
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+3 -3
View File
@@ -10,7 +10,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD
compare VAR_LITTLEROOT_INTRO_STATE, 4
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE
call LittlerootTown_MaysHouse_2F_EventScript_275CE1
call SecretBase_EventScript_SetDecorationFlags
setvar VAR_SECRET_BASE_INITIALIZED, 0
end
@@ -51,7 +51,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq EventScript_275D0C
goto_if_eq SecretBase_EventScript_InitDecorations
end
LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334
@@ -307,7 +307,7 @@ EventScript_PlayerPCFemale:: @ 81F9553
end
LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C
msgbox gUnknown_08272CD5, MSGBOX_DEFAULT
msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT
releaseall
end
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+14 -14
View File
@@ -5,7 +5,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
.byte 0
LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalGfxId
call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
@@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB
LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07
setvar VAR_0x8004, 0
call Common_EventScript_NameReceivedPokemon
call Common_EventScript_NameReceivedPartyMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
end
@@ -341,7 +341,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC
erasemonpic
goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
goto Common_EventScript_NoMoreRoomForPokemon
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
@@ -350,8 +350,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
call Common_EventScript_NameReceivedPokemon
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
end
@@ -361,7 +361,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
call LittlerootTown_ProfessorBirchsLab_EventScript_273797
call Common_EventScript_NameReceivedBoxMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
end
@@ -386,7 +386,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D
erasemonpic
goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
goto Common_EventScript_NoMoreRoomForPokemon
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
@@ -395,8 +395,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
call Common_EventScript_NameReceivedPokemon
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
end
@@ -406,7 +406,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
call LittlerootTown_ProfessorBirchsLab_EventScript_273797
call Common_EventScript_NameReceivedBoxMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
end
@@ -431,7 +431,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E
erasemonpic
goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
goto Common_EventScript_NoMoreRoomForPokemon
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
@@ -440,8 +440,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
call Common_EventScript_NameReceivedPokemon
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
end
@@ -451,7 +451,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
call LittlerootTown_ProfessorBirchsLab_EventScript_273797
call Common_EventScript_NameReceivedBoxMon
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
end
data/maps/MarineCave_End/scripts.inc
+3 -3
View File
@@ -55,12 +55,12 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B
MarineCave_End_EventScript_23B084:: @ 823B084
setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
setflag FLAG_DEFEATED_KYOGRE
goto MarineCave_End_EventScript_27376D
goto Common_EventScript_RemoveStaticPokemon
end
MarineCave_End_EventScript_23B092:: @ 823B092
setvar VAR_0x8004, 404
goto MarineCave_End_EventScript_273776
setvar VAR_0x8004, SPECIES_KYOGRE
goto Common_EventScript_LegendaryFlewAway
end
MarineCave_End_Movement_23B09D: @ 823B09D
data/maps/MauvilleCity_BikeShop/scripts.inc
+2 -2
View File
@@ -86,7 +86,7 @@ MauvilleCity_BikeShop_EventScript_20ECE5:: @ 820ECE5
end
MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF
incrementgamestat 4
incrementgamestat GAME_STAT_TRADED_BIKES
msgbox MauvilleCity_BikeShop_Text_20F294, MSGBOX_DEFAULT
takeitem ITEM_ACRO_BIKE, 1
giveitem_std ITEM_MACH_BIKE
@@ -94,7 +94,7 @@ MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF
end
MauvilleCity_BikeShop_EventScript_20ED10:: @ 820ED10
incrementgamestat 4
incrementgamestat GAME_STAT_TRADED_BIKES
msgbox MauvilleCity_BikeShop_Text_20F263, MSGBOX_DEFAULT
takeitem ITEM_MACH_BIKE, 1
giveitem_std ITEM_ACRO_BIKE
data/maps/MauvilleCity_Gym/scripts.inc
+1 -1
View File
@@ -98,7 +98,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
compare VAR_PETALBURG_GYM_STATE, 6
call_if_eq MauvilleCity_Gym_EventScript_271E84
setvar VAR_0x8008, 3
call MauvilleCity_Gym_EventScript_271F43
call Common_EventScript_SetGymTrainers
special MauvilleGymSpecial3
special DrawWholeMapView
playse SE_KI_GASYAN
data/maps/MauvilleCity_Mart/scripts.inc
+2 -2
View File
@@ -4,10 +4,10 @@ MauvilleCity_Mart_MapScripts:: @ 82110E5
MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart MauvilleCity_Mart_Pokemart_211100
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66
setrespawn HEAL_LOCATION_MAUVILLE_CITY
call MauvilleCity_PokemonCenter_1F_EventScript_2718DE
call Common_EventScript_UpdateBrineyLocation
goto MauvilleCity_PokemonCenter_1F_EventScript_210E74
end
@@ -15,7 +15,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74
MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78
setvar VAR_0x800B, 1
call MauvilleCity_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/MossdeepCity_Gym/scripts.inc
+1 -1
View File
@@ -65,7 +65,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
clearflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
clearflag FLAG_UNKNOWN_0x393
setvar VAR_0x8008, 7
call MossdeepCity_Gym_EventScript_271F43
call Common_EventScript_SetGymTrainers
clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
clearflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
data/maps/MossdeepCity_Mart/scripts.inc
+2 -2
View File
@@ -4,10 +4,10 @@ MossdeepCity_Mart_MapScripts:: @ 82223C7
MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
pokemart MossdeepCity_Mart_Pokemart_2223E0
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A
MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E
setvar VAR_0x800B, 1
call MossdeepCity_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/MossdeepCity_StevensHouse/scripts.inc
+4 -4
View File
@@ -90,7 +90,7 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
goto_if_eq MossdeepCity_StevensHouse_EventScript_222895
compare VAR_RESULT, 1
goto_if_eq MossdeepCity_StevensHouse_EventScript_2228BD
goto MossdeepCity_StevensHouse_EventScript_273811
goto Common_EventScript_NoMoreRoomForPokemon
end
MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
@@ -98,8 +98,8 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_StevensHouse_EventScript_222901
call MossdeepCity_StevensHouse_EventScript_27378B
call Common_EventScript_NameReceivedPokemon
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto MossdeepCity_StevensHouse_EventScript_222901
end
@@ -108,7 +108,7 @@ MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0
call MossdeepCity_StevensHouse_EventScript_273797
call Common_EventScript_NameReceivedBoxMon
goto MossdeepCity_StevensHouse_EventScript_2228E0
end
data/maps/MtChimney_CableCarStation/scripts.inc
+1 -1
View File
@@ -46,7 +46,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_CABLE_CAR_STATION_STATE, 2
incrementgamestat 48
incrementgamestat GAME_STAT_RODE_CABLE_CAR
special CableCarWarp
special CableCar
waitstate
data/maps/NavelRock_Bottom/scripts.inc
+7 -7
View File
@@ -52,9 +52,9 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
playmoncry SPECIES_LUGIA, 2
waitmoncry
delay 20
setvar VAR_0x8004, 249
setvar VAR_0x8005, 70
setvar VAR_0x8006, 0
setvar VAR_0x8004, SPECIES_LUGIA
setvar VAR_0x8005, 70 @level
setvar VAR_0x8006, ITEM_NONE
special CreateObedientEnemyMon
setflag FLAG_SYS_CTRL_OBJ_DELETE
special BattleSetup_StartLegendaryBattle
@@ -73,11 +73,11 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
NavelRock_Bottom_EventScript_269336:: @ 8269336
setflag FLAG_DEFEATED_LUGIA
setvar VAR_0x8004, 249
goto NavelRock_Bottom_EventScript_273776
setvar VAR_0x8004, SPECIES_LUGIA
goto Common_EventScript_LegendaryFlewAway
end
NavelRock_Bottom_EventScript_269344:: @ 8269344
setvar VAR_0x8004, 249
goto NavelRock_Bottom_EventScript_273776
setvar VAR_0x8004, SPECIES_LUGIA
goto Common_EventScript_LegendaryFlewAway
end
data/maps/NavelRock_Top/scripts.inc
+7 -7
View File
@@ -56,9 +56,9 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
applymovement 1, NavelRock_Top_Movement_26923A
waitmovement 0
special RemoveCameraObject
setvar VAR_0x8004, 250
setvar VAR_0x8005, 70
setvar VAR_0x8006, 0
setvar VAR_0x8004, SPECIES_HO_OH
setvar VAR_0x8005, 70 @level
setvar VAR_0x8006, ITEM_NONE
special CreateObedientEnemyMon
setflag FLAG_SYS_CTRL_OBJ_DELETE
special BattleSetup_StartLegendaryBattle
@@ -78,13 +78,13 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
NavelRock_Top_EventScript_269217:: @ 8269217
setflag FLAG_DEFEATED_HO_OH
setvar VAR_0x8004, 250
goto NavelRock_Top_EventScript_273776
setvar VAR_0x8004, SPECIES_HO_OH
goto Common_EventScript_LegendaryFlewAway
end
NavelRock_Top_EventScript_269225:: @ 8269225
setvar VAR_0x8004, 250
goto NavelRock_Top_EventScript_273776
setvar VAR_0x8004, SPECIES_HO_OH
goto Common_EventScript_LegendaryFlewAway
end
NavelRock_Top_Movement_269230: @ 8269230
data/maps/NewMauville_Inside/scripts.inc
+3 -3
View File
@@ -202,7 +202,7 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF
NewMauville_Inside_EventScript_2377F3:: @ 82377F3
setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE
goto NewMauville_Inside_EventScript_27376D
goto Common_EventScript_RemoveStaticPokemon
end
NewMauville_Inside_EventScript_2377FC:: @ 82377FC
@@ -229,7 +229,7 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC
NewMauville_Inside_EventScript_237840:: @ 8237840
setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE
goto NewMauville_Inside_EventScript_27376D
goto Common_EventScript_RemoveStaticPokemon
end
NewMauville_Inside_EventScript_237849:: @ 8237849
@@ -256,7 +256,7 @@ NewMauville_Inside_EventScript_237849:: @ 8237849
NewMauville_Inside_EventScript_23788D:: @ 823788D
setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE
goto NewMauville_Inside_EventScript_27376D
goto Common_EventScript_RemoveStaticPokemon
end
NewMauville_Inside_Text_237896: @ 8237896
data/maps/OldaleTown/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ OldaleTown_MapScripts:: @ 81E8EA2
.byte 0
OldaleTown_OnTransition: @ 81E8EA8
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalGfxId
setflag FLAG_VISITED_OLDALE_TOWN
call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2
call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE
data/maps/OldaleTown_Mart/scripts.inc
+3 -3
View File
@@ -4,11 +4,11 @@ OldaleTown_Mart_MapScripts:: @ 81FC23F
OldaleTown_Mart_EventScript_1FC240:: @ 81FC240
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC26C
pokemart OldaleTown_Mart_Pokemart_1FC260
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -23,7 +23,7 @@ OldaleTown_Mart_Pokemart_1FC260: @ 81FC260
OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C
pokemart OldaleTown_Mart_Pokemart_1FC27C
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -5,12 +5,12 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011
setrespawn HEAL_LOCATION_OLDALE_TOWN
call OldaleTown_PokemonCenter_1F_EventScript_2718DE
call Common_EventScript_UpdateBrineyLocation
end
OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A
setvar VAR_0x800B, 1
call OldaleTown_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2
PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6
setvar VAR_0x800B, 1
call PacifidlogTown_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/PetalburgCity_Gym/scripts.inc
+1 -1
View File
@@ -423,7 +423,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
setflag FLAG_HIDE_MAUVILLE_GYM_WATTSON
clearflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
setvar VAR_0x8008, 5
call PetalburgCity_Gym_EventScript_271F43
call Common_EventScript_SetGymTrainers
clearflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
call PetalburgCity_Gym_EventScript_2048FF
special DrawWholeMapView
data/maps/PetalburgCity_Mart/scripts.inc
+3 -3
View File
@@ -4,11 +4,11 @@ PetalburgCity_Mart_MapScripts:: @ 8207D68
PetalburgCity_Mart_EventScript_207D69:: @ 8207D69
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_207DA6
pokemart PetalburgCity_Mart_Pokemart_207D8C
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -31,7 +31,7 @@ PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C
PetalburgCity_Mart_EventScript_207DA6:: @ 8207DA6
pokemart PetalburgCity_Mart_Pokemart_207DB8
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -5,12 +5,12 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3
setrespawn HEAL_LOCATION_PETALBURG_CITY
call PetalburgCity_PokemonCenter_1F_EventScript_2718DE
call Common_EventScript_UpdateBrineyLocation
end
PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC
setvar VAR_0x800B, 1
call PetalburgCity_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/Route103/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ Route103_MapScripts:: @ 81EC38E
.byte 0
Route103_OnTransition: @ 81EC399
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalGfxId
call Route103_EventScript_2720AD
end
data/maps/Route104/scripts.inc
+4 -4
View File
@@ -13,7 +13,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47
end
Route104_OnTransition: @ 81ECC4E
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalGfxId
call Route104_EventScript_1ECC78
call Route104_EventScript_1ECC5E
end
@@ -364,7 +364,7 @@ Route104_EventScript_1ED099:: @ 81ED099
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
call Route104_EventScript_2720A0
call Common_EventScript_PlayBrineysBoatMusic
goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0D9
goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0EF
end
@@ -398,7 +398,7 @@ Route104_EventScript_1ED139:: @ 81ED139
delay 50
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353
waitmovement 0
call Route104_EventScript_2720A8
call Common_EventScript_StopBrineysBoatMusic
showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355
waitmovement 0
@@ -410,7 +410,7 @@ Route104_EventScript_1ED139:: @ 81ED139
waitmovement 0
addobject 4
clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
call Route104_EventScript_2720A8
call Common_EventScript_StopBrineysBoatMusic
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
hideobjectat 7, MAP_ROUTE104
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+2 -2
View File
@@ -46,10 +46,10 @@ Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB
return
Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4
message gUnknown_08272A52
message gText_PlayerWhatCanIDoForYou
waitmessage
pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/Route109/scripts.inc
+2 -2
View File
@@ -34,12 +34,12 @@ Route109_EventScript_1EE7C5:: @ 81EE7C5
Route109_EventScript_1EE7D5:: @ 81EE7D5
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
call Route109_EventScript_2720A0
call Common_EventScript_PlayBrineysBoatMusic
applymovement 1, Route109_Movement_1EE84F
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F
waitmovement 0
delay 50
call Route109_EventScript_2720A8
call Common_EventScript_StopBrineysBoatMusic
showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900
waitmovement 0
data/maps/Route110/scripts.inc
+2 -2
View File
@@ -9,8 +9,8 @@ Route110_MapScript1_1EF279: @ 81EF279
end
Route110_OnTransition: @ 81EF27D
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalOnBikeGender
call Common_EventScript_SetupRivalGfxId
call Common_EventScript_SetupRivalOnBikeGfxId
compare VAR_CYCLING_CHALLENGE_STATE, 1
call_if_eq Route110_EventScript_1EF293
end
data/maps/Route111/scripts.inc
+1 -1
View File
@@ -209,7 +209,7 @@ Route111_EventScript_1F0F2E:: @ 81F0F2E
end
Route111_EventScript_1F0F45:: @ 81F0F45
msgbox gUnknown_08272C5F, MSGBOX_DEFAULT
msgbox gText_SandstormIsVicious, MSGBOX_DEFAULT
closemessage
compare VAR_0x8004, 0
call_if_eq Route111_EventScript_1F0F7C
data/maps/Route112_CableCarStation/scripts.inc
+1 -1
View File
@@ -47,7 +47,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38
waitmovement 0
setvar VAR_0x8004, 0
setvar VAR_CABLE_CAR_STATION_STATE, 1
incrementgamestat 48
incrementgamestat GAME_STAT_RODE_CABLE_CAR
special CableCarWarp
special CableCar
waitstate
data/maps/Route119/scripts.inc
+2 -2
View File
@@ -15,8 +15,8 @@ Route119_EventScript_1F4439:: @ 81F4439
return
Route119_OnTransition: @ 81F444D
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalOnBikeGender
call Common_EventScript_SetupRivalGfxId
call Common_EventScript_SetupRivalOnBikeGfxId
compare VAR_WEATHER_INSTITUTE_STATE, 1
call_if_eq Route119_EventScript_1F4466
special SetRoute119Weather
data/maps/Route119_WeatherInstitute_2F/scripts.inc
+4 -4
View File
@@ -89,7 +89,7 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085
compare VAR_RESULT, 1
goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700AD
goto Route119_WeatherInstitute_2F_EventScript_273811
goto Common_EventScript_NoMoreRoomForPokemon
end
Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
@@ -97,8 +97,8 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA
call Route119_WeatherInstitute_2F_EventScript_27378B
call Common_EventScript_NameReceivedPokemon
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto Route119_WeatherInstitute_2F_EventScript_2700EA
end
@@ -107,7 +107,7 @@ Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700D0
call Route119_WeatherInstitute_2F_EventScript_273797
call Common_EventScript_NameReceivedBoxMon
goto Route119_WeatherInstitute_2F_EventScript_2700D0
end
data/maps/RustboroCity/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ RustboroCity_MapScripts:: @ 81E06BD
RustboroCity_OnTransition: @ 81E06C8
setflag FLAG_VISITED_RUSTBORO_CITY
call Common_EventScript_SetupRivalGender
call Common_EventScript_SetupRivalGfxId
compare VAR_RUSTBORO_CITY_STATE, 6
call_if_eq RustboroCity_EventScript_1E0707
getplayerxy VAR_TEMP_0, VAR_TEMP_1
data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+8 -8
View File
@@ -162,7 +162,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E
compare VAR_RESULT, 1
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A96
goto RustboroCity_DevonCorp_2F_EventScript_273811
goto Common_EventScript_NoMoreRoomForPokemon
end
RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
@@ -170,8 +170,8 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7
call RustboroCity_DevonCorp_2F_EventScript_27378B
call Common_EventScript_NameReceivedPokemon
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto RustboroCity_DevonCorp_2F_EventScript_211AD7
end
@@ -180,7 +180,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9
call RustboroCity_DevonCorp_2F_EventScript_273797
call Common_EventScript_NameReceivedBoxMon
goto RustboroCity_DevonCorp_2F_EventScript_211AB9
end
@@ -211,7 +211,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11
compare VAR_RESULT, 1
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B39
goto RustboroCity_DevonCorp_2F_EventScript_273811
goto Common_EventScript_NoMoreRoomForPokemon
end
RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
@@ -219,8 +219,8 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A
call RustboroCity_DevonCorp_2F_EventScript_27378B
call Common_EventScript_NameReceivedPokemon
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto RustboroCity_DevonCorp_2F_EventScript_211B7A
end
@@ -229,7 +229,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C
call RustboroCity_DevonCorp_2F_EventScript_273797
call Common_EventScript_NameReceivedBoxMon
goto RustboroCity_DevonCorp_2F_EventScript_211B5C
end
data/maps/RustboroCity_Gym/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66
setvar VAR_RUSTBORO_CITY_STATE, 1
addvar VAR_PETALBURG_GYM_STATE, 1
setvar VAR_0x8008, 1
call RustboroCity_Gym_EventScript_271F43
call Common_EventScript_SetGymTrainers
compare VAR_PETALBURG_GYM_STATE, 6
call_if_eq RustboroCity_Gym_EventScript_271E84
goto RustboroCity_Gym_EventScript_212FA4
data/maps/RustboroCity_Mart/scripts.inc
+3 -3
View File
@@ -4,7 +4,7 @@ RustboroCity_Mart_MapScripts:: @ 8214F05
RustboroCity_Mart_EventScript_214F06:: @ 8214F06
lock
faceplayer
message gUnknown_08272A21
message gText_HowMayIServeYou
waitmessage
goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F21
goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F48
@@ -12,7 +12,7 @@ RustboroCity_Mart_EventScript_214F06:: @ 8214F06
RustboroCity_Mart_EventScript_214F21:: @ 8214F21
pokemart RustboroCity_Mart_Pokemart_214F30
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
@@ -33,7 +33,7 @@ RustboroCity_Mart_Pokemart_214F30: @ 8214F30
RustboroCity_Mart_EventScript_214F48:: @ 8214F48
pokemart RustboroCity_Mart_Pokemart_214F58
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end
data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -5,12 +5,12 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D
setrespawn HEAL_LOCATION_RUSTBORO_CITY
call RustboroCity_PokemonCenter_1F_EventScript_2718DE
call Common_EventScript_UpdateBrineyLocation
end
RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76
setvar VAR_0x800B, 1
call RustboroCity_PokemonCenter_1F_EventScript_27191E
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
release
data/maps/SealedChamber_InnerRoom/scripts.inc
+1 -1
View File
@@ -27,7 +27,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8
waitstate
playse SE_DOOR
delay 40
msgbox gUnknown_0827301B, MSGBOX_DEFAULT
msgbox gText_DoorOpenedFarAway, MSGBOX_DEFAULT
closemessage
fadeinbgm 0
setflag FLAG_REGI_DOORS_OPENED
data/maps/SealedChamber_OuterRoom/scripts.inc
+1 -1
View File
@@ -116,7 +116,7 @@ SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0
end
SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3
msgbox gUnknown_0827304E, MSGBOX_DEFAULT
msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
releaseall
end
data/maps/SecretBase_BlueCave1/map.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"id": "MAP_SECRET_BASE_BLUE_CAVE1",
"name": "SecretBase_BlueCave1",
"shared_scripts_map": "SecretBase",
"layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1",
"music": "MUS_MACHI_S3",
"region_map_section": "MAPSEC_SECRET_BASE",
@@ -24,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_BlueCave1_EventScript_275D64",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
},
{
data/maps/SecretBase_BlueCave1/scripts.inc
-1
View File
@@ -1 +0,0 @@
SecretBase_BlueCave1_MapScripts:: @ 823B483
data/maps/SecretBase_BlueCave2/map.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"id": "MAP_SECRET_BASE_BLUE_CAVE2",
"name": "SecretBase_BlueCave2",
"shared_scripts_map": "SecretBase",
"layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2",
"music": "MUS_MACHI_S3",
"region_map_section": "MAPSEC_SECRET_BASE",
@@ -24,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_BlueCave2_EventScript_275D64",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
},
{
data/maps/SecretBase_BlueCave2/scripts.inc
-1
View File
@@ -1 +0,0 @@
SecretBase_BlueCave2_MapScripts:: @ 823B483
data/maps/SecretBase_BlueCave3/map.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"id": "MAP_SECRET_BASE_BLUE_CAVE3",
"name": "SecretBase_BlueCave3",
"shared_scripts_map": "SecretBase",
"layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3",
"music": "MUS_MACHI_S3",
"region_map_section": "MAPSEC_SECRET_BASE",
@@ -24,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_BlueCave3_EventScript_275D64",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
},
{
data/maps/SecretBase_BlueCave3/scripts.inc
-1
View File
@@ -1 +0,0 @@
SecretBase_BlueCave3_MapScripts:: @ 823B483
data/maps/SecretBase_BlueCave4/map.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"id": "MAP_SECRET_BASE_BLUE_CAVE4",
"name": "SecretBase_BlueCave4",
"shared_scripts_map": "SecretBase",
"layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4",
"music": "MUS_MACHI_S3",
"region_map_section": "MAPSEC_SECRET_BASE",
@@ -24,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_BlueCave4_EventScript_275D64",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
},
{
data/maps/SecretBase_BlueCave4/scripts.inc
-1
View File
@@ -1 +0,0 @@
SecretBase_BlueCave4_MapScripts:: @ 823B483
data/maps/SecretBase_BrownCave1/map.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"id": "MAP_SECRET_BASE_BROWN_CAVE1",
"name": "SecretBase_BrownCave1",
"shared_scripts_map": "SecretBase",
"layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1",
"music": "MUS_MACHI_S3",
"region_map_section": "MAPSEC_SECRET_BASE",
@@ -24,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_BrownCave1_EventScript_275D64",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
},
{
data/maps/SecretBase_BrownCave1/scripts.inc
-1
View File
@@ -1 +0,0 @@
SecretBase_BrownCave1_MapScripts:: @ 823B483
data/maps/SecretBase_BrownCave2/map.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"id": "MAP_SECRET_BASE_BROWN_CAVE2",
"name": "SecretBase_BrownCave2",
"shared_scripts_map": "SecretBase",
"layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2",
"music": "MUS_MACHI_S3",
"region_map_section": "MAPSEC_SECRET_BASE",
@@ -24,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_BrownCave2_EventScript_275D64",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
},
{
data/maps/SecretBase_BrownCave2/scripts.inc
-1
View File
@@ -1 +0,0 @@
SecretBase_BrownCave2_MapScripts:: @ 823B483
data/maps/SecretBase_BrownCave3/map.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"id": "MAP_SECRET_BASE_BROWN_CAVE3",
"name": "SecretBase_BrownCave3",
"shared_scripts_map": "SecretBase",
"layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3",
"music": "MUS_MACHI_S3",
"region_map_section": "MAPSEC_SECRET_BASE",
@@ -24,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_BrownCave3_EventScript_275D64",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
},
{
data/maps/SecretBase_BrownCave3/scripts.inc
-1
View File
@@ -1 +0,0 @@
SecretBase_BrownCave3_MapScripts:: @ 823B483
data/maps/SecretBase_BrownCave4/map.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"id": "MAP_SECRET_BASE_BROWN_CAVE4",
"name": "SecretBase_BrownCave4",
"shared_scripts_map": "SecretBase",
"layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4",
"music": "MUS_MACHI_S3",
"region_map_section": "MAPSEC_SECRET_BASE",
@@ -24,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_BrownCave4_EventScript_275D64",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
},
{
data/maps/SecretBase_BrownCave4/scripts.inc
-1
View File
@@ -1 +0,0 @@
SecretBase_BrownCave4_MapScripts:: @ 823B483
data/maps/SecretBase_RedCave1/map.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"id": "MAP_SECRET_BASE_RED_CAVE1",
"name": "SecretBase_RedCave1",
"shared_scripts_map": "SecretBase",
"layout": "LAYOUT_SECRET_BASE_RED_CAVE1",
"music": "MUS_MACHI_S3",
"region_map_section": "MAPSEC_SECRET_BASE",
@@ -24,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_RedCave1_EventScript_275D64",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
},
{
data/maps/SecretBase_RedCave1/scripts.inc
-1
View File
@@ -1 +0,0 @@
SecretBase_RedCave1_MapScripts:: @ 823B483
data/maps/SecretBase_RedCave2/map.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"id": "MAP_SECRET_BASE_RED_CAVE2",
"name": "SecretBase_RedCave2",
"shared_scripts_map": "SecretBase",
"layout": "LAYOUT_SECRET_BASE_RED_CAVE2",
"music": "MUS_MACHI_S3",
"region_map_section": "MAPSEC_SECRET_BASE",
@@ -24,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SecretBase_RedCave2_EventScript_275D64",
"script": "SecretBase_EventScript_RecordMixTrainer",
"flag": "FLAG_DECORATION_0"
},
{
data/maps/SecretBase_RedCave2/scripts.inc
-1
View File
@@ -1 +0,0 @@
SecretBase_RedCave2_MapScripts:: @ 823B483

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