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

Merge branch 'master' into doc-inc

Browse Source
This commit is contained in:
GriffinR
2019-10-13 15:26:44 -04:00
committed by GitHub
parent 2368f57669 e47b3efdfe
commit a081124a20
118 changed files with 7369 additions and 7975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -926,16 +926,16 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
return
BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
setvar VAR_0x8004, 9
setvar VAR_0x8004, USING_BATTLE_TOWER
message gText_PleaseWaitForLink
waitmessage
setvar VAR_0x8005, 0
special sub_80B2DA4
special TryBattleLinkup
waitstate
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2
goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady
compare VAR_RESULT, 3
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F327
compare VAR_RESULT, 4
@@ -943,7 +943,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
compare VAR_RESULT, 5
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6
compare VAR_RESULT, 6
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5
goto_if_eq CableClub_EventScript_AbortLinkConnectionError
compare VAR_RESULT, 11
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
end
@@ -952,7 +952,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327
special CloseLink
compare VAR_0x8005, 3
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F
msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT
msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
release
end
@@ -965,7 +965,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F
BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351
msgbox BattleFrontier_BattleTowerLobby_Text_241240, MSGBOX_DEFAULT
special CloseLink
msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, MSGBOX_DEFAULT
msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT
release
end
@@ -1020,7 +1020,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8
end
BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3
message BattleFrontier_BattleTowerLobby_Text_2792CD
message CableClub_Text_ChooseGroupLeaderOfTwo
waitmessage
multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
@@ -1031,7 +1031,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3
end
BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430
call BattleFrontier_BattleTowerLobby_EventScript_277B30
call CableClub_EventScript_TryBecomeLinkLeader
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
compare VAR_RESULT, 5
@@ -1044,7 +1044,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430
return
BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
call BattleFrontier_BattleTowerLobby_EventScript_277B35
call CableClub_EventScript_TryJoinLinkGroup
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
compare VAR_RESULT, 5

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

@@ -5,7 +5,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
lock
faceplayer
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
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT

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

@@ -1,6 +1,6 @@
BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
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
BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
BattleFrontier_PokemonCenter_2F_EventScript_Colosseum:: @ 8267AB9
call CableClub_EventScript_Colosseum
end
BattleFrontier_PokemonCenter_2F_EventScript_267ABF:: @ 8267ABF
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
BattleFrontier_PokemonCenter_2F_EventScript_TradeCenter:: @ 8267ABF
call CableClub_EventScript_TradeCenter
end
BattleFrontier_PokemonCenter_2F_EventScript_267AC5:: @ 8267AC5
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
BattleFrontier_PokemonCenter_2F_EventScript_RecordCorner:: @ 8267AC5
call CableClub_EventScript_RecordCorner
end

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

@@ -1,6 +1,6 @@
DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
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
DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
DewfordTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC62A
call CableClub_EventScript_Colosseum
end
DewfordTown_PokemonCenter_2F_EventScript_1FC630:: @ 81FC630
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
DewfordTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC630
call CableClub_EventScript_TradeCenter
end
DewfordTown_PokemonCenter_2F_EventScript_1FC636:: @ 81FC636
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
DewfordTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC636
call CableClub_EventScript_RecordCorner
end

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

@@ -1,6 +1,6 @@
EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
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
EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
View File

@@ -1,20 +1,21 @@
EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
EverGrandeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8229CF5
call CableClub_EventScript_Colosseum
end
EverGrandeCity_PokemonCenter_2F_EventScript_229CFB:: @ 8229CFB
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
EverGrandeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8229CFB
call CableClub_EventScript_TradeCenter
end
EverGrandeCity_PokemonCenter_2F_EventScript_229D01:: @ 8229D01
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
EverGrandeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8229D01
call CableClub_EventScript_RecordCorner
end

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

@@ -1,6 +1,6 @@
EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
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
EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
EverGrandeCity_PokemonLeague_2F_EventScript_Colosseum:: @ 8229D1C
call CableClub_EventScript_Colosseum
end
EverGrandeCity_PokemonLeague_2F_EventScript_229D22:: @ 8229D22
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
EverGrandeCity_PokemonLeague_2F_EventScript_TradeCenter:: @ 8229D22
call CableClub_EventScript_TradeCenter
end
EverGrandeCity_PokemonLeague_2F_EventScript_229D28:: @ 8229D28
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
EverGrandeCity_PokemonLeague_2F_EventScript_RecordCorner:: @ 8229D28
call CableClub_EventScript_RecordCorner
end

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

@@ -1,6 +1,6 @@
FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
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
FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
FallarborTown_PokemonCenter_2F_EventScript_Colosseum:: @ 8200F00
call CableClub_EventScript_Colosseum
end
FallarborTown_PokemonCenter_2F_EventScript_200F06:: @ 8200F06
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
FallarborTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8200F06
call CableClub_EventScript_TradeCenter
end
FallarborTown_PokemonCenter_2F_EventScript_200F0C:: @ 8200F0C
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
FallarborTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8200F0C
call CableClub_EventScript_RecordCorner
end

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

@@ -5,7 +5,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
lock
faceplayer
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
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT

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

@@ -1,6 +1,6 @@
FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
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
FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
FortreeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8217653
call CableClub_EventScript_Colosseum
end
FortreeCity_PokemonCenter_2F_EventScript_217659:: @ 8217659
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
FortreeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8217659
call CableClub_EventScript_TradeCenter
end
FortreeCity_PokemonCenter_2F_EventScript_21765F:: @ 821765F
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
FortreeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821765F
call CableClub_EventScript_RecordCorner
end

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

@@ -1,6 +1,6 @@
LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
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
LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97
map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
LavaridgeTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FFCAC
call CableClub_EventScript_Colosseum
end
LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB2:: @ 81FFCB2
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
LavaridgeTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FFCB2
call CableClub_EventScript_TradeCenter
end
LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB8:: @ 81FFCB8
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
LavaridgeTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FFCB8
call CableClub_EventScript_RecordCorner
end

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

@@ -810,7 +810,7 @@ LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1
LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT
msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
release
end
@@ -908,12 +908,12 @@ LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B
end
LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33
special BerryBlenderLinkBecomeLeader
special TryBecomeLinkLeader
waitstate
return
LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38
special BerryBlenderLinkJoinGroup
special TryJoinLinkGroup
waitstate
return

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

@@ -1,6 +1,6 @@
LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
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
LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D
map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
LilycoveCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821C772
call CableClub_EventScript_Colosseum
end
LilycoveCity_PokemonCenter_2F_EventScript_21C778:: @ 821C778
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
LilycoveCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 821C778
call CableClub_EventScript_TradeCenter
end
LilycoveCity_PokemonCenter_2F_EventScript_21C77E:: @ 821C77E
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
LilycoveCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821C77E
call CableClub_EventScript_RecordCorner
end

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

@@ -288,7 +288,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
drawmonpic SPECIES_CYNDAQUIL, 10, 3
showmonpic SPECIES_CYNDAQUIL, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -301,7 +301,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
drawmonpic SPECIES_TOTODILE, 10, 3
showmonpic SPECIES_TOTODILE, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -314,7 +314,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
drawmonpic SPECIES_CHIKORITA, 10, 3
showmonpic SPECIES_CHIKORITA, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -327,7 +327,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061
erasemonpic
hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT
releaseall
end
@@ -340,7 +340,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC
erasemonpic
hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon
end
@@ -371,7 +371,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
erasemonpic
hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
releaseall
@@ -385,7 +385,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D
erasemonpic
hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon
end
@@ -416,7 +416,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
erasemonpic
hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
releaseall
@@ -430,7 +430,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E
erasemonpic
hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon
end
@@ -461,7 +461,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F
erasemonpic
hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
releaseall

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

@@ -1,6 +1,6 @@
MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
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
MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66

10
data/maps/MauvilleCity_PokemonCenter_2F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_Youngster",
"flag": "0"
}
],

27
data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
View File

@@ -1,27 +1,28 @@
MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008
map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
MauvilleCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821101D
call CableClub_EventScript_Colosseum
end
MauvilleCity_PokemonCenter_2F_EventScript_211023:: @ 8211023
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
MauvilleCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8211023
call CableClub_EventScript_TradeCenter
end
MauvilleCity_PokemonCenter_2F_EventScript_211029:: @ 8211029
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
MauvilleCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8211029
call CableClub_EventScript_RecordCorner
end
MauvilleCity_PokemonCenter_2F_EventScript_21102F:: @ 821102F
msgbox MauvilleCity_PokemonCenter_2F_Text_211038, MSGBOX_NPC
MauvilleCity_PokemonCenter_2F_EventScript_Youngster:: @ 821102F
msgbox MauvilleCity_PokemonCenter_2F_Text_Youngster, MSGBOX_NPC
end
MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038
MauvilleCity_PokemonCenter_2F_Text_Youngster: @ 8211038
.string "Did you know that you can link battle\n"
.string "at the COLOSSEUM here?\p"
.string "They put up your record on the wall\n"

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

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_GameCorner_1F_EventScript_224B54",
"script": "MossdeepCity_GameCorner_1F_EventScript_OldMan",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_GameCorner_1F_EventScript_224B4B",
"script": "MossdeepCity_GameCorner_1F_EventScript_InfoMan",
"flag": "0"
}
],
@@ -72,7 +72,7 @@
"y": 0,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "MossdeepCity_GameCorner_1F_EventScript_224B5D"
"script": "RS_MysteryEventsHouse_EventScript_Door"
},
{
"type": "sign",
@@ -80,7 +80,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "MossdeepCity_GameCorner_1F_EventScript_277E9D"
"script": "MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords"
},
{
"type": "sign",
@@ -88,7 +88,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "MossdeepCity_GameCorner_1F_EventScript_277E96"
"script": "MossdeepCity_GameCorner_1F_EventScript_PokemonJumpRecords"
}
]
}
}

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

@@ -1,80 +1,87 @@
MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
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_LOAD, MossdeepCity_GameCorner_1F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
.byte 0
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
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
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
faceplayer
goto MossdeepCity_GameCorner_1F_EventScript_277C34
goto MossdeepCity_GameCorner_1F_EventScript_InfoMan2
release
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
faceplayer
goto MossdeepCity_GameCorner_1F_EventScript_277C91
goto MossdeepCity_GameCorner_1F_EventScript_OldMan2
release
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
MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66
RS_MysteryEventsHouse_Text_OldManGreeting: @ 8224B66
.string "When I was young, I traveled the world\n"
.string "as a POKéMON TRAINER.\p"
.string "Now that I've become an old buzzard,\n"
.string "my only amusement is watching young\l"
.string "TRAINERS battle.$"
MossdeepCity_GameCorner_1F_Text_224BFD: @ 8224BFD
RS_MysteryEventsHouse_Text_DoorIsLocked: @ 8224BFD
.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 "visiting my home.\p"
.string "Would you like to challenge\n"
.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 "that I can't see you battle…$"
MossdeepCity_GameCorner_1F_Text_224CA4: @ 8224CA4
RS_MysteryEventsHouse_Text_KeepItToA3On3: @ 8224CA4
.string "Oh, good, good!\p"
.string "But my house isn't all that sturdy.\p"
.string "Could I ask you to keep it down to\n"
.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 "save your progress.$"
MossdeepCity_GameCorner_1F_Text_224D41: @ 8224D41
RS_MysteryEventsHouse_Text_HopeToSeeAGoodMatch: @ 8224D41
.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 "It was a brilliant match in which\n"
.string "neither side conceded a step!$"
MossdeepCity_GameCorner_1F_Text_224DB7: @ 8224DB7
RS_MysteryEventsHouse_Text_BattleWon: @ 8224DB7
.string "That was superlative!\p"
.string "Why, it was like seeing myself in\n"
.string "my youth again!$"
MossdeepCity_GameCorner_1F_Text_224DFF: @ 8224DFF
RS_MysteryEventsHouse_Text_BattleLost: @ 8224DFF
.string "Ah, too bad for you!\p"
.string "But it was a good match.\n"
.string "I hope you can win next time.$"

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

@@ -1,6 +1,6 @@
MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
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
MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A

10
data/maps/MossdeepCity_PokemonCenter_2F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_Woman5",
"flag": "0"
}
],

27
data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
View File

@@ -1,27 +1,28 @@
MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
MossdeepCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8222349
call CableClub_EventScript_Colosseum
end
MossdeepCity_PokemonCenter_2F_EventScript_22234F:: @ 822234F
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
MossdeepCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 822234F
call CableClub_EventScript_TradeCenter
end
MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
MossdeepCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8222355
call CableClub_EventScript_RecordCorner
end
MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B
msgbox MossdeepCity_PokemonCenter_2F_Text_222364, MSGBOX_NPC
MossdeepCity_PokemonCenter_2F_EventScript_Woman5:: @ 822235B
msgbox MossdeepCity_PokemonCenter_2F_Text_Woman5, MSGBOX_NPC
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 "and show everyone how good I am,\l"
.string "I might get a fan following!$"

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

@@ -1,6 +1,6 @@
OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
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
OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218
map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
OldaleTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC22D
call CableClub_EventScript_Colosseum
end
OldaleTown_PokemonCenter_2F_EventScript_1FC233:: @ 81FC233
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
OldaleTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC233
call CableClub_EventScript_TradeCenter
end
OldaleTown_PokemonCenter_2F_EventScript_1FC239:: @ 81FC239
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
OldaleTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC239
call CableClub_EventScript_RecordCorner
end

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

@@ -5,7 +5,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11
lock
faceplayer
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
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT

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

@@ -1,6 +1,6 @@
PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
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
PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635
map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
PacifidlogTown_PokemonCenter_2F_EventScript_Colosseum:: @ 820364A
call CableClub_EventScript_Colosseum
end
PacifidlogTown_PokemonCenter_2F_EventScript_203650:: @ 8203650
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
PacifidlogTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8203650
call CableClub_EventScript_TradeCenter
end
PacifidlogTown_PokemonCenter_2F_EventScript_203656:: @ 8203656
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
PacifidlogTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8203656
call CableClub_EventScript_RecordCorner
end

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

@@ -1,6 +1,6 @@
PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
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
PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
PetalburgCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8207D56
call CableClub_EventScript_Colosseum
end
PetalburgCity_PokemonCenter_2F_EventScript_207D5C:: @ 8207D5C
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
PetalburgCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8207D5C
call CableClub_EventScript_TradeCenter
end
PetalburgCity_PokemonCenter_2F_EventScript_207D62:: @ 8207D62
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
PetalburgCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8207D62
call CableClub_EventScript_RecordCorner
end

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

@@ -5,7 +5,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F
lock
faceplayer
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
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT

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

@@ -1,6 +1,6 @@
RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
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
RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE
map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
RustboroCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8214EF3
call CableClub_EventScript_Colosseum
end
RustboroCity_PokemonCenter_2F_EventScript_214EF9:: @ 8214EF9
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
RustboroCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8214EF9
call CableClub_EventScript_TradeCenter
end
RustboroCity_PokemonCenter_2F_EventScript_214EFF:: @ 8214EFF
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
RustboroCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8214EFF
call CableClub_EventScript_RecordCorner
end

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

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SingleBattleColosseum_EventScript_2774A6",
"script": "SingleBattleColosseum_EventScript_Attendant",
"flag": "0"
}
],

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

@@ -1,6 +1,6 @@
SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF
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
SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "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"
}
],

21
data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
SlateportCity_PokemonCenter_2F_EventScript_Colosseum:: @ 820DC36
call CableClub_EventScript_Colosseum
end
SlateportCity_PokemonCenter_2F_EventScript_20DC3C:: @ 820DC3C
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
SlateportCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 820DC3C
call CableClub_EventScript_TradeCenter
end
SlateportCity_PokemonCenter_2F_EventScript_20DC42:: @ 820DC42
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
SlateportCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 820DC42
call CableClub_EventScript_RecordCorner
end

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

@@ -1,6 +1,6 @@
SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1
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
SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SootopolisCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SootopolisCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SootopolisCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SootopolisCity_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

21
data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D
map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
SootopolisCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8226782
call CableClub_EventScript_Colosseum
end
SootopolisCity_PokemonCenter_2F_EventScript_226788:: @ 8226788
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
SootopolisCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8226788
call CableClub_EventScript_TradeCenter
end
SootopolisCity_PokemonCenter_2F_EventScript_22678E:: @ 822678E
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
SootopolisCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 822678E
call CableClub_EventScript_RecordCorner
end

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

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "TradeCenter_EventScript_2774B6",
"script": "TradeCenter_EventScript_Attendant",
"flag": "0"
}
],

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

@@ -1,6 +1,6 @@
VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726
map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

21
data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
View File

@@ -1,19 +1,20 @@
VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897
map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC
call OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ The below 3 are unused and leftover from RS
VerdanturfTown_PokemonCenter_2F_EventScript_Colosseum:: @ 82028AC
call CableClub_EventScript_Colosseum
end
VerdanturfTown_PokemonCenter_2F_EventScript_2028B2:: @ 82028B2
call OldaleTown_PokemonCenter_2F_EventScript_2770B2
VerdanturfTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 82028B2
call CableClub_EventScript_TradeCenter
end
VerdanturfTown_PokemonCenter_2F_EventScript_2028B8:: @ 82028B8
call OldaleTown_PokemonCenter_2F_EventScript_2771DB
VerdanturfTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 82028B8
call CableClub_EventScript_RecordCorner
end