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

Merge conflict resolves into review changes

Browse Source
This commit is contained in:
GriffinR
2019-10-13 15:33:19 -04:00
parent 144c5888a1 a081124a20
commit bb23128b77
172 changed files with 7753 additions and 8366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+3 -3
View File
@@ -878,15 +878,15 @@
.endm .endm
@ Displays a box containing the front sprite for the specified (species) Pokemon species. @ Displays a box containing the front sprite for the specified (species) Pokemon species.
.macro drawmonpic species:req, x:req, y:req .macro showmonpic species:req, x:req, y:req
.byte 0x75 .byte 0x75
.2byte \species .2byte \species
.byte \x .byte \x
.byte \y .byte \y
.endm .endm
@ Hides all boxes displayed with drawmonpic. @ Hides all boxes displayed with showmonpic.
.macro erasemonpic .macro hidemonpic
.byte 0x76 .byte 0x76
.endm .endm
asm/macros/movement.inc
+2 -2
View File
@@ -102,8 +102,8 @@
create_movement_action clear_fixed_priority create_movement_action clear_fixed_priority
create_movement_action init_affine_anim create_movement_action init_affine_anim
create_movement_action clear_affine_anim create_movement_action clear_affine_anim
create_movement_action unknown_movement_1 create_movement_action hide_reflection
create_movement_action unknown_movement_2 create_movement_action show_reflection
create_movement_action walk_down_start_affine create_movement_action walk_down_start_affine
create_movement_action walk_down_affine create_movement_action walk_down_affine
data/event_scripts.s
+11 -56
View File
@@ -5,6 +5,7 @@
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_setup.h" #include "constants/battle_setup.h"
#include "constants/berry.h" #include "constants/berry.h"
#include "constants/cable_club.h"
#include "constants/contest.h" #include "constants/contest.h"
#include "constants/daycare.h" #include "constants/daycare.h"
#include "constants/decorations.h" #include "constants/decorations.h"
@@ -31,6 +32,7 @@
#include "constants/secret_bases.h" #include "constants/secret_bases.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/trade.h"
#include "constants/trainer_hill.h" #include "constants/trainer_hill.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/vars.h" #include "constants/vars.h"
@@ -1318,9 +1320,9 @@ BirthIsland_Harbor_EventScript_272250:: @ 8272250
FarawayIsland_Entrance_EventScript_272250:: @ 8272250 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, DIR_SOUTH
call_if_eq BattleFrontier_OutsideWest_EventScript_242A21 call_if_eq BattleFrontier_OutsideWest_EventScript_242A21
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq 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
@@ -1573,64 +1575,16 @@ EventScript_CableClub_SetVarResult0:: @ 8273755
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
return return
BattleFrontier_PokemonCenter_2F_EventScript_27375B:: @ 827375B Common_EventScript_UnionRoomAttendant:: @ 827375B
DewfordTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B call CableClub_EventScript_UnionRoomAttendant
EverGrandeCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
EverGrandeCity_PokemonLeague_2F_EventScript_27375B:: @ 827375B
FallarborTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
FortreeCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
LavaridgeTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
LilycoveCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
MauvilleCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
MossdeepCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
OldaleTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
PacifidlogTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
PetalburgCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
RustboroCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
SlateportCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
SootopolisCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B
VerdanturfTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
call OldaleTown_PokemonCenter_2F_EventScript_27751B
end end
BattleFrontier_PokemonCenter_2F_EventScript_273761:: @ 8273761 Common_EventScript_WirelessClubAttendant:: @ 8273761
DewfordTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 call CableClub_EventScript_WirelessClubAttendant
EverGrandeCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
EverGrandeCity_PokemonLeague_2F_EventScript_273761:: @ 8273761
FallarborTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
FortreeCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
LavaridgeTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
LilycoveCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
MauvilleCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
MossdeepCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
OldaleTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
PacifidlogTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
PetalburgCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
RustboroCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
SlateportCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
SootopolisCity_PokemonCenter_2F_EventScript_273761:: @ 8273761
VerdanturfTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
call OldaleTown_PokemonCenter_2F_EventScript_277672
end end
BattleFrontier_PokemonCenter_2F_EventScript_273767:: @ 8273767 Common_EventScript_DirectCornerAttendant:: @ 8273767
DewfordTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 call CableClub_EventScript_DirectCornerAttendant
EverGrandeCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
EverGrandeCity_PokemonLeague_2F_EventScript_273767:: @ 8273767
FallarborTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
FortreeCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
LavaridgeTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
LilycoveCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
MauvilleCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
MossdeepCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
OldaleTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
PacifidlogTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
PetalburgCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
RustboroCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
SlateportCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
SootopolisCity_PokemonCenter_2F_EventScript_273767:: @ 8273767
VerdanturfTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
call OldaleTown_PokemonCenter_2F_EventScript_2776A4
end end
Common_EventScript_RemoveStaticPokemon:: @ 827376D Common_EventScript_RemoveStaticPokemon:: @ 827376D
@@ -1735,6 +1689,7 @@ EventScript_GotoTrainerScript:: @ 82742F6
.include "data/scripts/berry_tree.inc" .include "data/scripts/berry_tree.inc"
.include "data/scripts/secret_base.inc" .include "data/scripts/secret_base.inc"
.include "data/scripts/cable_club.inc" .include "data/scripts/cable_club.inc"
.include "data/text/cable_club.inc"
.include "data/scripts/contest_hall.inc" .include "data/scripts/contest_hall.inc"
.include "data/text/contest_strings.inc" .include "data/text/contest_strings.inc"
.include "data/text/contest_link.inc" .include "data/text/contest_link.inc"
data/maps/AncientTomb/scripts.inc
+4 -4
View File
@@ -10,7 +10,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
AncientTomb_EventScript_238FCD:: @ 8238FCD AncientTomb_EventScript_238FCD:: @ 8238FCD
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -72,11 +72,11 @@ AncientTomb_EventScript_23905A:: @ 823905A
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq AncientTomb_EventScript_2390A1 goto_if_eq AncientTomb_EventScript_2390A1
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq AncientTomb_EventScript_2390AA goto_if_eq AncientTomb_EventScript_2390AA
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq AncientTomb_EventScript_2390AA goto_if_eq AncientTomb_EventScript_2390AA
setflag FLAG_DEFEATED_REGISTEEL setflag FLAG_DEFEATED_REGISTEEL
release release
data/maps/AquaHideout_B1F/scripts.inc
+7 -7
View File
@@ -9,7 +9,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
AquaHideout_B1F_EventScript_2339BC:: @ 82339BC AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -39,11 +39,11 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq AquaHideout_B1F_EventScript_233A2F goto_if_eq AquaHideout_B1F_EventScript_233A2F
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq AquaHideout_B1F_EventScript_233A2F goto_if_eq AquaHideout_B1F_EventScript_233A2F
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq AquaHideout_B1F_EventScript_233A2F goto_if_eq AquaHideout_B1F_EventScript_233A2F
setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
release release
@@ -66,11 +66,11 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq AquaHideout_B1F_EventScript_233A7C goto_if_eq AquaHideout_B1F_EventScript_233A7C
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq AquaHideout_B1F_EventScript_233A7C goto_if_eq AquaHideout_B1F_EventScript_233A7C
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq AquaHideout_B1F_EventScript_233A7C goto_if_eq AquaHideout_B1F_EventScript_233A7C
setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
release release
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+9 -9
View File
@@ -926,16 +926,16 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
return return
BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
setvar VAR_0x8004, 9 setvar VAR_0x8004, USING_BATTLE_TOWER
message gText_PleaseWaitForLink message gText_PleaseWaitForLink
waitmessage waitmessage
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_80B2DA4 special TryBattleLinkup
waitstate waitstate
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady
compare VAR_RESULT, 3 compare VAR_RESULT, 3
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F327
compare VAR_RESULT, 4 compare VAR_RESULT, 4
@@ -943,7 +943,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
compare VAR_RESULT, 5 compare VAR_RESULT, 5
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6
compare VAR_RESULT, 6 compare VAR_RESULT, 6
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 goto_if_eq CableClub_EventScript_AbortLinkConnectionError
compare VAR_RESULT, 11 compare VAR_RESULT, 11
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
end end
@@ -952,7 +952,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327
special CloseLink special CloseLink
compare VAR_0x8005, 3 compare VAR_0x8005, 3
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F
msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
release release
end end
@@ -965,7 +965,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F
BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351
msgbox BattleFrontier_BattleTowerLobby_Text_241240, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_241240, MSGBOX_DEFAULT
special CloseLink special CloseLink
msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, MSGBOX_DEFAULT msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT
release release
end end
@@ -1020,7 +1020,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8
end end
BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3
message BattleFrontier_BattleTowerLobby_Text_2792CD message CableClub_Text_ChooseGroupLeaderOfTwo
waitmessage waitmessage
multichoice 16, 6, MULTI_LINK_LEADER, 0 multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT switch VAR_RESULT
@@ -1031,7 +1031,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3
end end
BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430
call BattleFrontier_BattleTowerLobby_EventScript_277B30 call CableClub_EventScript_TryBecomeLinkLeader
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
compare VAR_RESULT, 5 compare VAR_RESULT, 5
@@ -1044,7 +1044,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430
return return
BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
call BattleFrontier_BattleTowerLobby_EventScript_277B35 call CableClub_EventScript_TryJoinLinkGroup
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
compare VAR_RESULT, 5 compare VAR_RESULT, 5
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+2 -2
View File
@@ -190,9 +190,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
waitmessage waitmessage
waitbuttonpress waitbuttonpress
closemessage closemessage
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
data/maps/BattleFrontier_Lounge6/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
lock lock
faceplayer faceplayer
goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083 goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3 setvar VAR_0x8008, INGAME_TRADE_MEOWTH
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
data/maps/BattleFrontier_OutsideEast/scripts.inc
+4 -4
View File
@@ -9,7 +9,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -133,11 +133,11 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
setflag FLAG_DEFEATED_SUDOWOODO setflag FLAG_DEFEATED_SUDOWOODO
release release
data/maps/BattleFrontier_OutsideWest/scripts.inc
+8 -8
View File
@@ -144,13 +144,13 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
lock lock
faceplayer faceplayer
delay 20 delay 20
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5 call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq 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
@@ -169,13 +169,13 @@ BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6
faceplayer faceplayer
message BattleFrontier_OutsideWest_Text_23DCB0 message BattleFrontier_OutsideWest_Text_23DCB0
waitmessage waitmessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_OutsideWest_EventScript_23D608 call_if_eq BattleFrontier_OutsideWest_EventScript_23D608
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq BattleFrontier_OutsideWest_EventScript_23D613 call_if_eq BattleFrontier_OutsideWest_EventScript_23D613
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E
waitbuttonpress waitbuttonpress
release release
data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
data/maps/BattleFrontier_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 BattleFrontier_PokemonCenter_2F_EventScript_Colosseum:: @ 8267AB9
call CableClub_EventScript_Colosseum
end end
BattleFrontier_PokemonCenter_2F_EventScript_267ABF:: @ 8267ABF BattleFrontier_PokemonCenter_2F_EventScript_TradeCenter:: @ 8267ABF
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
BattleFrontier_PokemonCenter_2F_EventScript_267AC5:: @ 8267AC5 BattleFrontier_PokemonCenter_2F_EventScript_RecordCorner:: @ 8267AC5
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+4 -4
View File
@@ -172,13 +172,13 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT
closemessage closemessage
delay 30 delay 30
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq 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, Common_Movement_FacePlayer applymovement 1, Common_Movement_FacePlayer
data/maps/BirthIsland_Exterior/scripts.inc
+4 -4
View File
@@ -34,7 +34,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject 2 removeobject 2
return return
@@ -88,11 +88,11 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq BirthIsland_Exterior_EventScript_26803B goto_if_eq BirthIsland_Exterior_EventScript_26803B
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq BirthIsland_Exterior_EventScript_268049 goto_if_eq BirthIsland_Exterior_EventScript_268049
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq BirthIsland_Exterior_EventScript_268049 goto_if_eq BirthIsland_Exterior_EventScript_268049
setflag FLAG_BATTLED_DEOXYS setflag FLAG_BATTLED_DEOXYS
release release
data/maps/DesertRuins/scripts.inc
+4 -4
View File
@@ -10,7 +10,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B
DesertRuins_EventScript_22D975:: @ 822D975 DesertRuins_EventScript_22D975:: @ 822D975
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -72,11 +72,11 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq DesertRuins_EventScript_22DA49 goto_if_eq DesertRuins_EventScript_22DA49
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq DesertRuins_EventScript_22DA52 goto_if_eq DesertRuins_EventScript_22DA52
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq DesertRuins_EventScript_22DA52 goto_if_eq DesertRuins_EventScript_22DA52
setflag FLAG_DEFEATED_REGIROCK setflag FLAG_DEFEATED_REGIROCK
release release
data/maps/DewfordTown_Hall/scripts.inc
+4 -4
View File
@@ -198,7 +198,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
end end
DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
goto_if_eq DewfordTown_Hall_EventScript_1FD739 goto_if_eq DewfordTown_Hall_EventScript_1FD739
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
@@ -217,9 +217,9 @@ DewfordTown_Hall_EventScript_1FD772:: @ 81FD772
end end
DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq DewfordTown_Hall_EventScript_1FD7AA call_if_eq DewfordTown_Hall_EventScript_1FD7AA
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq DewfordTown_Hall_EventScript_1FD7B5 call_if_eq DewfordTown_Hall_EventScript_1FD7B5
return return
@@ -234,7 +234,7 @@ DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
return return
DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
goto_if_eq DewfordTown_Hall_EventScript_1FD739 goto_if_eq DewfordTown_Hall_EventScript_1FD739
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E
data/maps/DewfordTown_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 DewfordTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC62A
call CableClub_EventScript_Colosseum
end end
DewfordTown_PokemonCenter_2F_EventScript_1FC630:: @ 81FC630 DewfordTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC630
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
DewfordTown_PokemonCenter_2F_EventScript_1FC636:: @ 81FC636 DewfordTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC636
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+4 -4
View File
@@ -1,6 +1,6 @@
EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F
@@ -34,11 +34,11 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
faceplayer faceplayer
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, DIR_NORTH
call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
addvar VAR_SCOTT_STATE, 1 addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_IN_EVERGRANDE setflag FLAG_MET_SCOTT_IN_EVERGRANDE
data/maps/EverGrandeCity_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,20 +1,21 @@
EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 EverGrandeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8229CF5
call CableClub_EventScript_Colosseum
end end
EverGrandeCity_PokemonCenter_2F_EventScript_229CFB:: @ 8229CFB EverGrandeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8229CFB
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
EverGrandeCity_PokemonCenter_2F_EventScript_229D01:: @ 8229D01 EverGrandeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8229D01
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD
data/maps/EverGrandeCity_PokemonLeague_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 EverGrandeCity_PokemonLeague_2F_EventScript_Colosseum:: @ 8229D1C
call CableClub_EventScript_Colosseum
end end
EverGrandeCity_PokemonLeague_2F_EventScript_229D22:: @ 8229D22 EverGrandeCity_PokemonLeague_2F_EventScript_TradeCenter:: @ 8229D22
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
EverGrandeCity_PokemonLeague_2F_EventScript_229D28:: @ 8229D28 EverGrandeCity_PokemonLeague_2F_EventScript_RecordCorner:: @ 8229D28
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -1,6 +1,6 @@
FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8 FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8
@@ -30,8 +30,8 @@ FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01
msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28 case DIR_NORTH, FallarborTown_PokemonCenter_1F_EventScript_200C28
case 3, FallarborTown_PokemonCenter_1F_EventScript_200C38 case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_200C38
end end
FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28 FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28
data/maps/FallarborTown_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 FallarborTown_PokemonCenter_2F_EventScript_Colosseum:: @ 8200F00
call CableClub_EventScript_Colosseum
end end
FallarborTown_PokemonCenter_2F_EventScript_200F06:: @ 8200F06 FallarborTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8200F06
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
FallarborTown_PokemonCenter_2F_EventScript_200F0C:: @ 8200F0C FallarborTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8200F0C
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/FarawayIsland_Interior/scripts.inc
+13 -13
View File
@@ -11,13 +11,13 @@ FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 FarawayIsland_Interior_EventScript_267D19:: @ 8267D19
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq FarawayIsland_Interior_EventScript_267D4B goto_if_eq FarawayIsland_Interior_EventScript_267D4B
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq FarawayIsland_Interior_EventScript_267D4B goto_if_eq FarawayIsland_Interior_EventScript_267D4B
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq FarawayIsland_Interior_EventScript_267D4B goto_if_eq FarawayIsland_Interior_EventScript_267D4B
compare VAR_RESULT, 10 compare VAR_RESULT, B_OUTCOME_MON_TELEPORTED
goto_if_eq FarawayIsland_Interior_EventScript_267D4B goto_if_eq FarawayIsland_Interior_EventScript_267D4B
return return
@@ -32,7 +32,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -125,13 +125,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
message FarawayIsland_Interior_Text_Mew message FarawayIsland_Interior_Text_Mew
waitse waitse
playmoncry SPECIES_MEW, 2 playmoncry SPECIES_MEW, 2
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq FarawayIsland_Interior_EventScript_267EAF call_if_eq FarawayIsland_Interior_EventScript_267EAF
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq FarawayIsland_Interior_EventScript_267EBA call_if_eq FarawayIsland_Interior_EventScript_267EBA
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq FarawayIsland_Interior_EventScript_267EC5 call_if_eq FarawayIsland_Interior_EventScript_267EC5
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq FarawayIsland_Interior_EventScript_267ED0 call_if_eq FarawayIsland_Interior_EventScript_267ED0
special sub_81D4BEC special sub_81D4BEC
delay 40 delay 40
@@ -145,13 +145,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq FarawayIsland_Interior_EventScript_267E96 goto_if_eq FarawayIsland_Interior_EventScript_267E96
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq FarawayIsland_Interior_EventScript_267EA4 goto_if_eq FarawayIsland_Interior_EventScript_267EA4
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq FarawayIsland_Interior_EventScript_267EA4 goto_if_eq FarawayIsland_Interior_EventScript_267EA4
compare VAR_RESULT, 10 compare VAR_RESULT, B_OUTCOME_MON_TELEPORTED
goto_if_eq FarawayIsland_Interior_EventScript_267EA4 goto_if_eq FarawayIsland_Interior_EventScript_267EA4
setflag FLAG_CAUGHT_MEW setflag FLAG_CAUGHT_MEW
release release
data/maps/FortreeCity_House1/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
lock lock
faceplayer faceplayer
goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355 goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355
setvar VAR_0x8008, 1 setvar VAR_0x8008, INGAME_TRADE_PLUSLE
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3 FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3
data/maps/FortreeCity_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 FortreeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8217653
call CableClub_EventScript_Colosseum
end end
FortreeCity_PokemonCenter_2F_EventScript_217659:: @ 8217659 FortreeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8217659
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
FortreeCity_PokemonCenter_2F_EventScript_21765F:: @ 821765F FortreeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821765F
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/GraniteCave_StevensRoom/scripts.inc
+4 -4
View File
@@ -23,13 +23,13 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
setflag FLAG_REGISTERED_STEVEN_POKENAV setflag FLAG_REGISTERED_STEVEN_POKENAV
msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 call_if_eq GraniteCave_StevensRoom_EventScript_22DD18
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 call_if_eq GraniteCave_StevensRoom_EventScript_22DD18
playse SE_KAIDAN playse SE_KAIDAN
removeobject 1 removeobject 1
data/maps/IslandCave/scripts.inc
+4 -4
View File
@@ -10,7 +10,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A
IslandCave_EventScript_238E44:: @ 8238E44 IslandCave_EventScript_238E44:: @ 8238E44
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -101,11 +101,11 @@ IslandCave_EventScript_238F58:: @ 8238F58
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq IslandCave_EventScript_238F9F goto_if_eq IslandCave_EventScript_238F9F
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq IslandCave_EventScript_238FA8 goto_if_eq IslandCave_EventScript_238FA8
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq IslandCave_EventScript_238FA8 goto_if_eq IslandCave_EventScript_238FA8
setflag FLAG_DEFEATED_REGICE setflag FLAG_DEFEATED_REGICE
release release
data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05 LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05
data/maps/LavaridgeTown_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97
map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 LavaridgeTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FFCAC
call CableClub_EventScript_Colosseum
end end
LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB2:: @ 81FFCB2 LavaridgeTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FFCB2
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB8:: @ 81FFCB8 LavaridgeTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FFCB8
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/LilycoveCity_ContestLobby/scripts.inc
+3 -3
View File
@@ -810,7 +810,7 @@ LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1
LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF
special CloseLink special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
release release
end end
@@ -908,12 +908,12 @@ LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B
end end
LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33 LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33
special BerryBlenderLinkBecomeLeader special TryBecomeLinkLeader
waitstate waitstate
return return
LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38 LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38
special BerryBlenderLinkJoinGroup special TryJoinLinkGroup
waitstate waitstate
return return
data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
+3 -3
View File
@@ -40,9 +40,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E
waitmovement 0 waitmovement 0
removeobject 2 removeobject 2
switch VAR_FACING switch VAR_FACING
case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A
case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F case DIR_WEST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F
case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84 case DIR_EAST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84
end end
LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A
data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD
data/maps/LilycoveCity_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D
map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 LilycoveCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821C772
call CableClub_EventScript_Colosseum
end end
LilycoveCity_PokemonCenter_2F_EventScript_21C778:: @ 821C778 LilycoveCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 821C778
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
LilycoveCity_PokemonCenter_2F_EventScript_21C77E:: @ 821C77E LilycoveCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821C77E
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+4 -4
View File
@@ -73,13 +73,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
waitmovement 0 waitmovement 0
delay 10 delay 10
playbgm MUS_BOY_SUP, 1 playbgm MUS_BOY_SUP, 1
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594
setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+4 -4
View File
@@ -74,13 +74,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
waitmovement 0 waitmovement 0
delay 10 delay 10
playbgm MUS_GIRL_SUP, 1 playbgm MUS_GIRL_SUP, 1
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440
setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+10 -10
View File
@@ -288,7 +288,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceFastestRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
drawmonpic SPECIES_CYNDAQUIL, 10, 3 showmonpic SPECIES_CYNDAQUIL, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -301,7 +301,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceFastestRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
drawmonpic SPECIES_TOTODILE, 10, 3 showmonpic SPECIES_TOTODILE, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -314,7 +314,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceFastestRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
drawmonpic SPECIES_CHIKORITA, 10, 3 showmonpic SPECIES_CHIKORITA, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -327,7 +327,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061
erasemonpic hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT
releaseall releaseall
end end
@@ -340,7 +340,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC
erasemonpic hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon goto Common_EventScript_NoMoreRoomForPokemon
end end
@@ -371,7 +371,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
erasemonpic hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
releaseall releaseall
@@ -385,7 +385,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D
erasemonpic hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon goto Common_EventScript_NoMoreRoomForPokemon
end end
@@ -416,7 +416,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
erasemonpic hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
releaseall releaseall
@@ -430,7 +430,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E
erasemonpic hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon goto Common_EventScript_NoMoreRoomForPokemon
end end
@@ -461,7 +461,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F
erasemonpic hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
releaseall releaseall
data/maps/MarineCave_End/scripts.inc
+4 -4
View File
@@ -9,7 +9,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA
MarineCave_End_EventScript_23AFF4:: @ 823AFF4 MarineCave_End_EventScript_23AFF4:: @ 823AFF4
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject 1 removeobject 1
return return
@@ -41,11 +41,11 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq MarineCave_End_EventScript_23B084 goto_if_eq MarineCave_End_EventScript_23B084
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq MarineCave_End_EventScript_23B092 goto_if_eq MarineCave_End_EventScript_23B092
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq MarineCave_End_EventScript_23B092 goto_if_eq MarineCave_End_EventScript_23B092
setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
setflag FLAG_DEFEATED_KYOGRE setflag FLAG_DEFEATED_KYOGRE
data/maps/MauvilleCity/scripts.inc
+6 -6
View File
@@ -109,8 +109,8 @@ MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD
goto_if_eq MauvilleCity_EventScript_1DF683 goto_if_eq MauvilleCity_EventScript_1DF683
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 2, MauvilleCity_EventScript_1DF4E0 case DIR_NORTH, MauvilleCity_EventScript_1DF4E0
case 4, MauvilleCity_EventScript_1DF53D case DIR_EAST, MauvilleCity_EventScript_1DF53D
end end
MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
@@ -160,18 +160,18 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
setflag FLAG_DEFEATED_WALLY_MAUVILLE setflag FLAG_DEFEATED_WALLY_MAUVILLE
setvar VAR_WALLY_CALL_STEP_COUNTER, 0 setvar VAR_WALLY_CALL_STEP_COUNTER, 0
setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq MauvilleCity_EventScript_1DF5F3 call_if_eq MauvilleCity_EventScript_1DF5F3
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_1DF601 call_if_eq MauvilleCity_EventScript_1DF601
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
closemessage closemessage
addvar VAR_SCOTT_STATE, 1 addvar VAR_SCOTT_STATE, 1
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq MauvilleCity_EventScript_1DF616 call_if_eq MauvilleCity_EventScript_1DF616
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_1DF628 call_if_eq MauvilleCity_EventScript_1DF628
removeobject 11 removeobject 11
releaseall releaseall
data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66 MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66
data/maps/MauvilleCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F", "script": "MauvilleCity_PokemonCenter_2F_EventScript_Youngster",
"flag": "0" "flag": "0"
} }
], ],
data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
+14 -13
View File
@@ -1,27 +1,28 @@
MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008
map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 MauvilleCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821101D
call CableClub_EventScript_Colosseum
end end
MauvilleCity_PokemonCenter_2F_EventScript_211023:: @ 8211023 MauvilleCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8211023
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
MauvilleCity_PokemonCenter_2F_EventScript_211029:: @ 8211029 MauvilleCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8211029
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
MauvilleCity_PokemonCenter_2F_EventScript_21102F:: @ 821102F MauvilleCity_PokemonCenter_2F_EventScript_Youngster:: @ 821102F
msgbox MauvilleCity_PokemonCenter_2F_Text_211038, MSGBOX_NPC msgbox MauvilleCity_PokemonCenter_2F_Text_Youngster, MSGBOX_NPC
end end
MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038 MauvilleCity_PokemonCenter_2F_Text_Youngster: @ 8211038
.string "Did you know that you can link battle\n" .string "Did you know that you can link battle\n"
.string "at the COLOSSEUM here?\p" .string "at the COLOSSEUM here?\p"
.string "They put up your record on the wall\n" .string "They put up your record on the wall\n"
data/maps/MossdeepCity/scripts.inc
+2 -2
View File
@@ -255,9 +255,9 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85
faceplayer faceplayer
msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq MossdeepCity_EventScript_1E4CB0 call_if_eq MossdeepCity_EventScript_1E4CB0
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq MossdeepCity_EventScript_1E4CC2 call_if_eq MossdeepCity_EventScript_1E4CC2
addvar VAR_SCOTT_STATE, 1 addvar VAR_SCOTT_STATE, 1
removeobject 16 removeobject 16
data/maps/MossdeepCity_GameCorner_1F/map.json
+6 -6
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_GameCorner_1F_EventScript_224B54", "script": "MossdeepCity_GameCorner_1F_EventScript_OldMan",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_GameCorner_1F_EventScript_224B4B", "script": "MossdeepCity_GameCorner_1F_EventScript_InfoMan",
"flag": "0" "flag": "0"
} }
], ],
@@ -72,7 +72,7 @@
"y": 0, "y": 0,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "MossdeepCity_GameCorner_1F_EventScript_224B5D" "script": "RS_MysteryEventsHouse_EventScript_Door"
}, },
{ {
"type": "sign", "type": "sign",
@@ -80,7 +80,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "MossdeepCity_GameCorner_1F_EventScript_277E9D" "script": "MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords"
}, },
{ {
"type": "sign", "type": "sign",
@@ -88,7 +88,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "MossdeepCity_GameCorner_1F_EventScript_277E96" "script": "MossdeepCity_GameCorner_1F_EventScript_PokemonJumpRecords"
} }
] ]
} }
data/maps/MossdeepCity_GameCorner_1F/scripts.inc
+27 -20
View File
@@ -1,80 +1,87 @@
MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41 map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37
map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
.byte 0 .byte 0
MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37
map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant
.2byte 0 .2byte 0
MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41 MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41
map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
.2byte 0 .2byte 0
MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B @ Script is redundant, the label in the goto also does lock and faceplayer
MossdeepCity_GameCorner_1F_EventScript_InfoMan:: @ 8224B4B
lock lock
faceplayer faceplayer
goto MossdeepCity_GameCorner_1F_EventScript_277C34 goto MossdeepCity_GameCorner_1F_EventScript_InfoMan2
release release
end end
MossdeepCity_GameCorner_1F_EventScript_224B54:: @ 8224B54 @ Script is redundant, the label in the goto also does lock and faceplayer
MossdeepCity_GameCorner_1F_EventScript_OldMan:: @ 8224B54
lock lock
faceplayer faceplayer
goto MossdeepCity_GameCorner_1F_EventScript_277C91 goto MossdeepCity_GameCorner_1F_EventScript_OldMan2
release release
end end
MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D
msgbox MossdeepCity_GameCorner_1F_Text_224BFD, MSGBOX_SIGN @ Everything below is leftover from RS
@ The house that was here in RS was moved to Sootopolis and replaced by the Game Corner
@ The text below is unused and duplicated in its replacement in Sootopolis City
@ And the BG Door event was moved inaccessibly into a wall
RS_MysteryEventsHouse_EventScript_Door:: @ 8224B5D
msgbox RS_MysteryEventsHouse_Text_DoorIsLocked, MSGBOX_SIGN
end end
MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66 RS_MysteryEventsHouse_Text_OldManGreeting: @ 8224B66
.string "When I was young, I traveled the world\n" .string "When I was young, I traveled the world\n"
.string "as a POKéMON TRAINER.\p" .string "as a POKéMON TRAINER.\p"
.string "Now that I've become an old buzzard,\n" .string "Now that I've become an old buzzard,\n"
.string "my only amusement is watching young\l" .string "my only amusement is watching young\l"
.string "TRAINERS battle.$" .string "TRAINERS battle.$"
MossdeepCity_GameCorner_1F_Text_224BFD: @ 8224BFD RS_MysteryEventsHouse_Text_DoorIsLocked: @ 8224BFD
.string "The door appears to be locked.$" .string "The door appears to be locked.$"
MossdeepCity_GameCorner_1F_Text_224C1C: @ 8224C1C RS_MysteryEventsHouse_Text_ChallengeVisitingTrainer: @ 8224C1C
.string "A TRAINER named {STR_VAR_1} is\n" .string "A TRAINER named {STR_VAR_1} is\n"
.string "visiting my home.\p" .string "visiting my home.\p"
.string "Would you like to challenge\n" .string "Would you like to challenge\n"
.string "{STR_VAR_1}?$" .string "{STR_VAR_1}?$"
MossdeepCity_GameCorner_1F_Text_224C64: @ 8224C64 RS_MysteryEventsHouse_Text_YouWontBattle: @ 8224C64
.string "You won't battle? I'm disappointed\n" .string "You won't battle? I'm disappointed\n"
.string "that I can't see you battle…$" .string "that I can't see you battle…$"
MossdeepCity_GameCorner_1F_Text_224CA4: @ 8224CA4 RS_MysteryEventsHouse_Text_KeepItToA3On3: @ 8224CA4
.string "Oh, good, good!\p" .string "Oh, good, good!\p"
.string "But my house isn't all that sturdy.\p" .string "But my house isn't all that sturdy.\p"
.string "Could I ask you to keep it down to\n" .string "Could I ask you to keep it down to\n"
.string "a 3-on-3 match?$" .string "a 3-on-3 match?$"
MossdeepCity_GameCorner_1F_Text_224D0B: @ 8224D0B RS_MysteryEventsHouse_Text_SaveYourProgress: @ 8224D0B
.string "Before you two battle, you should\n" .string "Before you two battle, you should\n"
.string "save your progress.$" .string "save your progress.$"
MossdeepCity_GameCorner_1F_Text_224D41: @ 8224D41 RS_MysteryEventsHouse_Text_HopeToSeeAGoodMatch: @ 8224D41
.string "I hope to see a good match!$" .string "I hope to see a good match!$"
MossdeepCity_GameCorner_1F_Text_224D5D: @ 8224D5D RS_MysteryEventsHouse_Text_BattleTie: @ 8224D5D
.string "So, it became a standoff.\p" .string "So, it became a standoff.\p"
.string "It was a brilliant match in which\n" .string "It was a brilliant match in which\n"
.string "neither side conceded a step!$" .string "neither side conceded a step!$"
MossdeepCity_GameCorner_1F_Text_224DB7: @ 8224DB7 RS_MysteryEventsHouse_Text_BattleWon: @ 8224DB7
.string "That was superlative!\p" .string "That was superlative!\p"
.string "Why, it was like seeing myself in\n" .string "Why, it was like seeing myself in\n"
.string "my youth again!$" .string "my youth again!$"
MossdeepCity_GameCorner_1F_Text_224DFF: @ 8224DFF RS_MysteryEventsHouse_Text_BattleLost: @ 8224DFF
.string "Ah, too bad for you!\p" .string "Ah, too bad for you!\p"
.string "But it was a good match.\n" .string "But it was a good match.\n"
.string "I hope you can win next time.$" .string "I hope you can win next time.$"
data/maps/MossdeepCity_House2/scripts.inc
+2 -2
View File
@@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1
closemessage closemessage
setflag FLAG_WINGULL_DELIVERED_MAIL setflag FLAG_WINGULL_DELIVERED_MAIL
clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq MossdeepCity_House2_EventScript_222124 call_if_eq MossdeepCity_House2_EventScript_222124
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq MossdeepCity_House2_EventScript_22212F call_if_eq MossdeepCity_House2_EventScript_22212F
removeobject 3 removeobject 3
release release
data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A
data/maps/MossdeepCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B", "script": "MossdeepCity_PokemonCenter_2F_EventScript_Woman5",
"flag": "0" "flag": "0"
} }
], ],
data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
+14 -13
View File
@@ -1,27 +1,28 @@
MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 MossdeepCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8222349
call CableClub_EventScript_Colosseum
end end
MossdeepCity_PokemonCenter_2F_EventScript_22234F:: @ 822234F MossdeepCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 822234F
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355 MossdeepCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8222355
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B MossdeepCity_PokemonCenter_2F_EventScript_Woman5:: @ 822235B
msgbox MossdeepCity_PokemonCenter_2F_Text_222364, MSGBOX_NPC msgbox MossdeepCity_PokemonCenter_2F_Text_Woman5, MSGBOX_NPC
end end
MossdeepCity_PokemonCenter_2F_Text_222364: @ 8222364 MossdeepCity_PokemonCenter_2F_Text_Woman5: @ 8222364
.string "If I win a whole lot of link battles\n" .string "If I win a whole lot of link battles\n"
.string "and show everyone how good I am,\l" .string "and show everyone how good I am,\l"
.string "I might get a fan following!$" .string "I might get a fan following!$"
data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+2 -2
View File
@@ -238,8 +238,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F
setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F
copyobjectxytoperm 9 copyobjectxytoperm 9
switch VAR_FACING switch VAR_FACING
case 3, MossdeepCity_SpaceCenter_1F_EventScript_223278 case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_223278
case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289 case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_223289
applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2 applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2
waitmovement 0 waitmovement 0
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2 setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+3 -3
View File
@@ -194,7 +194,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A
delay 30 delay 30
playse SE_KOUKA_L playse SE_KOUKA_L
switch VAR_FACING switch VAR_FACING
case 1, MossdeepCity_SpaceCenter_2F_EventScript_223FBA case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_223FBA
applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6 applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6
waitmovement 0 waitmovement 0
releaseall releaseall
@@ -326,8 +326,8 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131 MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131
switch VAR_FACING switch VAR_FACING
case 1, MossdeepCity_SpaceCenter_2F_EventScript_22414D case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_22414D
case 3, MossdeepCity_SpaceCenter_2F_EventScript_224152 case DIR_WEST, MossdeepCity_SpaceCenter_2F_EventScript_224152
return return
MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D
data/maps/MtChimney/scripts.inc
+4 -4
View File
@@ -56,17 +56,17 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
fadescreen 0 fadescreen 0
setobjectxyperm 1, 10, 12 setobjectxyperm 1, 10, 12
addobject 1 addobject 1
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq MtChimney_EventScript_22EEC7 call_if_eq MtChimney_EventScript_22EEC7
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq MtChimney_EventScript_22EED2 call_if_eq MtChimney_EventScript_22EED2
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
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, DIR_EAST
call_if_eq MtChimney_EventScript_22EEDD call_if_eq MtChimney_EventScript_22EEDD
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq 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
data/maps/NavelRock_Bottom/scripts.inc
+4 -4
View File
@@ -23,7 +23,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284
NavelRock_Bottom_EventScript_26928E:: @ 826928E NavelRock_Bottom_EventScript_26928E:: @ 826928E
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject 1 removeobject 1
return return
@@ -61,11 +61,11 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NavelRock_Bottom_EventScript_269336 goto_if_eq NavelRock_Bottom_EventScript_269336
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NavelRock_Bottom_EventScript_269344 goto_if_eq NavelRock_Bottom_EventScript_269344
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NavelRock_Bottom_EventScript_269344 goto_if_eq NavelRock_Bottom_EventScript_269344
setflag FLAG_CAUGHT_LUGIA setflag FLAG_CAUGHT_LUGIA
release release
data/maps/NavelRock_Top/scripts.inc
+4 -4
View File
@@ -26,7 +26,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151
NavelRock_Top_EventScript_26915B:: @ 826915B NavelRock_Top_EventScript_26915B:: @ 826915B
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject 1 removeobject 1
return return
@@ -66,11 +66,11 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
setvar VAR_LAST_TALKED, 1 setvar VAR_LAST_TALKED, 1
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NavelRock_Top_EventScript_269217 goto_if_eq NavelRock_Top_EventScript_269217
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NavelRock_Top_EventScript_269225 goto_if_eq NavelRock_Top_EventScript_269225
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NavelRock_Top_EventScript_269225 goto_if_eq NavelRock_Top_EventScript_269225
setflag FLAG_CAUGHT_HO_OH setflag FLAG_CAUGHT_HO_OH
releaseall releaseall
data/maps/NewMauville_Inside/scripts.inc
+10 -10
View File
@@ -14,7 +14,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7
NewMauville_Inside_EventScript_237407:: @ 8237407 NewMauville_Inside_EventScript_237407:: @ 8237407
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -190,11 +190,11 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NewMauville_Inside_EventScript_2377F3 goto_if_eq NewMauville_Inside_EventScript_2377F3
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NewMauville_Inside_EventScript_2377F3 goto_if_eq NewMauville_Inside_EventScript_2377F3
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NewMauville_Inside_EventScript_2377F3 goto_if_eq NewMauville_Inside_EventScript_2377F3
setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE
release release
@@ -217,11 +217,11 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NewMauville_Inside_EventScript_237840 goto_if_eq NewMauville_Inside_EventScript_237840
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NewMauville_Inside_EventScript_237840 goto_if_eq NewMauville_Inside_EventScript_237840
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NewMauville_Inside_EventScript_237840 goto_if_eq NewMauville_Inside_EventScript_237840
setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE
release release
@@ -244,11 +244,11 @@ NewMauville_Inside_EventScript_237849:: @ 8237849
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NewMauville_Inside_EventScript_23788D goto_if_eq NewMauville_Inside_EventScript_23788D
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq NewMauville_Inside_EventScript_23788D goto_if_eq NewMauville_Inside_EventScript_23788D
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq NewMauville_Inside_EventScript_23788D goto_if_eq NewMauville_Inside_EventScript_23788D
setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE
release release
data/maps/OldaleTown/scripts.inc
+4 -4
View File
@@ -42,9 +42,9 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC
msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 1, OldaleTown_EventScript_1E8F47 case DIR_SOUTH, OldaleTown_EventScript_1E8F47
case 2, OldaleTown_EventScript_1E8F5E case DIR_NORTH, OldaleTown_EventScript_1E8F5E
case 4, OldaleTown_EventScript_1E8F75 case DIR_EAST, OldaleTown_EventScript_1E8F75
end end
OldaleTown_EventScript_1E8F47:: @ 81E8F47 OldaleTown_EventScript_1E8F47:: @ 81E8F47
@@ -286,7 +286,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A
end end
OldaleTown_EventScript_1E9148:: @ 81E9148 OldaleTown_EventScript_1E9148:: @ 81E9148
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
goto_if_ne OldaleTown_EventScript_1E915E goto_if_ne OldaleTown_EventScript_1E915E
applymovement 4, OldaleTown_Movement_1E9177 applymovement 4, OldaleTown_Movement_1E9177
waitmovement 0 waitmovement 0
data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011 OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011
data/maps/OldaleTown_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218
map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 OldaleTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC22D
call CableClub_EventScript_Colosseum
end end
OldaleTown_PokemonCenter_2F_EventScript_1FC233:: @ 81FC233 OldaleTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC233
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
OldaleTown_PokemonCenter_2F_EventScript_1FC239:: @ 81FC239 OldaleTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC239
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/PacifidlogTown_House3/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11
lock lock
faceplayer faceplayer
goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB
setvar VAR_0x8008, 2 setvar VAR_0x8008, INGAME_TRADE_HORSEA
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2 PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2
data/maps/PacifidlogTown_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635
map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 PacifidlogTown_PokemonCenter_2F_EventScript_Colosseum:: @ 820364A
call CableClub_EventScript_Colosseum
end end
PacifidlogTown_PokemonCenter_2F_EventScript_203650:: @ 8203650 PacifidlogTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8203650
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
PacifidlogTown_PokemonCenter_2F_EventScript_203656:: @ 8203656 PacifidlogTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8203656
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/PetalburgCity_Gym/scripts.inc
+7 -7
View File
@@ -125,10 +125,10 @@ PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1
msgbox PetalburgCity_Gym_Text_2057A2, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_2057A2, MSGBOX_DEFAULT
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 1, PetalburgCity_Gym_EventScript_204A80 case DIR_SOUTH, PetalburgCity_Gym_EventScript_204A80
case 2, PetalburgCity_Gym_EventScript_204A8B case DIR_NORTH, PetalburgCity_Gym_EventScript_204A8B
case 3, PetalburgCity_Gym_EventScript_204A96 case DIR_WEST, PetalburgCity_Gym_EventScript_204A96
case 4, PetalburgCity_Gym_EventScript_204AA1 case DIR_EAST, PetalburgCity_Gym_EventScript_204AA1
end end
PetalburgCity_Gym_EventScript_204A80:: @ 8204A80 PetalburgCity_Gym_EventScript_204A80:: @ 8204A80
@@ -436,9 +436,9 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
delay 10 delay 10
addobject 11 addobject 11
switch VAR_FACING switch VAR_FACING
case 2, PetalburgCity_Gym_EventScript_204EF5 case DIR_NORTH, PetalburgCity_Gym_EventScript_204EF5
case 3, PetalburgCity_Gym_EventScript_204F09 case DIR_WEST, PetalburgCity_Gym_EventScript_204F09
case 4, PetalburgCity_Gym_EventScript_204EFF case DIR_EAST, PetalburgCity_Gym_EventScript_204EFF
end end
PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2
data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3 PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3
data/maps/PetalburgCity_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 PetalburgCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8207D56
call CableClub_EventScript_Colosseum
end end
PetalburgCity_PokemonCenter_2F_EventScript_207D5C:: @ 8207D5C PetalburgCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8207D5C
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
PetalburgCity_PokemonCenter_2F_EventScript_207D62:: @ 8207D62 PetalburgCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8207D62
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/Route103/scripts.inc
+4 -4
View File
@@ -103,10 +103,10 @@ Route103_EventScript_1EC4FC:: @ 81EC4FC
Route103_EventScript_1EC50A:: @ 81EC50A Route103_EventScript_1EC50A:: @ 81EC50A
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 1, Route103_EventScript_1EC585 case DIR_SOUTH, Route103_EventScript_1EC585
case 2, Route103_EventScript_1EC53D case DIR_NORTH, Route103_EventScript_1EC53D
case 3, Route103_EventScript_1EC561 case DIR_WEST, Route103_EventScript_1EC561
case 4, Route103_EventScript_1EC561 case DIR_EAST, Route103_EventScript_1EC561
end end
Route103_EventScript_1EC53D:: @ 81EC53D Route103_EventScript_1EC53D:: @ 81EC53D
data/maps/Route109/scripts.inc
+3 -3
View File
@@ -9,9 +9,9 @@ Route109_EventScript_1EE760:: @ 81EE760
waitmovement 0 waitmovement 0
removeobject 2 removeobject 2
switch VAR_FACING switch VAR_FACING
case 1, Route109_EventScript_1EE7A5 case DIR_SOUTH, Route109_EventScript_1EE7A5
case 3, Route109_EventScript_1EE7C5 case DIR_WEST, Route109_EventScript_1EE7C5
case 4, Route109_EventScript_1EE7B5 case DIR_EAST, Route109_EventScript_1EE7B5
end end
Route109_EventScript_1EE7A5:: @ 81EE7A5 Route109_EventScript_1EE7A5:: @ 81EE7A5
data/maps/Route110_TrickHouseEnd/scripts.inc
+4 -4
View File
@@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC
Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq Route110_TrickHouseEnd_EventScript_26B015 call_if_eq Route110_TrickHouseEnd_EventScript_26B015
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq Route110_TrickHouseEnd_EventScript_26B020 call_if_eq Route110_TrickHouseEnd_EventScript_26B020
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq Route110_TrickHouseEnd_EventScript_26B02B call_if_eq Route110_TrickHouseEnd_EventScript_26B02B
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq Route110_TrickHouseEnd_EventScript_26B036 call_if_eq Route110_TrickHouseEnd_EventScript_26B036
delay 30 delay 30
msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT
data/maps/Route116/scripts.inc
+8 -8
View File
@@ -63,13 +63,13 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB
goto_if_eq Route116_EventScript_1F2D39 goto_if_eq Route116_EventScript_1F2D39
msgbox Route116_Text_1F3521, MSGBOX_DEFAULT msgbox Route116_Text_1F3521, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq Route116_EventScript_1F2D15 call_if_eq Route116_EventScript_1F2D15
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq Route116_EventScript_1F2D15 call_if_eq Route116_EventScript_1F2D15
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq Route116_EventScript_1F2D15 call_if_eq Route116_EventScript_1F2D15
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq Route116_EventScript_1F2D20 call_if_eq Route116_EventScript_1F2D20
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
@@ -196,13 +196,13 @@ Route116_EventScript_1F2E1B:: @ 81F2E1B
Route116_EventScript_1F2E2A:: @ 81F2E2A Route116_EventScript_1F2E2A:: @ 81F2E2A
delay 20 delay 20
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq Route116_EventScript_1F2E5E call_if_eq Route116_EventScript_1F2E5E
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq Route116_EventScript_1F2E5E call_if_eq Route116_EventScript_1F2E5E
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq Route116_EventScript_1F2E5E call_if_eq Route116_EventScript_1F2E5E
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq Route116_EventScript_1F2E69 call_if_eq Route116_EventScript_1F2E69
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
release release
data/maps/Route119/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ Route119_MapScript1_1F442F: @ 81F442F
Route119_EventScript_1F4439:: @ 81F4439 Route119_EventScript_1F4439:: @ 81F4439
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
data/maps/RustboroCity_House1/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F
lock lock
faceplayer faceplayer
goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_2159D5 goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_2159D5
setvar VAR_0x8008, 0 setvar VAR_0x8008, INGAME_TRADE_SEEDOT
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D
data/maps/RustboroCity_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE
map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 RustboroCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8214EF3
call CableClub_EventScript_Colosseum
end end
RustboroCity_PokemonCenter_2F_EventScript_214EF9:: @ 8214EF9 RustboroCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8214EF9
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
RustboroCity_PokemonCenter_2F_EventScript_214EFF:: @ 8214EFF RustboroCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8214EFF
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/RustboroCity_PokemonSchool/scripts.inc
+2 -2
View File
@@ -78,9 +78,9 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
lock lock
faceplayer faceplayer
goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_213FFB goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_213FFB
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5 call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq RustboroCity_PokemonSchool_EventScript_213FF0 call_if_eq RustboroCity_PokemonSchool_EventScript_213FF0
msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT
giveitem_std ITEM_QUICK_CLAW giveitem_std ITEM_QUICK_CLAW
data/maps/SafariZone_South/scripts.inc
+2 -2
View File
@@ -69,8 +69,8 @@ SafariZone_South_EventScript_23D31A:: @ 823D31A
msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 2, SafariZone_South_EventScript_23D33F case DIR_NORTH, SafariZone_South_EventScript_23D33F
case 4, SafariZone_South_EventScript_23D359 case DIR_EAST, SafariZone_South_EventScript_23D359
end end
SafariZone_South_EventScript_23D33F:: @ 823D33F SafariZone_South_EventScript_23D33F:: @ 823D33F
data/maps/SeafloorCavern_Entrance/scripts.inc
+6 -6
View File
@@ -18,11 +18,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
applymovement 1, Common_Movement_Delay48 applymovement 1, Common_Movement_Delay48
waitmovement 0 waitmovement 0
delay 20 delay 20
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SeafloorCavern_Entrance_EventScript_23452E call_if_eq SeafloorCavern_Entrance_EventScript_23452E
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SeafloorCavern_Entrance_EventScript_234523 call_if_eq SeafloorCavern_Entrance_EventScript_234523
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SeafloorCavern_Entrance_EventScript_234539 call_if_eq SeafloorCavern_Entrance_EventScript_234539
delay 30 delay 30
setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
@@ -35,11 +35,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
end end
SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SeafloorCavern_Entrance_EventScript_23452E call_if_eq SeafloorCavern_Entrance_EventScript_23452E
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SeafloorCavern_Entrance_EventScript_234523 call_if_eq SeafloorCavern_Entrance_EventScript_234523
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SeafloorCavern_Entrance_EventScript_234539 call_if_eq SeafloorCavern_Entrance_EventScript_234539
msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT
closemessage closemessage
data/maps/SingleBattleColosseum/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SingleBattleColosseum_EventScript_2774A6", "script": "SingleBattleColosseum_EventScript_Attendant",
"flag": "0" "flag": "0"
} }
], ],
data/maps/SkyPillar_Top/scripts.inc
+4 -4
View File
@@ -10,7 +10,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8
SkyPillar_Top_EventScript_2396D2:: @ 82396D2 SkyPillar_Top_EventScript_2396D2:: @ 82396D2
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -55,11 +55,11 @@ SkyPillar_Top_EventScript_239722:: @ 8239722
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq SkyPillar_Top_EventScript_239768 goto_if_eq SkyPillar_Top_EventScript_239768
compare VAR_RESULT, 4 compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq SkyPillar_Top_EventScript_239771 goto_if_eq SkyPillar_Top_EventScript_239771
compare VAR_RESULT, 5 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq SkyPillar_Top_EventScript_239771 goto_if_eq SkyPillar_Top_EventScript_239771
setflag FLAG_DEFEATED_RAYQUAZA setflag FLAG_DEFEATED_RAYQUAZA
releaseall releaseall
data/maps/SlateportCity_Harbor/scripts.inc
+2 -2
View File
@@ -230,9 +230,9 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SlateportCity_Harbor_EventScript_20CC42 call_if_eq SlateportCity_Harbor_EventScript_20CC42
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SlateportCity_Harbor_EventScript_20CC37 call_if_eq SlateportCity_Harbor_EventScript_20CC37
delay 30 delay 30
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+4 -4
View File
@@ -165,13 +165,13 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8
setflag FLAG_RECEIVED_TM46 setflag FLAG_RECEIVED_TM46
msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93
end end
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+5 -5
View File
@@ -16,21 +16,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8
applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5
waitmovement 0 waitmovement 0
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92
msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_20BC9D call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_20BC9D
msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT
msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT
closemessage closemessage
applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
waitmovement 0 waitmovement 0
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCA8
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCB3
trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2 trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2
msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT
data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF
map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA
data/maps/SlateportCity_PokemonCenter_2F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_27375B", "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_273761", "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_273767", "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_276B03", "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
} }
], ],
data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
+11 -10
View File
@@ -1,19 +1,20 @@
SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 @ The below 3 are unused and leftover from RS
call OldaleTown_PokemonCenter_2F_EventScript_276EB7 SlateportCity_PokemonCenter_2F_EventScript_Colosseum:: @ 820DC36
call CableClub_EventScript_Colosseum
end end
SlateportCity_PokemonCenter_2F_EventScript_20DC3C:: @ 820DC3C SlateportCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 820DC3C
call OldaleTown_PokemonCenter_2F_EventScript_2770B2 call CableClub_EventScript_TradeCenter
end end
SlateportCity_PokemonCenter_2F_EventScript_20DC42:: @ 820DC42 SlateportCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 820DC42
call OldaleTown_PokemonCenter_2F_EventScript_2771DB call CableClub_EventScript_RecordCorner
end end
data/maps/SootopolisCity/scripts.inc
+5 -5
View File
@@ -959,9 +959,9 @@ SootopolisCity_EventScript_1E61C2:: @ 81E61C2
SootopolisCity_EventScript_1E61CC:: @ 81E61CC SootopolisCity_EventScript_1E61CC:: @ 81E61CC
msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SootopolisCity_EventScript_1E6243 call_if_eq SootopolisCity_EventScript_1E6243
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SootopolisCity_EventScript_1E6255 call_if_eq SootopolisCity_EventScript_1E6255
msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT
closemessage closemessage
@@ -1354,11 +1354,11 @@ SootopolisCity_EventScript_1E646F:: @ 81E646F
setflag FLAG_RECEIVED_HM07 setflag FLAG_RECEIVED_HM07
msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SootopolisCity_EventScript_1E64B2 call_if_eq SootopolisCity_EventScript_1E64B2
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SootopolisCity_EventScript_1E64B2 call_if_eq SootopolisCity_EventScript_1E64B2
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SootopolisCity_EventScript_1E64C5 call_if_eq SootopolisCity_EventScript_1E64C5
release release
end end
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+3 -3
View File
@@ -109,11 +109,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
special ReducePlayerPartyToSelectedMons special ReducePlayerPartyToSelectedMons
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22
warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1
waitstate waitstate
data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1
map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC

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