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

Document cable_club.inc

Browse Source
This commit is contained in:
GriffinR
2019-10-11 04:14:09 -04:00
committed by huderlem
parent 9b81fe1b62
commit 1b7607bd91
85 changed files with 1203 additions and 1269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
data/event_scripts.s
View File

@@ -3,6 +3,7 @@
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
#include "constants/berry.h"
#include "constants/cable_club.h"
#include "constants/contest.h"
#include "constants/daycare.h"
#include "constants/decorations.h"
@@ -1569,64 +1570,16 @@ EventScript_CableClub_SetVarResult0:: @ 8273755
setvar VAR_RESULT, 0
return
BattleFrontier_PokemonCenter_2F_EventScript_27375B:: @ 827375B
DewfordTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B
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
Common_EventScript_UnionRoomAttendant:: @ 827375B
call CableClub_EventScript_UnionRoomAttendant
end
BattleFrontier_PokemonCenter_2F_EventScript_273761:: @ 8273761
DewfordTown_PokemonCenter_2F_EventScript_273761:: @ 8273761
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
Common_EventScript_WirelessClubAttendant:: @ 8273761
call CableClub_EventScript_WirelessClubAttendant
end
BattleFrontier_PokemonCenter_2F_EventScript_273767:: @ 8273767
DewfordTown_PokemonCenter_2F_EventScript_273767:: @ 8273767
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
Common_EventScript_DirectCornerAttendant:: @ 8273767
call CableClub_EventScript_DirectCornerAttendant
end
Common_EventScript_RemoveStaticPokemon:: @ 827376D

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_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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

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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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_MapScript1_InitUnionRoom
.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_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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

1430
data/scripts/cable_club.inc
View File

File diff suppressed because it is too large Load Diff

10
data/scripts/pokeblocks.inc
View File

@@ -667,13 +667,13 @@ EventScript_PblocLink_NoPokeblock: @ 829416C
EventScript_PblocLink_SomeoneNotReady: @ 8294176
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_2781C7, MSGBOX_DEFAULT
msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
releaseall
end
EventScript_PblocLink_DifferentSelections: @ 8294183
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_278255, MSGBOX_DEFAULT
msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
releaseall
end
@@ -685,7 +685,7 @@ EventScript_PblocLink_CloseLink: @ 8294190
EventScript_PblocLink_LinkError: @ 829419D
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT
msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
releaseall
end
@@ -745,12 +745,12 @@ EventScript_PblocLink_TryJoinGroup: @ 829425D
end
EventScript_PblocLink_BecomeLeader: @ 8294285
special BerryBlenderLinkBecomeLeader
special TryBecomeLinkLeader
waitstate
return
EventScript_PblocLink_JoinGroup: @ 829428A
special BerryBlenderLinkJoinGroup
special TryJoinLinkGroup
waitstate
return

34
data/specials.inc
View File

@@ -11,7 +11,7 @@ gSpecials:: @ 81DBA64
def_special HealPlayerParty
def_special SetCableClubWarp
def_special sub_80AF948
def_special sub_80AF9F8
def_special ReturnFromLinkRoom
def_special CleanupLinkRoomState
def_special ExitLinkRoom
def_special SetPlayerSecretBase
@@ -36,8 +36,8 @@ gSpecials:: @ 81DBA64
def_special SetBattledOwnerFromResult
def_special DoSecretBasePCTurnOffEffect
def_special RecordMixingPlayerSpotTriggered
def_special sub_80B2DA4
def_special sub_80B2E4C
def_special TryBattleLinkup
def_special TryTradeLinkup
def_special sub_80B2E74
def_special sub_80B2EA8
def_special CloseLink
@@ -51,7 +51,7 @@ gSpecials:: @ 81DBA64
def_special SavePlayerParty
def_special LoadPlayerParty
def_special ChooseHalfPartyForBattle
def_special sp02A_crash_sound
def_special Script_ShowLinkTrainerCard
def_special EventObjectInteractionGetBerryTreeData
def_special EventObjectInteractionGetBerryName
def_special EventObjectInteractionGetBerryCountString
@@ -305,8 +305,8 @@ gSpecials:: @ 81DBA64
def_special LeadMonHasEffortRibbon
def_special GiveLeadMonEffortRibbon
def_special Special_AreLeadMonEVsMaxedOut
def_special sub_8098574
def_special sub_809859C
def_special Script_FacePlayer
def_special Script_ClearHeldMovement
def_special InitRoamer
def_special TryUpdateRusturfTunnelState
def_special IsGrassTypeInParty
@@ -349,7 +349,7 @@ gSpecials:: @ 81DBA64
def_special MonOTNameMatchesPlayer
def_special BufferLottoTicketNumber
def_special sub_81653CC
def_special sub_80F9370
def_special DoesPartyHaveEnigmaBerry
def_special ScriptRandom
def_special sub_81AFDD0
def_special sub_80EDCE8
@@ -424,22 +424,22 @@ gSpecials:: @ 81DBA64
def_special StartPlayerDescendMirageTower
def_special BufferTMHMMoveName
def_special IsWirelessAdapterConnected
def_special BerryBlenderLinkBecomeLeader
def_special BerryBlenderLinkJoinGroup
def_special TryBecomeLinkLeader
def_special TryJoinLinkGroup
def_special UnionRoomSpecial
def_special sub_801A42C
def_special sub_8016934
def_special InitUnionRoom
def_special BufferUnionRoomPlayerName
def_special sub_801DC20
def_special sub_81B8958
def_special sub_8018090
def_special ChooseMonForWirelessMinigame
def_special Script_ResetUnionRoomTrade
def_special IsBadEggInParty
def_special ValidateReceivedWonderCard
def_special HasAtLeastOneBerry
def_special sub_802C920
def_special sub_802E3C4
def_special sub_8027A5C
def_special sub_8027AAC
def_special DoesPartyHavePokemonJumpSpecies
def_special ShowPokemonJumpRecords
def_special DoesPartyHaveDodrio
def_special ShowDodrioBerryPickingRecords
def_special OffsetCameraForBattle
def_special GetDeptStoreDefaultFloorChoice
def_special BufferVarsForIVRater
@@ -512,7 +512,7 @@ gSpecials:: @ 81DBA64
def_special GetLilycoveSSTidalSelection
def_special TurnOnTVScreen
def_special sub_81D4A90
def_special sub_813B514
def_special ShouldDistributeEonTicket
def_special sub_813B568
def_special sub_813B534
def_special CallTrainerHillFunction

4
data/text/mevent.inc
View File

@@ -30,13 +30,13 @@ gUnknown_08273559:: @ 8273559
.string "Once you save your game, you can\n"
.string "access the MYSTERY EVENT.$"
gUnknown_08273594:: @ 8273594
Mevent_Text_TheresATicketForYou:: @ 8273594
.string "Thank you for using the MYSTERY\n"
.string "EVENT System.\p"
.string "You must be {PLAYER}.\n"
.string "There is a ticket here for you.$"
gUnknown_082735F2:: @ 82735F2
Mevent_Text_TryUsingItAtLilycovePort:: @ 82735F2
.string "It appears to be for use at\n"
.string "the LILYCOVE CITY port.\p"
.string "Why not give it a try and see what\n"

15
include/constants/cable_club.h Normal file
View File

@@ -0,0 +1,15 @@
#ifndef GUARD_CONSTANTS_CABLE_CLUB_H
#define GUARD_CONSTANTS_CABLE_CLUB_H
// States for VAR_CABLE_CLUB_STATE
#define USING_SINGLE_BATTLE 1
#define USING_DOUBLE_BATTLE 2
#define USING_TRADE_CENTER 3
#define USING_RECORD_CORNER 4
#define USING_MULTI_BATTLE 5
#define USING_UNION_ROOM 6
#define USING_BERRY_CRUSH 7
#define USING_MINIGAME 8
#define USING_BATTLE_TOWER 9
#endif //GUARD_CONSTANTS_CABLE_CLUB_H

2
include/constants/vars.h
View File

@@ -77,7 +77,7 @@
#define VAR_REGICE_STEPS_2 0x403C
#define VAR_REGICE_STEPS_3 0x403D
#define VAR_ALTERING_CAVE_WILD_SET 0x403E
#define VAR_ALWAYS_ZERO_0x403F 0x403F // This var is read and written, but is always zero.
#define VAR_DISTRIBUTE_EON_TICKET 0x403F // This var is read and written, but is always zero. Presumably meant to be set externally by Mystery Gift distribution
#define VAR_DAYS 0x4040
#define VAR_FANCLUB_UNKNOWN_1 0x4041
#define VAR_FANCLUB_UNKNOWN_2 0x4042

4
include/dodrio_berry_picking.h
View File

@@ -2,7 +2,7 @@
#define GUARD_DODRIO_BERRY_PICKING_H
void sub_802493C(u16 a0, void (*callback)(void));
void sub_8027A5C(void);
void sub_8027AAC(void);
void DoesPartyHaveDodrio(void);
void ShowDodrioBerryPickingRecords(void);
#endif // GUARD_DODRIO_BERRY_PICKING_H

22
include/link.h
View File

@@ -48,6 +48,28 @@
#define EXTRACT_LINK_ERRORS(status) \
(((status) & LINK_STAT_ERRORS) >> LINK_STAT_ERRORS_SHIFT)
#define LINKTYPE_0x1111 0x1111 // trade
#define LINKTYPE_0x1122 0x1122 // trade
#define LINKTYPE_0x1133 0x1133 // trade
#define LINKTYPE_0x1144 0x1144 // trade
#define LINKTYPE_BATTLE 0x2211
#define LINKTYPE_0x2222 0x2222 // unused battle?
#define LINKTYPE_SINGLE_BATTLE 0x2233
#define LINKTYPE_DOUBLE_BATTLE 0x2244
#define LINKTYPE_MULTI_BATTLE 0x2255
#define LINKTYPE_BATTLE_TOWER_50 0x2266
#define LINKTYPE_BATTLE_TOWER_OPEN 0x2277
#define LINKTYPE_0x2288 0x2288 // battle?
#define LINKTYPE_0x3311 0x3311
#define LINKTYPE_0x3322 0x3322
#define LINKTYPE_0x4411 0x4411
#define LINKTYPE_BERRY_BLENDER 0x4422
#define LINKTYPE_0x5501 0x5501 // mystery event
#define LINKTYPE_0x5502 0x5502 // unused?
#define LINKTYPE_0x5503 0x5503 // eReader
#define LINKTYPE_0x6601 0x6601
#define LINKTYPE_0x6602 0x6602
#define LINKCMD_SEND_LINK_TYPE 0x2222
#define LINKCMD_0x2FFE 0x2FFE
#define LINKCMD_SEND_HELD_KEYS 0x4444

2
include/party_menu.h
View File

@@ -124,7 +124,7 @@ void InitChooseHalfPartyForBattle(u8 unused);
void sub_81B8558(void);
void sub_81B8904(u8 initArg, MainCallback callback);
void sub_81B892C(void);
void sub_81B8958(void);
void ChooseMonForWirelessMinigame(void);
void OpenPartyMenuInBattle(u8 arg);
void sub_81B89F0(void);
void sub_81B8C68(void);

6
include/pokemon_jump.h
View File

@@ -4,10 +4,10 @@
#include "main.h"
void sub_802A9A8(u16 monId, MainCallback callback);
bool32 sub_802C908(u16 species);
void sub_802C920(void);
bool32 IsSpeciesAllowedInPokemonJump(u16 species);
void DoesPartyHavePokemonJumpSpecies(void);
void ResetPokeJumpResults(void);
void sub_802E3C4(void);
void ShowPokemonJumpRecords(void);
void sub_802EB24(s16 tileTag, s16 palTag, s16 x, s16 y, u8 subpriority);
bool32 sub_802EB84(void);

4
src/berry_blender.c
View File

@@ -1174,7 +1174,7 @@ static void sub_8080018(void)
{
case 0:
sub_8080588();
gLinkType = 0x4422;
gLinkType = LINKTYPE_BERRY_BLENDER;
sBerryBlenderData->field_72 = 0;
for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
{
@@ -1517,7 +1517,7 @@ static void sub_80808D4(void)
sBerryBlenderData->playAgainState = 0;
sBerryBlenderData->loadGfxState = 0;
gLinkType = 0x4422;
gLinkType = LINKTYPE_BERRY_BLENDER;
sBerryBlenderData->mainState++;
break;
case 1:

106
src/cable_club.c
View File

@@ -30,6 +30,8 @@
#include "trainer_card.h"
#include "party_menu.h"
#include "window.h"
#include "constants/battle_frontier.h"
#include "constants/cable_club.h"
#include "constants/songs.h"
static const struct WindowTemplate gUnknown_08550594 = {
@@ -457,7 +459,7 @@ static void task_map_chg_seq_0807EC34(u16 *a0, u32 taskId)
if (*a0 == 1)
{
if (gLinkType == 0x2266 || gLinkType == 0x2277)
if (gLinkType == LINKTYPE_BATTLE_TOWER_50 || gLinkType == LINKTYPE_BATTLE_TOWER_OPEN)
{
if (sub_80B2AF4(trainerCards[0].monSpecies, trainerCards[1].monSpecies))
{
@@ -550,45 +552,42 @@ static bool8 sub_80B2D6C(u8 taskId)
return FALSE;
}
void sub_80B2DA4(u8 arg0)
void TryBattleLinkup(u8 arg0)
{
u8 r3 = 2;
u8 r2 = 2;
switch (gSpecialVar_0x8004)
{
case 1:
case USING_SINGLE_BATTLE:
r3 = 2;
gLinkType = 0x2233;
gLinkType = LINKTYPE_SINGLE_BATTLE;
break;
case 2:
case USING_DOUBLE_BATTLE:
r3 = 2;
gLinkType = 0x2244;
gLinkType = LINKTYPE_DOUBLE_BATTLE;
break;
case 5:
case USING_MULTI_BATTLE:
r3 = 4;
r2 = 4;
gLinkType = 0x2255;
gLinkType = LINKTYPE_MULTI_BATTLE;
break;
case 9:
case USING_BATTLE_TOWER:
r3 = 2;
if (gSaveBlock2Ptr->frontier.lvlMode == 0)
{
gLinkType = 0x2266;
}
if (gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_50)
gLinkType = LINKTYPE_BATTLE_TOWER_50;
else
{
gLinkType = 0x2277;
}
gLinkType = LINKTYPE_BATTLE_TOWER_OPEN;
break;
}
sub_80B236C(r3, r2);
}
void sub_80B2E4C(void)
void TryTradeLinkup(void)
{
gLinkType = 0x1133;
gLinkType = LINKTYPE_0x1133;
gBattleTypeFlags = 0;
sub_80B236C(2, 2);
}
@@ -596,7 +595,7 @@ void sub_80B2E4C(void)
void sub_80B2E74(void)
{
gSpecialVar_Result = 0;
gLinkType = 0x3311;
gLinkType = LINKTYPE_0x3311;
gBattleTypeFlags = 0;
sub_80B236C(2, 4);
}
@@ -681,21 +680,21 @@ static void sub_80B2EE4(u8 taskId)
void sub_80B2FD8(void)
{
gLinkType = 0x4411;
gLinkType = LINKTYPE_0x4411;
gBattleTypeFlags = 0;
sub_80B236C(2, 4);
}
void sub_80B3000(void)
{
gLinkType = 0x6601;
gLinkType = LINKTYPE_0x6601;
gBattleTypeFlags = 0;
sub_80B236C(4, 4);
}
void sub_80B3028(void)
{
gLinkType = 0x6602;
gLinkType = LINKTYPE_0x6602;
gBattleTypeFlags = 0;
sub_80B236C(2, 4);
}
@@ -707,30 +706,30 @@ u8 sub_80B3050(void)
switch (gSpecialVar_0x8004)
{
case 1:
gLinkType = 0x2233;
case USING_SINGLE_BATTLE:
gLinkType = LINKTYPE_SINGLE_BATTLE;
break;
case 2:
gLinkType = 0x2244;
case USING_DOUBLE_BATTLE:
gLinkType = LINKTYPE_DOUBLE_BATTLE;
break;
case 5:
gLinkType = 0x2255;
case USING_MULTI_BATTLE:
gLinkType = LINKTYPE_MULTI_BATTLE;
break;
case 9:
if (gSaveBlock2Ptr->frontier.lvlMode == 0)
case USING_BATTLE_TOWER:
if (gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_50)
{
gLinkType = 0x2266;
gLinkType = LINKTYPE_BATTLE_TOWER_50;
}
else
{
gLinkType = 0x2277;
gLinkType = LINKTYPE_BATTLE_TOWER_OPEN;
}
break;
case 3:
gLinkType = 0x1111;
case USING_TRADE_CENTER:
gLinkType = LINKTYPE_0x1111;
break;
case 4:
gLinkType = 0x3322;
case USING_RECORD_CORNER:
gLinkType = LINKTYPE_0x3322;
break;
}
@@ -790,21 +789,21 @@ void sub_80B3254(void)
SaveGame();
}
static void sub_80B3260(int a0)
static void SetLinkBattleTypeFlags(int linkService)
{
switch (a0)
switch (linkService)
{
case 1:
case USING_SINGLE_BATTLE:
gBattleTypeFlags = BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER;
break;
case 2:
case USING_DOUBLE_BATTLE:
gBattleTypeFlags = BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER;
break;
case 5:
case USING_MULTI_BATTLE:
ReducePlayerPartyToSelectedMons();
gBattleTypeFlags = BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER | BATTLE_TYPE_MULTI;
break;
case 9:
case USING_BATTLE_TOWER:
gBattleTypeFlags = BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER | BATTLE_TYPE_MULTI;
break;
}
@@ -818,7 +817,7 @@ static void sub_80B32B4(u8 taskId)
{
case 0:
FadeScreen(1, 0);
gLinkType = 0x2211;
gLinkType = LINKTYPE_BATTLE;
ClearLinkCallback_2();
task->data[0]++;
break;
@@ -845,7 +844,7 @@ static void sub_80B32B4(u8 taskId)
else
PlayMapChosenOrBattleBGM(MUS_BATTLE20);
sub_80B3260(gSpecialVar_0x8004);
SetLinkBattleTypeFlags(gSpecialVar_0x8004);
CleanupOverworldWindowsAndTilemaps();
gTrainerBattleOpponent_A = 0x800;
SetMainCallback2(CB2_InitBattle);
@@ -864,7 +863,7 @@ static void sub_80B33BC(u8 taskId)
{
case 0:
FadeScreen(1, 0);
gLinkType = 0x2211;
gLinkType = LINKTYPE_BATTLE;
ClearLinkCallback_2();
data[0] = 1;
break;
@@ -910,8 +909,8 @@ static void sub_80B33BC(u8 taskId)
else
PlayMapChosenOrBattleBGM(MUS_BATTLE20);
gLinkPlayers[0].linkType = 0x2211;
sub_80B3260(gSpecialVar_0x8004);
gLinkPlayers[0].linkType = LINKTYPE_BATTLE;
SetLinkBattleTypeFlags(gSpecialVar_0x8004);
CleanupOverworldWindowsAndTilemaps();
gTrainerBattleOpponent_A = 0x800;
SetMainCallback2(CB2_InitBattle);
@@ -973,7 +972,7 @@ void sub_80B360C(void)
SavePlayerBag();
sub_813BF10();
if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2)
if (gSpecialVar_0x8004 == USING_SINGLE_BATTLE || gSpecialVar_0x8004 == USING_DOUBLE_BATTLE)
{
UpdatePlayerLinkBattleRecords(gLocalLinkPlayerId ^ 1);
if (gWirelessCommType)
@@ -1004,7 +1003,10 @@ void sub_80B360C(void)
void CleanupLinkRoomState(void)
{
if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2 || gSpecialVar_0x8004 == 5 || gSpecialVar_0x8004 == 9)
if (gSpecialVar_0x8004 == USING_SINGLE_BATTLE
|| gSpecialVar_0x8004 == USING_DOUBLE_BATTLE
|| gSpecialVar_0x8004 == USING_MULTI_BATTLE
|| gSpecialVar_0x8004 == USING_BATTLE_TOWER)
{
LoadPlayerParty();
SavePlayerBag();
@@ -1159,7 +1161,7 @@ void nullsub_37(void)
// Note: VAR_0x8005 is set to the ID of the player spot.
void ColosseumPlayerSpotTriggered(void)
{
gLinkType = 0x2211;
gLinkType = LINKTYPE_BATTLE;
if (gWirelessCommType != 0)
{
@@ -1178,7 +1180,7 @@ static void sub_80B39A4(void)
ScriptContext1_Stop();
}
void sp02A_crash_sound(void)
void Script_ShowLinkTrainerCard(void)
{
ShowTrainerCardInLink(gSpecialVar_0x8006, CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
@@ -1300,6 +1302,6 @@ void sub_80B3BC4(void)
{
if (gWirelessCommType == 0)
{
gLinkType = 0x2288;
gLinkType = LINKTYPE_0x2288;
}
}

16
src/dodrio_berry_picking.c
View File

@@ -245,7 +245,7 @@ static u32 sub_8027DFC(u32 arg0);
static u32 IncrementWithLimit(u32 arg0, u32 arg1);
static u32 Min(u32 arg0, u32 arg1);
static u32 sub_80276C0(u8 arg0);
static void sub_8027ACC(u8 taskId);
static void Task_ShowDodrioBerryPickingRecords(u8 taskId);
static void sub_8029314(u8 taskId);
static void sub_8027BEC(u8 windowId, s32 width);
static void nullsub_15(struct Sprite *sprite);
@@ -2580,7 +2580,7 @@ static u8 sub_8027A48(u8 id)
return gUnknown_02022C98->unk34[id];
}
void sub_8027A5C(void)
void DoesPartyHaveDodrio(void)
{
int i;
for (i = 0; i < PARTY_SIZE; i++)
@@ -2588,18 +2588,18 @@ void sub_8027A5C(void)
if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES)
&& GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_DODRIO)
{
gSpecialVar_Result = 1;
gSpecialVar_Result = TRUE;
return;
}
}
gSpecialVar_Result = 0;
gSpecialVar_Result = FALSE;
}
void sub_8027AAC(void)
void ShowDodrioBerryPickingRecords(void)
{
u8 taskId = CreateTask(sub_8027ACC, 0);
sub_8027ACC(taskId);
u8 taskId = CreateTask(Task_ShowDodrioBerryPickingRecords, 0);
Task_ShowDodrioBerryPickingRecords(taskId);
}
// Data related to printing saved results.
@@ -2621,7 +2621,7 @@ ALIGNED(4)
static const u8 gUnknown_082F7B44[][2] = {{25}, {41}, {57}};
static const u8 gUnknown_082F7B4A[][2] = {{25}, {41}, {73}};
static void sub_8027ACC(u8 taskId)
static void Task_ShowDodrioBerryPickingRecords(u8 taskId)
{
struct WindowTemplate window;
s32 i, width, widthCurr;

2
src/ereader_screen.c
View File

@@ -88,7 +88,7 @@ static u8 sub_81D4DE8(struct Unk03006370 *arg0)
static void sub_81D4E30(void)
{
memset(gDecompressionBuffer, 0, 0x2000);
gLinkType = 0x5503;
gLinkType = LINKTYPE_0x5503;
OpenLink();
SetSuppressLinkErrorMessage(TRUE);
}

4
src/event_obj_lock.c
View File

@@ -108,12 +108,12 @@ void sub_8098524(void)
UnfreezeEventObjects();
}
void sub_8098574(void)
void Script_FacePlayer(void)
{
EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing);
}
void sub_809859C(void)
void Script_ClearHeldMovement(void)
{
EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]);
}

2
src/field_screen_effect.c
View File

@@ -638,7 +638,7 @@ static void Task_ReturnToWorldFromLinkRoom(u8 taskId)
}
}
void sub_80AF9F8(void)
void ReturnFromLinkRoom(void)
{
CreateTask(Task_ReturnToWorldFromLinkRoom, 10);
}

7
src/field_specials.c
View File

@@ -3737,12 +3737,11 @@ bool32 IsTrainerRegistered(void)
}
// Always returns FALSE
bool32 sub_813B514(void)
bool32 ShouldDistributeEonTicket(void)
{
if (!VarGet(VAR_ALWAYS_ZERO_0x403F))
{
if (!VarGet(VAR_DISTRIBUTE_EON_TICKET))
return FALSE;
}
return TRUE;
}

4
src/link.c
View File

@@ -282,7 +282,7 @@ void LinkTestScreen(void)
ResetTasks();
SetVBlankCallback(sub_80096BC);
ResetBlockSend();
gLinkType = 0x1111;
gLinkType = LINKTYPE_0x1111;
OpenLink();
SeedRng(gMain.vblankCounter2);
for (i = 0; i < MAX_LINK_PLAYERS; i++)
@@ -1349,7 +1349,7 @@ bool8 sub_800AA60(void)
{
if (gLinkPlayers[i].trainerId == gSavedLinkPlayers[i].trainerId)
{
if (gLinkType == 0x2288)
if (gLinkType == LINKTYPE_0x2288)
{
if (gLinkType == gLinkPlayers[i].linkType)
{

2
src/link_rfu.c
View File

@@ -4741,7 +4741,7 @@ void sub_8011AFC(void)
SetVBlankCallback(sub_8011AE8);
if (IsWirelessAdapterConnected())
{
gLinkType = 0x1111;
gLinkType = LINKTYPE_0x1111;
sub_800B488();
OpenLink();
SeedRng(gMain.vblankCounter2);

2
src/mystery_event_menu.c
View File

@@ -152,7 +152,7 @@ static void CB2_MysteryEventMenu(void)
if (!IsTextPrinterActive(0))
{
gMain.state++;
gLinkType = 0x5501;
gLinkType = LINKTYPE_0x5501;
OpenLink();
}
break;

14
src/overworld.c
View File

@@ -85,9 +85,9 @@
extern const u8 EventScript_WhiteOut[];
extern const u8 EventScript_ResetMrBriney[];
extern const u8 EventScript_DoLinkRoomExit[];
extern const u8 gEventScript_TradeRoom_TooBusyToNotice[];
extern const u8 gEventScript_TradeRoom_ReadTrainerCard_NoColor[];
extern const u8 gEventScript_TradeRoom_ReadTrainerCard_Normal[];
extern const u8 CableClub_EventScript_TooBusyToNotice[];
extern const u8 CableClub_EventScript_ReadTrainerCard[];
extern const u8 CableClub_EventScript_ReadTrainerCardColored[];
extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot0[];
extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot1[];
extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot2[];
@@ -2765,13 +2765,13 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player)
if (linkPlayerId != 4)
{
if (!player->isLocalPlayer)
return gEventScript_TradeRoom_TooBusyToNotice;
return CableClub_EventScript_TooBusyToNotice;
else if (sPlayerTradingStates[linkPlayerId] != PLAYER_TRADING_STATE_IDLE)
return gEventScript_TradeRoom_TooBusyToNotice;
return CableClub_EventScript_TooBusyToNotice;
else if (!GetLinkTrainerCardColor(linkPlayerId))
return gEventScript_TradeRoom_ReadTrainerCard_NoColor;
return CableClub_EventScript_ReadTrainerCard;
else
return gEventScript_TradeRoom_ReadTrainerCard_Normal;
return CableClub_EventScript_ReadTrainerCardColored;
}
return GetInteractedLinkPlayerScript(&otherPlayerPos, player->field_C, player->facing);

10
src/party_menu.c
View File

@@ -240,7 +240,7 @@ static void sub_81B3300(const u8*);
static void sub_81B1B8C(u8);
static void DisplayPartyPokemonHPCheck(struct Pokemon*, struct Struct203CEDC*, u8);
static void DisplayPartyPokemonHPBarCheck(struct Pokemon*, struct Struct203CEDC*);
static bool16 sub_81B2134(struct Pokemon*);
static bool16 IsMonAllowedInPokemonJump(struct Pokemon*);
static bool16 sub_81B2164(struct Pokemon*);
static void sub_81B2248(u8);
static void sub_81B227C(u8);
@@ -3007,7 +3007,7 @@ static void sub_81B209C(void)
if (gSpecialVar_0x8005 == 0)
{
for (i = 0; i < gPlayerPartyCount; i++)
*ptr += sub_81B2134(&gPlayerParty[i]) << i;
*ptr += IsMonAllowedInPokemonJump(&gPlayerParty[i]) << i;
}
else
{
@@ -3017,9 +3017,9 @@ static void sub_81B209C(void)
}
}
static bool16 sub_81B2134(struct Pokemon *mon)
static bool16 IsMonAllowedInPokemonJump(struct Pokemon *mon)
{
if (GetMonData(mon, MON_DATA_IS_EGG) != TRUE && sub_802C908(GetMonData(mon, MON_DATA_SPECIES)))
if (GetMonData(mon, MON_DATA_IS_EGG) != TRUE && IsSpeciesAllowedInPokemonJump(GetMonData(mon, MON_DATA_SPECIES)))
return TRUE;
return FALSE;
}
@@ -6761,7 +6761,7 @@ void sub_81B892C(void)
InitPartyMenu(0, 0, 12, 0, 4, sub_81B1370, CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
void sub_81B8958(void)
void ChooseMonForWirelessMinigame(void)
{
InitPartyMenu(11, 0, 13, 0, 1, sub_81B1370, CB2_ReturnToFieldContinueScriptPlayMapMusic);
}

30
src/pokemon_jump.c
View File

@@ -158,7 +158,7 @@ static void sub_802AA60(struct PokemonJump1 *);
static void sub_802AA94(struct PokemonJump1 *);
static void sub_802AB20(void);
static void sub_802AB98(void);
static s16 sub_802AC00(u16 species);
static s16 GetPokemonJumpSpeciesIdx(u16 species);
static void sub_802AC2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon);
static void sub_802AC6C(void);
static void sub_802ACA0(u8 taskId);
@@ -288,7 +288,7 @@ static void sub_802D598(void);
static void sub_802D5E4(void);
static void sub_802D72C(void);
static void sub_802D688(void);
static void sub_802E3E4(u8 taskId);
static void Task_ShowPokemonJumpRecords(u8 taskId);
static void sub_802E6D0(u8 taskId);
static void sub_802EB98(u8 taskId);
static void sub_802E500(u16 windowId, int width);
@@ -501,7 +501,7 @@ static void sub_802AB20(void)
for (i = 0; i < MAX_RFU_PLAYERS; i++)
{
index = sub_802AC00(gUnknown_02022CFC->unk82A8[i].species);
index = GetPokemonJumpSpeciesIdx(gUnknown_02022CFC->unk82A8[i].species);
gUnknown_02022CFC->unk82E4[i].unkC = gPkmnJumpSpecies[index].unk2;
}
@@ -524,7 +524,7 @@ static void sub_802AB98(void)
}
}
static s16 sub_802AC00(u16 species)
static s16 GetPokemonJumpSpeciesIdx(u16 species)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(gPkmnJumpSpecies); i++)
@@ -533,7 +533,7 @@ static s16 sub_802AC00(u16 species)
return i;
}
return -1;
return -1; // species isnt allowed
}
static void sub_802AC2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon)
@@ -2204,12 +2204,12 @@ static u8 *sub_802C8E8(u8 multiplayerId)
return gUnknown_02022CFC->unk82E4[multiplayerId].unk1C;
}
bool32 sub_802C908(u16 species)
bool32 IsSpeciesAllowedInPokemonJump(u16 species)
{
return sub_802AC00(species) > -1;
return GetPokemonJumpSpeciesIdx(species) > -1;
}
void sub_802C920(void)
void DoesPartyHavePokemonJumpSpecies(void)
{
int i;
@@ -2218,15 +2218,15 @@ void sub_802C920(void)
if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES))
{
u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
if (sub_802C908(species))
if (IsSpeciesAllowedInPokemonJump(species))
{
gSpecialVar_Result = 1;
gSpecialVar_Result = TRUE;
return;
}
}
}
gSpecialVar_Result = 0;
gSpecialVar_Result = FALSE;
}
// Large group of data.
@@ -3922,10 +3922,10 @@ static void sub_802E3A8(void)
pokeJump->field6++;
}
void sub_802E3C4(void)
void ShowPokemonJumpRecords(void)
{
u8 taskId = CreateTask(sub_802E3E4, 0);
sub_802E3E4(taskId);
u8 taskId = CreateTask(Task_ShowPokemonJumpRecords, 0);
Task_ShowPokemonJumpRecords(taskId);
}
static const struct WindowTemplate gUnknown_082FE270 =
@@ -3941,7 +3941,7 @@ static const struct WindowTemplate gUnknown_082FE270 =
static const u8 *const gUnknown_082FE278[] = {gText_JumpsInARow, gText_BestScore2, gText_ExcellentsInARow};
static void sub_802E3E4(u8 taskId)
static void Task_ShowPokemonJumpRecords(u8 taskId)
{
struct WindowTemplate window;
int i, width, widthCurr;

2
src/scrcmd.c
View File

@@ -2218,6 +2218,8 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
return FALSE;
}
// TODO: Should be renamed. Name implies general usage, but its specifically for Wonder Card
// See GetSavedRamScriptIfValid, which is NULL if ValidateReceivedWonderCard returns FALSE
bool8 ScrCmd_gotoram(struct ScriptContext *ctx)
{
const u8* v1 = GetSavedRamScriptIfValid();

2
src/script_pokemon_util_80F87D8.c
View File

@@ -610,7 +610,7 @@ static bool8 CheckPartyMonHasHeldItem(u16 item)
return FALSE;
}
bool8 sub_80F9370(void)
bool8 DoesPartyHaveEnigmaBerry(void)
{
bool8 hasItem = CheckPartyMonHasHeldItem(ITEM_ENIGMA_BERRY);
if (hasItem == TRUE)

4
src/trade.c
View File

@@ -1559,7 +1559,7 @@ static void sub_80773D0(void)
if (!gReceivedRemoteLinkPlayers)
{
gLinkType = 0x1122;
gLinkType = LINKTYPE_0x1122;
gUnknown_0203229C->unk_A8 = 0;
if (gWirelessCommType)
@@ -4134,7 +4134,7 @@ void sub_807AE50(void)
case 0:
if (!gReceivedRemoteLinkPlayers)
{
gLinkType = 0x1144;
gLinkType = LINKTYPE_0x1144;
CloseLink();
}
gUnknown_020322A0 = AllocZeroed(sizeof(*gUnknown_020322A0));

41
src/union_room.c
View File

@@ -44,6 +44,7 @@
#include "union_room_player_avatar.h"
#include "window.h"
#include "constants/battle_frontier.h"
#include "constants/cable_club.h"
#include "constants/game_stat.h"
#include "constants/maps.h"
#include "constants/rgb.h"
@@ -1249,7 +1250,7 @@ bool32 sub_80126CC(u32 caseId)
}
}
void BerryBlenderLinkBecomeLeader(void)
void TryBecomeLinkLeader(void)
{
u8 taskId;
struct UnkStruct_Leader *dataPtr;
@@ -1831,7 +1832,7 @@ u8 sub_8013398(struct UnkStruct_Main0 *arg0)
return ret;
}
void BerryBlenderLinkJoinGroup(void)
void TryJoinLinkGroup(void)
{
u8 taskId;
struct UnkStruct_Group *dataPtr;
@@ -2421,7 +2422,7 @@ void sub_8014210(u16 battleFlags)
HealPlayerParty();
SavePlayerParty();
LoadPlayerBag();
gLinkPlayers[0].linkType = 0x2211;
gLinkPlayers[0].linkType = LINKTYPE_BATTLE;
gLinkPlayers[GetMultiplayerId()].id = GetMultiplayerId();
gLinkPlayers[GetMultiplayerId() ^ 1].id = GetMultiplayerId() ^ 1;
gMain.savedCallback = sub_80B360C;
@@ -2429,18 +2430,18 @@ void sub_8014210(u16 battleFlags)
PlayBattleBGM();
}
void sub_8014290(u16 arg0, u16 x, u16 y)
static void sub_8014290(u16 linkService, u16 x, u16 y)
{
VarSet(VAR_CABLE_CLUB_STATE, arg0);
VarSet(VAR_CABLE_CLUB_STATE, linkService);
SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y);
SetDynamicWarpWithCoords(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y);
WarpIntoMap();
}
void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4)
void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 linkService)
{
gSpecialVar_0x8004 = arg4;
VarSet(VAR_CABLE_CLUB_STATE, arg4);
gSpecialVar_0x8004 = linkService;
VarSet(VAR_CABLE_CLUB_STATE, linkService);
gFieldLinkPlayerCount = GetLinkPlayerCount();
gLocalLinkPlayerId = GetMultiplayerId();
SetCableClubWarp();
@@ -2506,7 +2507,7 @@ void sub_801440C(u8 taskId)
HealPlayerParty();
SavePlayerParty();
LoadPlayerBag();
sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, 1);
sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_SINGLE_BATTLE);
SetMainCallback2(sub_8014384);
break;
case 2:
@@ -2515,7 +2516,7 @@ void sub_801440C(u8 taskId)
SavePlayerParty();
LoadPlayerBag();
sub_80143E4(gBlockSendBuffer, TRUE);
sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, 2);
sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_DOUBLE_BATTLE);
SetMainCallback2(sub_8014384);
break;
case 3:
@@ -2524,19 +2525,19 @@ void sub_801440C(u8 taskId)
SavePlayerParty();
LoadPlayerBag();
sub_80143E4(gBlockSendBuffer, TRUE);
sub_8014304(MAP_GROUP(DOUBLE_BATTLE_COLOSSEUM), MAP_NUM(DOUBLE_BATTLE_COLOSSEUM), 5, 8, 5);
sub_8014304(MAP_GROUP(DOUBLE_BATTLE_COLOSSEUM), MAP_NUM(DOUBLE_BATTLE_COLOSSEUM), 5, 8, USING_MULTI_BATTLE);
SetMainCallback2(sub_8014384);
break;
case 4:
sub_80143E4(gBlockSendBuffer, TRUE);
CleanupOverworldWindowsAndTilemaps();
sub_8014304(MAP_GROUP(TRADE_CENTER), MAP_NUM(TRADE_CENTER), 5, 8, 3);
sub_8014304(MAP_GROUP(TRADE_CENTER), MAP_NUM(TRADE_CENTER), 5, 8, USING_TRADE_CENTER);
SetMainCallback2(sub_8014384);
break;
case 15:
sub_80143E4(gBlockSendBuffer, TRUE);
CleanupOverworldWindowsAndTilemaps();
sub_8014304(MAP_GROUP(RECORD_CORNER), MAP_NUM(RECORD_CORNER), 8, 9, 4);
sub_8014304(MAP_GROUP(RECORD_CORNER), MAP_NUM(RECORD_CORNER), 8, 9, USING_RECORD_CORNER);
SetMainCallback2(sub_8014384);
break;
case 68:
@@ -2562,15 +2563,15 @@ void sub_801440C(u8 taskId)
SetMainCallback2(sub_80141A4);
break;
case 9:
sub_8014290(8, 5, 1);
sub_8014290(USING_MINIGAME, 5, 1);
sub_802A9A8(GetCursorSelectionMonId(), CB2_LoadMap);
break;
case 10:
sub_8014290(7, 9, 1);
sub_8014290(USING_BERRY_CRUSH, 9, 1);
sub_8020C70(CB2_LoadMap);
break;
case 11:
sub_8014290(8, 5, 1);
sub_8014290(USING_MINIGAME, 5, 1);
sub_802493C(GetCursorSelectionMonId(), CB2_LoadMap);
break;
}
@@ -2594,7 +2595,7 @@ void sub_8014790(u8 taskId)
{
case 14:
case 28:
gLinkPlayers[0].linkType = 0x2211;
gLinkPlayers[0].linkType = LINKTYPE_BATTLE;
gLinkPlayers[0].id = 0;
gLinkPlayers[1].id = 2;
sendBuff[0] = GetMonData(&gPlayerParty[gSelectedOrderFromParty[0] - 1], MON_DATA_SPECIES);
@@ -4097,14 +4098,14 @@ bool32 sub_80168DC(struct UnkStruct_URoom *arg0)
return TRUE;
}
void sub_8016934(void)
void InitUnionRoom(void)
{
struct UnkStruct_URoom *ptr;
sUnionRoomPlayerName[0] = EOS;
CreateTask(sub_801697C, 0);
gUnknown_02022C30.uRoom = gUnknown_02022C30.uRoom; // Needed to match.
gUnknown_02022C30.uRoom = ptr = AllocZeroed(0x26C);
gUnknown_02022C30.uRoom = ptr = AllocZeroed(sizeof(struct UnkStruct_URoom));
gUnknown_03000DA8 = gUnknown_02022C30.uRoom;
ptr->state = 0;
ptr->textState = 0;
@@ -5205,7 +5206,7 @@ void sub_801807C(struct TradeUnkStruct *arg0)
arg0->personality = 0;
}
void sub_8018090(void)
void Script_ResetUnionRoomTrade(void)
{
sub_801807C(&gUnknown_02022C40);
}