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

Merge branch 'master' into doc-inc

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

6
asm/macros/event.inc
View File

@@ -878,15 +878,15 @@
.endm
@ Displays a box containing the front sprite for the specified (species) Pokemon species.
.macro drawmonpic species:req, x:req, y:req
.macro showmonpic species:req, x:req, y:req
.byte 0x75
.2byte \species
.byte \x
.byte \y
.endm
@ Hides all boxes displayed with drawmonpic.
.macro erasemonpic
@ Hides all boxes displayed with showmonpic.
.macro hidemonpic
.byte 0x76
.endm

63
data/event_scripts.s
View File

@@ -5,6 +5,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"
@@ -31,6 +32,7 @@
#include "constants/secret_bases.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trade.h"
#include "constants/trainer_hill.h"
#include "constants/trainers.h"
#include "constants/vars.h"
@@ -1573,64 +1575,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
@@ -1735,6 +1689,7 @@ EventScript_GotoTrainerScript:: @ 82742F6
.include "data/scripts/berry_tree.inc"
.include "data/scripts/secret_base.inc"
.include "data/scripts/cable_club.inc"
.include "data/text/cable_club.inc"
.include "data/scripts/contest_hall.inc"
.include "data/text/contest_strings.inc"
.include "data/text/contest_link.inc"

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

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

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

@@ -5,7 +5,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
lock
faceplayer
goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3
setvar VAR_0x8008, INGAME_TRADE_MEOWTH
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT

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

@@ -1,6 +1,6 @@
BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

@@ -1,6 +1,6 @@
DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

@@ -1,6 +1,6 @@
EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

@@ -1,6 +1,6 @@
EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

@@ -1,6 +1,6 @@
FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

@@ -5,7 +5,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
lock
faceplayer
goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355
setvar VAR_0x8008, 1
setvar VAR_0x8008, INGAME_TRADE_PLUSLE
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT

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

@@ -1,6 +1,6 @@
FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

@@ -1,6 +1,6 @@
LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

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

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

@@ -1,6 +1,6 @@
LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

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

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

@@ -1,6 +1,6 @@
MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F",
"script": "MauvilleCity_PokemonCenter_2F_EventScript_Youngster",
"flag": "0"
}
],

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

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

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

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

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

@@ -1,80 +1,87 @@
MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37
map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
.byte 0
MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37
map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant
.2byte 0
MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41
map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
.2byte 0
MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B
@ Script is redundant, the label in the goto also does lock and faceplayer
MossdeepCity_GameCorner_1F_EventScript_InfoMan:: @ 8224B4B
lock
faceplayer
goto MossdeepCity_GameCorner_1F_EventScript_277C34
goto MossdeepCity_GameCorner_1F_EventScript_InfoMan2
release
end
MossdeepCity_GameCorner_1F_EventScript_224B54:: @ 8224B54
@ Script is redundant, the label in the goto also does lock and faceplayer
MossdeepCity_GameCorner_1F_EventScript_OldMan:: @ 8224B54
lock
faceplayer
goto MossdeepCity_GameCorner_1F_EventScript_277C91
goto MossdeepCity_GameCorner_1F_EventScript_OldMan2
release
end
MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D
msgbox MossdeepCity_GameCorner_1F_Text_224BFD, MSGBOX_SIGN
@ Everything below is leftover from RS
@ The house that was here in RS was moved to Sootopolis and replaced by the Game Corner
@ The text below is unused and duplicated in its replacement in Sootopolis City
@ And the BG Door event was moved inaccessibly into a wall
RS_MysteryEventsHouse_EventScript_Door:: @ 8224B5D
msgbox RS_MysteryEventsHouse_Text_DoorIsLocked, MSGBOX_SIGN
end
MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66
RS_MysteryEventsHouse_Text_OldManGreeting: @ 8224B66
.string "When I was young, I traveled the world\n"
.string "as a POKéMON TRAINER.\p"
.string "Now that I've become an old buzzard,\n"
.string "my only amusement is watching young\l"
.string "TRAINERS battle.$"
MossdeepCity_GameCorner_1F_Text_224BFD: @ 8224BFD
RS_MysteryEventsHouse_Text_DoorIsLocked: @ 8224BFD
.string "The door appears to be locked.$"
MossdeepCity_GameCorner_1F_Text_224C1C: @ 8224C1C
RS_MysteryEventsHouse_Text_ChallengeVisitingTrainer: @ 8224C1C
.string "A TRAINER named {STR_VAR_1} is\n"
.string "visiting my home.\p"
.string "Would you like to challenge\n"
.string "{STR_VAR_1}?$"
MossdeepCity_GameCorner_1F_Text_224C64: @ 8224C64
RS_MysteryEventsHouse_Text_YouWontBattle: @ 8224C64
.string "You won't battle? I'm disappointed\n"
.string "that I can't see you battle…$"
MossdeepCity_GameCorner_1F_Text_224CA4: @ 8224CA4
RS_MysteryEventsHouse_Text_KeepItToA3On3: @ 8224CA4
.string "Oh, good, good!\p"
.string "But my house isn't all that sturdy.\p"
.string "Could I ask you to keep it down to\n"
.string "a 3-on-3 match?$"
MossdeepCity_GameCorner_1F_Text_224D0B: @ 8224D0B
RS_MysteryEventsHouse_Text_SaveYourProgress: @ 8224D0B
.string "Before you two battle, you should\n"
.string "save your progress.$"
MossdeepCity_GameCorner_1F_Text_224D41: @ 8224D41
RS_MysteryEventsHouse_Text_HopeToSeeAGoodMatch: @ 8224D41
.string "I hope to see a good match!$"
MossdeepCity_GameCorner_1F_Text_224D5D: @ 8224D5D
RS_MysteryEventsHouse_Text_BattleTie: @ 8224D5D
.string "So, it became a standoff.\p"
.string "It was a brilliant match in which\n"
.string "neither side conceded a step!$"
MossdeepCity_GameCorner_1F_Text_224DB7: @ 8224DB7
RS_MysteryEventsHouse_Text_BattleWon: @ 8224DB7
.string "That was superlative!\p"
.string "Why, it was like seeing myself in\n"
.string "my youth again!$"
MossdeepCity_GameCorner_1F_Text_224DFF: @ 8224DFF
RS_MysteryEventsHouse_Text_BattleLost: @ 8224DFF
.string "Ah, too bad for you!\p"
.string "But it was a good match.\n"
.string "I hope you can win next time.$"

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

@@ -1,6 +1,6 @@
MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B",
"script": "MossdeepCity_PokemonCenter_2F_EventScript_Woman5",
"flag": "0"
}
],

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

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

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

@@ -1,6 +1,6 @@
OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

@@ -5,7 +5,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11
lock
faceplayer
goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB
setvar VAR_0x8008, 2
setvar VAR_0x8008, INGAME_TRADE_HORSEA
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT

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

@@ -1,6 +1,6 @@
PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

@@ -1,6 +1,6 @@
PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

@@ -5,7 +5,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F
lock
faceplayer
goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_2159D5
setvar VAR_0x8008, 0
setvar VAR_0x8008, INGAME_TRADE_SEEDOT
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT

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

@@ -1,6 +1,6 @@
RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

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

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

@@ -1,6 +1,6 @@
SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF
map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_27375B",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_273761",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_273767",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonCenter_2F_EventScript_276B03",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],

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

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

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

@@ -1,6 +1,6 @@
SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1
map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC

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

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

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

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

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

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

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

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

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

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

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

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

1750
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 IsPokemonJumpSpeciesInParty
def_special ShowPokemonJumpRecords
def_special IsDodrioInParty
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

485
data/text/cable_club.inc
View File

@@ -0,0 +1,485 @@
CableClub_Text_WelcomeWhichCableClubService: @ 8277EA4
.string "Welcome to the POKéMON CABLE\n"
.string "CLUB.\p"
.string "Which of our services do you wish\n"
.string "to use?$"
CableClub_Text_WhichService: @ 8277EF1
.string "Which of our services do you wish\n"
.string "to use?$"
CableClub_Text_TradeUsingLinkCable:: @ 8277F1B
.string "Trade POKéMON with another player\n"
.string "using a GBA Game Link cable.$"
CableClub_Text_BattleUsingLinkCable:: @ 8277F5A
.string "You may battle another TRAINER\n"
.string "using a GBA Game Link cable.$"
CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96
.string "You can use the RECORD CORNER with\n"
.string "others using a GBA Game Link cable.$"
@ Unused
CableClub_Text_CloseThisMenu: @ 8277FDD
.string "Close this menu.$"
CableClub_Text_NeedTwoMonsForDoubleBattle: @ 8277FEE
.string "For a DOUBLE BATTLE, you must\n"
.string "have at least two POKéMON.$"
CableClub_Text_NeedTwoMonsToTrade: @ 8278027
.string "For trading, you must have at\n"
.string "least two POKéMON with you.$"
CableClub_Text_CantTradeEnigmaBerry: @ 8278061
.string "A POKéMON holding the {STR_VAR_1}\n"
.string "BERRY can't be traded.$"
gText_PleaseWaitForLink:: @ 8278091
.string "Please wait.\n"
.string "… … B Button: Cancel$"
gText_ConfirmLinkWhenPlayersReady:: @ 82780B3
.string "When all players are ready…\n"
.string "A Button: Confirm\l"
.string "B Button: Cancel$"
gText_ConfirmStartLinkWithXPlayers:: @ 82780F2
.string "Start link with {STR_VAR_1} players.\n"
.string "A Button: Confirm\l"
.string "B Button: Cancel$"
gText_AwaitingLinkup:: @ 8278131
.string "Awaiting linkup…\n"
.string "… … B Button: Cancel$"
@ Unused
CableClub_Text_OkayToSaveProgress:: @ 8278157
.string "Your progress must be saved before\n"
.string "linking. Is it okay to save?$"
CableClub_Text_PleaseEnter: @ 8278197
.string "Please enter.$"
CableClub_Text_DirectYouToYourRoom: @ 82781A5
.string "I'll direct you to your room now.$"
Text_SomeoneIsNotReadyToLink: @ 82781C7
.string "Someone is not ready to link.\p"
.string "Please come back after everyone\n"
.string "has made preparations.$"
Text_LinkErrorPleaseReset: @ 827821C
.string "Sorry, we have a link error…\n"
.string "Please reset and try again.$"
Text_PlayersMadeDifferentSelections: @ 8278255
.string "The link partners appear to have\n"
.string "made different selections.$"
CableClub_Text_PleaseVisitAgain: @ 8278291
.string "Please do visit again.$"
CableClub_Text_IncorrectNumberOfParticipants: @ 82782A8
.string "The number of participants is\n"
.string "incorrect.$"
CableClub_Text_CantSingleBattleWithXPlayers: @ 82782D1
.string "The SINGLE BATTLE Mode can't be\n"
.string "played by {STR_VAR_1} players.$"
CableClub_Text_CantDoubleBattleWithXPlayers: @ 8278307
.string "The DOUBLE BATTLE Mode can't be\n"
.string "played by {STR_VAR_1} players.$"
CableClub_Text_NeedFourPlayers: @ 827833D
.string "There must be four players to play\n"
.string "this Battle Mode.$"
CableClub_Text_PleaseConfirmNumberAndRestart: @ 8278372
.string "Please confirm the number of\n"
.string "players and start again.$"
Text_TerminateLinkConfirmation: @ 82783A8
.string "The link will be terminated if you\n"
.string "leave the room. Is that okay?$"
Text_TerminateLinkPleaseWait: @ 82783E9
.string "Terminating link…\n"
.string "You will be escorted out of\l"
.string "the room. Please wait.$"
CableClub_Text_TooBusyToNotice: @ 827842E
.string "This TRAINER is too busy to\n"
.string "notice…$"
CableClub_Text_GotToLookAtTrainerCard: @ 8278452
.string "Score! Got to look at {STR_VAR_1}'s\n"
.string "TRAINER CARD!$"
CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B
.string "Score! Got to look at {STR_VAR_1}'s\n"
.string "TRAINER CARD!\p"
.string "It's a {STR_VAR_2} card!$"
SingleBattleColosseum_Text_TakePlaceStartBattle: @ 82784B4
.string "Please take your place and start\n"
.string "your battle.$"
TradeCenter_Text_TakeSeatStartTrade: @ 82784E2
.string "Please take your seat and start\n"
.string "your trade.$"
RecordCorner_Text_ThanksForComing: @ 827850E
.string "Thanks for coming.$"
CableClub_Text_TrainerCardDataOverwritten: @ 8278521
.string "The TRAINER CARD data will\n"
.string "be overwritten.$"
CableClub_Text_HopeToSeeYouAgain: @ 827854C
.string "I hope to see you again!$"
CableClub_Text_NotSetUpForFarAwayRegion: @ 8278565
.string "I'm awfully sorry.\p"
.string "We're not set up to conduct trades\n"
.string "with TRAINERS far away in another\l"
.string "region yet…$"
CableClub_Text_OtherTrainerNotReady: @ 82785C9
.string "The other TRAINER is not ready.$"
CableClub_Text_YouHaveAMonThatCantBeTaken: @ 82785E9
.string "You have at least one POKéMON\n"
.string "that can't be taken.$"
RecordCorner_Text_TakeSeatAndWait: @ 827861C
.string "Please take your seat and wait.$"
RecordCorner_Text_PlayerSentOverOneX: @ 827863C
.string "{STR_VAR_1} sent over one\n"
.string "{STR_VAR_2}.$"
CableClub_Text_CantMixWithJapaneseGame: @ 8278651
.string "Sorry, there is a transmission error.\p"
.string "You may not mix records with \n"
.string "Japanese Ruby or Sapphire games.\p"
.string "Also, you can't mix records with\n"
.string "Japanese Emerald and overseas Ruby\l"
.string "or Sapphire games at the same time.$"
CableClub_Text_AdapterNotConnected: @ 827871F
.string "The Wireless Adapter is not\n"
.string "connected properly.$"
CableClub_Text_ParticipantsStepUpToCounter: @ 827874F
.string "Participants are asked to step up\n"
.string "to the reception counter.$"
@ Unused
CableClub_Text_Hello: @ 827878B
.string "Hello!$"
@ Unused
CableClub_Text_PleaseWait: @ 8278792
.string "Please wait.$"
CableClub_Text_YouMayTradeHere:: @ 827879F
.string "You may trade your POKéMON here\n"
.string "with another TRAINER.$"
CableClub_Text_YouMayBattleHere:: @ 82787D5
.string "You may battle with your friends\n"
.string "here.$"
CableClub_Text_CanMakeBerryPowder:: @ 82787FC
.string "Two to five TRAINERS can make\n"
.string "BERRY POWDER together.$"
CableClub_Text_CanMixRecords:: @ 8278831
.string "The records of two to four players\n"
.string "can be mixed together.$"
OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B
.string "A guide to the WIRELESS CLUB's\n"
.string "various services.$"
CableClub_Text_CancelSelectedItem:: @ 827889C
.string "Cancels the selected MENU item.$"
OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC
.string "Which battle mode would you like?$"
@ Unused
CableClub_Text_ReturnsToPreviousStep: @ 82788DE
.string "Returns to the previous step.$"
CableClub_Text_NeedBerryForBerryCrush: @ 82788FC
.string "To use the BERRY CRUSH service,\n"
.string "you must have at least one BERRY.$"
CableClub_Text_NeedTwoMonsForUnionRoom: @ 827893E
.string "To enter the UNION ROOM, you must\n"
.string "have at least two POKéMON.$"
CableClub_Text_NoEnigmaBerryInUnionRoom: @ 827897B
.string "No POKéMON holding the {STR_VAR_1}\n"
.string "BERRY may enter the UNION ROOM.$"
CableClub_Text_UnionRoomAdapterNotConnected: @ 82789B5
.string "This is the POKéMON WIRELESS CLUB\n"
.string "UNION ROOM.\p"
.string "Unfortunately, your Wireless\n"
.string "Adapter is not connected properly.\p"
.string "Please do come again.$"
@ Unused
CableClub_Text_OhExcuseMe: @ 8278A39
.string "Oh…\n"
.string "Excuse me!$"
CableClub_Text_PlayerIsWaiting: @ 8278A48
.string "It appears as if {STR_VAR_1} is playing\n"
.string "right now.\l"
.string "Go for it!$"
MossdeepCity_GameCorner_1F_Text_DescribeWhichGame: @ 8278A7D
.string "I can explain game rules to you,\n"
.string "if you'd like.\p"
.string "Which game should I describe?$"
MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo: @ 8278ACB
.string "“POKéMON JUMP”\p"
.string "Make your POKéMON skip the VINE WHIP\n"
.string "rope with the A Button.\p"
.string "Only mini POKéMON around 28 inches\n"
.string "or less may participate.\p"
.string "POKéMON that only swim, burrow,\n"
.string "or fly are not good at jumping.\p"
.string "As a result, those POKéMON may not\n"
.string "participate.\p"
.string "Good things happen if everyone\n"
.string "jumps in time.$"
MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo: @ 8278BF1
.string "“DODRIO BERRY-PICKING”\p"
.string "Command DODRIO's three heads to\n"
.string "catch falling BERRIES.\p"
.string "Press right, up, or left on the\n"
.string "{PLUS} Control Pad to move the heads.\p"
.string "To play this game, you must have\n"
.string "a DODRIO.$"
MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay: @ 8278CAC
.string "If you want to play a game,\n"
.string "please tell the old man beside me.$"
MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait: @ 8278CEB
.string "Hi, welcome!\n"
.string "Are you here to play games using\l"
.string "Wireless Communication?\p"
.string "Can you wait just a little bit?$"
MossdeepCity_GameCorner_1F_Text_ComeAgain: @ 8278D51
.string "All right, come again!$"
MossdeepCity_GameCorner_1F_Text_AdapterNotConnected: @ 8278D68
.string "The Wireless Adapter isn't connected.\n"
.string "Come back when it's hooked up!$"
MossdeepCity_GameCorner_1F_Text_PlayWhichGame: @ 8278DAD
.string "All right, which game did you want\n"
.string "to play?$"
MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon: @ 8278DD9
.string "Which POKéMON would you like to\n"
.string "enter?$"
MossdeepCity_GameCorner_1F_Text_AllGoodToGo: @ 8278E00
.string "Okay, you're all good to go.\n"
.string "Don't let the others beat you!$"
@ Unused
MossdeepCity_GameCorner_1F_Text_LeavingDoComeAgain: @ 8278E3C
.string "Are you leaving now?\n"
.string "Do come again!$"
MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon: @ 8278E60
.string "It doesn't look like you have any\n"
.string "POKéMON that you can enter…\p"
.string "Would you like me to explain what\n"
.string "kinds of POKéMON can enter?$"
MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed: @ 8278EDC
.string "“POKéMON JUMP” is open to POKéMON\n"
.string "around 28 inches or less.\p"
.string "What you can't enter are those\n"
.string "POKéMON that can't jump.\p"
.string "You know, like POKéMON that only\n"
.string "swim, burrow, or fly.\p"
.string "That's all you need to know.$"
MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed: @ 8278FA4
.string "DODRIO BERRY-PICKING is a game that \n"
.string "only DODRIO may enter.$"
@ Unused
MossdeepCity_GameCorner_1F_Text_RetryPlease: @ 8278FE0
.string "Could you retry this from the start\n"
.string "again, please?$"
CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013
.string "Welcome to the POKéMON WIRELESS\n"
.string "CLUB DIRECT CORNER.\p"
.string "You may interact directly with\n"
.string "your friends here.\p"
.string "Which room would you like to\n"
.string "enter?$"
CableClub_Text_TradePokemon: @ 827909D
.string "Would you like to trade POKéMON?$"
CableClub_Text_WhichBattleMode: @ 82790BE
.string "Which Battle Mode would you like\n"
.string "to play?$"
CableClub_Text_AccessRecordCorner: @ 82790E8
.string "Would you like to access\n"
.string "the RECORD CORNER?$"
CableClub_Text_UseBerryCrush: @ 8279114
.string "Would you like to use the\n"
.string "BERRY CRUSH System?$"
CableClub_Text_ExplainBattleModes: @ 8279142
.string "There are three Battle Modes.\p"
.string "SINGLE BATTLE is for two TRAINERS\n"
.string "with one or more POKéMON each.\p"
.string "Each TRAINER can have one POKéMON\n"
.string "in battle at a time.\p"
.string "DOUBLE BATTLE is for two TRAINERS\n"
.string "with two or more POKéMON each.\p"
.string "Each TRAINER will send out two\n"
.string "POKéMON in battle at a time.\p"
.string "MULTI BATTLE is for four TRAINERS\n"
.string "with one or more POKéMON each.\p"
.string "Each TRAINER can have one POKéMON\n"
.string "in battle at a time.$"
CableClub_Text_ChooseGroupLeaderOfTwo: @ 82792CD
.string "Please decide which of you two\n"
.string "will become the LEADER.\p"
.string "The other player must then choose\n"
.string "“JOIN GROUP.”$"
CableClub_Text_ChooseGroupLeaderOfFour: @ 8279334
.string "Please decide which of you four\n"
.string "will become the GROUP LEADER.\p"
.string "The other players must then choose\n"
.string "“JOIN GROUP.”$"
CableClub_Text_ChooseGroupLeader: @ 82793A3
.string "Please decide which of you will\n"
.string "become the GROUP LEADER.\p"
.string "The other players must then choose\n"
.string "“JOIN GROUP.”$"
CableClub_Text_WelcomeUnionRoomEnter: @ 827940D
.string "Welcome to the POKéMON WIRELESS\n"
.string "CLUB UNION ROOM.\p"
.string "You may interact directly with\n"
.string "other TRAINERS here, some of\l"
.string "whom you may not even know.\p"
.string "Would you like to enter the ROOM?$"
CableClub_Text_UnionRoomInfo: @ 82794B8
.string "The TRAINERS in the UNION ROOM\n"
.string "will be those players around you\l"
.string "who have also entered the ROOM.\p"
.string "You may do all sorts of things\n"
.string "here, such as exchanging greetings.\p"
.string "You may enter two POKéMON up to\n"
.string "Lv. 30 for a one-on-one battle.\p"
.string "You may take part in a chat with\n"
.string "two to five people.\p"
.string "Or, you may register a POKéMON for\n"
.string "trade.\p"
.string "Would you like to enter the ROOM?$"
CableClub_Text_EnjoyUnionRoom: @ 827961C
.string "I hope you enjoy your time in\n"
.string "the UNION ROOM.$"
CableClub_Text_FirstTimeRightThisWay: @ 827964A
.string "Hello!\n"
.string "My name is TEALA.\p"
.string "This must be your first time\n"
.string "up here.\p"
.string "I'll show you how the Wireless\n"
.string "Communication System works.\p"
.string "First, I need to show you this\n"
.string "floor of our POKéMON CENTER.\p"
.string "Right this way, please.$"
CableClub_Text_ExplainWirelessClubFirstTime: @ 8279718
.string "On the top floor, there are two\n"
.string "rooms.\p"
.string "First, the room on the left.\n"
.string "It's the UNION ROOM.\p"
.string "You may link up with TRAINERS\n"
.string "around you who have also entered\l"
.string "the UNION ROOM.\p"
.string "With them, you may do things like\n"
.string "chat, battle, and trade.\p"
.string "Second, the room on the right is\n"
.string "the DIRECT CORNER.\p"
.string "You may trade or battle POKéMON\n"
.string "with your friends in this room.\p"
.string "If the Wireless Adapter isn't\n"
.string "connected, you may still link up\l"
.string "using a GBA Game Link cable.\p"
.string "If that is the case, you must go\n"
.string "to the DIRECT CORNER.\p"
.string "I hope you enjoy the Wireless \n"
.string "Communication System.$"
CableClub_Text_AskAboutLinking: @ 8279937
.string "Hello, {PLAYER}!\p"
.string "It's me, TEALA, the POKéMON\n"
.string "CENTER 2F attendant.\p"
.string "Is there something you needed to\n"
.string "ask me about linking?$"
CableClub_Text_ExplainWirelessClub: @ 82799AA
.string "Let me explain how the POKéMON\n"
.string "WIRELESS CLUB works.\p"
.string "On this, the top floor, there are\n"
.string "two rooms.\p"
.string "First, the room on the left.\n"
.string "It's the UNION ROOM.\p"
.string "You may link up with TRAINERS\n"
.string "around you who have also entered\l"
.string "the UNION ROOM.\p"
.string "With them, you may do things like\n"
.string "chat, battle, and trade.\p"
.string "Second, the room on the right is\n"
.string "the DIRECT CORNER.\p"
.string "You may trade or battle POKéMON\n"
.string "with your friends in this room.\p"
.string "Sometimes, you may not be able to\n"
.string "find your friends in the UNION ROOM\l"
.string "or the DIRECT CORNER.\p"
.string "In that case, please move closer\n"
.string "to your friends.\p"
.string "If the Wireless Adapter isn't\n"
.string "connected, you may still link up\l"
.string "using a GBA Game Link cable.\p"
.string "If that is the case, you must go\n"
.string "to the DIRECT CORNER.\p"
.string "I hope you enjoy the Wireless \n"
.string "Communication System.$"
CableClub_Text_HopeYouEnjoyWirelessSystem: @ 8279C91
.string "I hope you enjoy the Wireless\n"
.string "Communication System.$"

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"

13
gflib/text.h
View File

@@ -107,12 +107,19 @@
#define TEXT_COLOR_TRANSPARENT 0x0
#define TEXT_COLOR_WHITE 0x1
#define TEXT_COLOR_DARK_GREY 0x2
// 0x3
#define TEXT_COLOR_LIGHT_GREY 0x3
#define TEXT_COLOR_RED 0x4
// 0x5
#define TEXT_COLOR_LIGHT_RED 0x5
#define TEXT_COLOR_GREEN 0x6
// 0x7
#define TEXT_COLOR_LIGHT_GREEN 0x7
#define TEXT_COLOR_BLUE 0x8
#define TEXT_COLOR_LIGHT_BLUE 0x9
#define TEXT_DYNAMIC_COLOR_1 0xA // Usually white
#define TEXT_DYNAMIC_COLOR_2 0xB // Usually white w/ tinge of green
#define TEXT_DYNAMIC_COLOR_3 0xC // Usually white
#define TEXT_DYNAMIC_COLOR_4 0xD // Usually aquamarine
#define TEXT_DYNAMIC_COLOR_5 0xE // Usually blue-green
#define TEXT_DYNAMIC_COLOR_6 0xF // Usually cerulean
#define PLACEHOLDER_ID_UNKNOWN 0x0
#define PLACEHOLDER_ID_PLAYER 0x1

0
graphics/unknown/unknown_DDD704.bin → graphics/trade/menu_mon_box.bin
View File

0
graphics/trade/ball.png → graphics/trade/pokeball.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 464 B

After

Width:  |  Height:  |  Size: 464 B

0
graphics/unknown/unknown_DDB444.pal → graphics/trade/unknown_DDB444.pal
View File

0
graphics/unknown/unknown_DDCF04.bin → graphics/trade/unknown_DDCF04.bin
View File

2
include/battle_anim.h
View File

@@ -151,7 +151,7 @@ void sub_80A78AC(struct Sprite *sprite);
void sub_80A6BFC(struct BattleAnimBgData *unk, u8 unused);
u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10);
void sub_80A749C(struct Sprite *sprite);
void sub_80A6DEC(struct Sprite *sprite);
void TradeMenuBouncePartySprites(struct Sprite *sprite);
void DestroyAnimVisualTaskAndDisableBlend(u8 taskId);
void DestroySpriteAndFreeResources_(struct Sprite *sprite);
void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId);

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

116
include/constants/trade.h Normal file
View File

@@ -0,0 +1,116 @@
#ifndef GUARD_CONSTANTS_TRADE_H
#define GUARD_CONSTANTS_TRADE_H
#define TRADE_PLAYER 0
#define TRADE_PARTNER 1
#define LINK_TRADE_TIMEOUT 300
// In-game Trade IDs
#define INGAME_TRADE_SEEDOT 0
#define INGAME_TRADE_PLUSLE 1
#define INGAME_TRADE_HORSEA 2
#define INGAME_TRADE_MEOWTH 3
// Flag IDs for sending link data
#define INITIATE_TRADE 1
#define CANCEL_TRADE 2
#define WANTS_TO_TRADE 1
#define WANTS_TO_CANCEL 2
#define READY_FINISH_TRADE 1
#define FINISH_TRADE 2
// Return values for CanTradeSelectedMon and CanTradeSelectedPartyMenuMon
#define CAN_TRADE_MON 0
#define CANT_TRADE_LAST_MON 1
#define CANT_TRADE_NATIONAL 2
#define CANT_TRADE_EGG 3
#define CANT_TRADE_INVALID_MON 4
#define CANT_TRADE_EGG2 5
// Return values for CheckValidityOfTradeMons
#define PLAYER_MON_INVALID 0
#define BOTH_MONS_VALID 1
#define PARTNER_MON_INVALID 2
// Return values for GetGameProgressForLinkTrade
#define TRADE_BOTH_PLAYERS_READY 0
#define TRADE_PLAYER_NOT_READY 1
#define TRADE_PARTNER_NOT_READY 2
// Indexes for sTradeActionTexts
#define TRADE_TEXT_CANCEL 0
#define TRADE_TEXT_CHOOSE_MON 1
#define TRADE_TEXT_SUMMARY 2
#define TRADE_TEXT_TRADE 3
#define TRADE_TEXT_CANCEL_TRADE 4
#define TRADE_TEXT_JP_QUIT 5
// Checked to confirm DrawTradeMenuParty has reached final state
#define DRAW_PARTY_FINISH 5
// Message indexes for sTradeMessages
#define TRADE_MSG_STANDBY 0
#define TRADE_MSG_CANCELED 1
#define TRADE_MSG_ONLY_MON1 2
#define TRADE_MSG_ONLY_MON2 3
#define TRADE_MSG_WAITING_FOR_FRIEND 4
#define TRADE_MSG_FRIEND_WANTS_TO_TRADE 5
#define TRADE_MSG_MON_CANT_BE_TRADED 6
#define TRADE_MSG_EGG_CANT_BE_TRADED 7
#define TRADE_MSG_FRIENDS_MON_CANT_BE_TRADED 8
// IDs for QueueAction
#define QUEUE_SEND_DATA 0
#define QUEUE_STANDBY 1
#define QUEUE_ONLY_MON1 2
#define QUEUE_ONLY_MON2 3
#define QUEUE_UNUSED1 4
#define QUEUE_UNUSED2 5
#define QUEUE_MON_CANT_BE_TRADED 6
#define QUEUE_EGG_CANT_BE_TRADED 7
#define QUEUE_FRIENDS_MON_CANT_BE_TRADED 8
#define QUEUE_DELAY_MSG 3
#define QUEUE_DELAY_DATA 5
// IDs for CallTradeMenuFunc
#define TRADEMENUFUNC_MAIN_MENU 0
#define TRADEMENUFUNC_SELECTED_MON 1
#define TRADEMENUFUNC_SHOW_MON_SUMMARY 2
#define TRADEMENUFUNC_CONFIRM_OR_CANCEL_TRADE 3
#define TRADEMENUFUNC_CANCEL_TRADE_PROMPT 4
#define TRADEMENUFUNC_UNUSED_5 5
#define TRADEMENUFUNC_BOTH_MONS_SELECTED 6
#define TRADEMENUFUNC_CONFIRM_TRADE_PROMPT 7
#define TRADEMENUFUNC_REDRAW_MAIN_MENU 8
#define TRADEMENUFUNC_LINK_TRADE_FADE_OUT 9
#define TRADEMENUFUNC_LINK_TRADE_WAIT_FADE 10
#define TRADEMENUFUNC_CANCEL_TRADE_1 11
#define TRADEMENUFUNC_CANCEL_TRADE_2 12
#define TRADEMENUFUNC_START_LINK_TRADE 13
#define TRADEMENUFUNC_DELAY_TRADE_CONFIRM 14
#define TRADEMENUFUNC_UNUSED_15 15
#define TRADEMENUFUNC_LINK_TRADE_WAIT_QUEUE 16
#define TRADEMENUFUNC_PARTNER_MON_INVALID 17
#define TRADEMENUFUNC_STANDBY 100
// Message indexes for sUnionRoomTradeMessages
#define UR_TRADE_MSG_NONE 0
#define UR_TRADE_MSG_NOT_MON_PARTNER_WANTS 1
#define UR_TRADE_MSG_NOT_EGG 2
#define UR_TRADE_MSG_MON_CANT_BE_TRADED_1 3
#define UR_TRADE_MSG_MON_CANT_BE_TRADED_2 4
#define UR_TRADE_MSG_PARTNERS_MON_CANT_BE_TRADED 5
#define UR_TRADE_MSG_EGG_CANT_BE_TRADED 6
#define UR_TRADE_MSG_PARTNER_CANT_ACCEPT_MON 7
#define UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_1 8
#define UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_2 9
// Return values for CanRegisterMonForTradingBoard
#define CAN_REGISTER_MON 0
#define CANT_REGISTER_MON 1
#define CANT_REGISTER_EGG 2
#endif //GUARD_CONSTANTS_TRADE_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. The only way to obtain the Eon Ticket in Emerald is via Record Mixing
#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 IsDodrioInParty(void);
void ShowDodrioBerryPickingRecords(void);
#endif // GUARD_DODRIO_BERRY_PICKING_H

8
include/graphics.h
View File

@@ -4848,13 +4848,13 @@ extern const u32 gCableCarCord_Gfx[];
extern const u16 gCableCar_Pal[];
// Trade
extern const u16 gUnknown_08DDB3E4[];
extern const u8 gUnknown_08DDB464[];
extern const u16 gTradeMenu_Pal[];
extern const u8 gTradeMenu_Gfx[];
extern const u16 gUnknown_08DDCF04[];
extern const u16 gTradeGba2_Pal[];
extern const u8 gTradeGba_Gfx[];
extern const u16 gUnknown_08DDD704[];
extern const u8 gUnknown_08DDC6E4[];
extern const u16 gTradeMenuMonBox_Tilemap[];
extern const u8 gTradeButtons_Gfx[];
extern const u16 gUnknown_08DDB444[];
// Party menu

10
include/librfu.h
View File

@@ -76,10 +76,10 @@ struct UnkLinkRfuStruct_02022B14Substruct
u16 unk_00_4:1;
u16 unk_00_5:1;
u16 unk_00_6:1;
u16 unk_00_7:1;
u16 unk_01_0:1;
u16 unk_01_1:1;
u16 unk_01_2:4;
u16 isChampion:1;
u16 hasNationalDex:1;
u16 gameClear:1; // never read, redundant with isChampion
u16 unk_01_2:4; // always 3?
u16 unk_01_6:2;
u8 playerTrainerId[2];
};
@@ -93,7 +93,7 @@ struct __attribute__((packed, aligned(2))) UnkLinkRfuStruct_02022B14
u8 unk_0a_0:7;
u8 unk_0a_7:1;
u8 playerGender:1;
u8 unk_0b_1:7;
u8 level:7;
u8 unk_0c;
};

69
include/link.h
View File

@@ -48,20 +48,52 @@
#define EXTRACT_LINK_ERRORS(status) \
(((status) & LINK_STAT_ERRORS) >> LINK_STAT_ERRORS_SHIFT)
#define LINKCMD_SEND_LINK_TYPE 0x2222
#define LINKCMD_0x2FFE 0x2FFE
#define LINKCMD_SEND_HELD_KEYS 0x4444
#define LINKCMD_0x5555 0x5555
#define LINKCMD_0x5566 0x5566
#define LINKCMD_0x5FFF 0x5FFF
#define LINKCMD_0x6666 0x6666
#define LINKCMD_0x7777 0x7777
#define LINKCMD_CONT_BLOCK 0x8888
#define LINKCMD_0xAAAA 0xAAAA
#define LINKCMD_0xAAAB 0xAAAB
#define LINKCMD_INIT_BLOCK 0xBBBB
#define LINKCMD_SEND_HELD_KEYS_2 0xCAFE
#define LINKCMD_0xCCCC 0xCCCC
#define LINKCMD_SEND_LINK_TYPE 0x2222
#define LINKCMD_0x2FFE 0x2FFE
#define LINKCMD_SEND_HELD_KEYS 0x4444
#define LINKCMD_0x5555 0x5555
#define LINKCMD_0x5566 0x5566
#define LINKCMD_0x5FFF 0x5FFF
#define LINKCMD_0x6666 0x6666
#define LINKCMD_0x7777 0x7777
#define LINKCMD_CONT_BLOCK 0x8888
#define LINKCMD_0xAAAA 0xAAAA
#define LINKCMD_0xAAAB 0xAAAB
#define LINKCMD_READY_TO_TRADE 0xAABB
#define LINKCMD_READY_FINISH_TRADE 0xABCD
#define LINKCMD_INIT_BLOCK 0xBBBB
#define LINKCMD_READY_CANCEL_TRADE 0xBBCC
#define LINKCMD_SEND_HELD_KEYS_2 0xCAFE
#define LINKCMD_0xCCCC 0xCCCC
#define LINKCMD_START_TRADE 0xCCDD
#define LINKCMD_CONFIRM_FINISH_TRADE 0xDCBA
#define LINKCMD_SET_MONS_TO_TRADE 0xDDDD
#define LINKCMD_0xDDEE 0xDDEE
#define LINKCMD_REQUEST_CANCEL 0xEEAA
#define LINKCMD_CANCEL_TRADE 0xEEBB
#define LINKCMD_0xEECC 0xEECC
#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
struct LinkStatus
{
@@ -95,8 +127,8 @@ enum
EXCHANGE_COMPLETE,
EXCHANGE_TIMED_OUT,
EXCHANGE_IN_PROGRESS,
EXCHANGE_STAT_4,
EXCHANGE_STAT_5,
EXCHANGE_PLAYER_NOT_READY,
EXCHANGE_PARTNER_NOT_READY,
EXCHANGE_STAT_6,
EXCHANGE_STAT_7
};
@@ -120,7 +152,10 @@ struct LinkPlayer
/* 0x00 */ u16 version;
/* 0x02 */ u16 lp_field_2;
/* 0x04 */ u32 trainerId;
/* 0x08 */ u8 name[11];
/* 0x08 */ u8 name[PLAYER_NAME_LENGTH + 1];
/* 0x10 */ u8 progressFlags; // (& 0x0F) is hasNationalDex, (& 0xF0) is hasClearedGame
/* 0x11 */ u8 neverRead;
/* 0x12 */ u8 progressFlagsCopy;
/* 0x13 */ u8 gender;
/* 0x14 */ u32 linkType;
/* 0x18 */ u16 id; // battler id in battles

6
include/link_rfu.h
View File

@@ -128,7 +128,7 @@ struct UnkRfuStruct_Sub_Unused
struct UnkRfuStruct_2
{
/* 0x000 */ void (*unk_00)(void);
/* 0x000 */ void (*linkRfuCallback)(void);
/* 0x004 */ u16 unk_04;
/* 0x006 */ u8 filler_06[4];
/* 0x00a */ u16 unk_0a;
@@ -224,11 +224,11 @@ void sub_800F804(void);
void sub_800F850(void);
u8 sub_800FCD8(void);
bool32 sub_800FE84(const u8 *src, size_t size);
void Rfu_set_zero(void);
void ClearLinkRfuCallback(void);
u8 sub_80104F4(void);
u8 rfu_get_multiplayer_id(void);
bool8 sub_8010100(u8 a0);
bool8 sub_8010500(void);
bool8 IsLinkRfuTaskFinished(void);
bool8 Rfu_IsMaster(void);
void task_add_05_task_del_08FA224_when_no_RfuFunc(void);
void sub_8010434(void);

9
include/party_menu.h
View File

@@ -38,17 +38,17 @@ u8 GetCursorSelectionMonId(void);
u8 sub_81B1360(void);
void sub_81B1370(u8 taskId);
u8* GetMonNickname(struct Pokemon *mon, u8 *dest);
u8 sub_81B1B5C(const u8* str, u8 b);
u8 DisplayPartyMenuMessage(const u8* str, u8 b);
bool8 sub_81B1BD4(void);
void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func);
u8 pokemon_ailments_get_primary(u32 status);
u8 GetMonAilment(struct Pokemon *mon);
void display_pokemon_menu_message(u32 stringID);
void DisplayPartyMenuStdMessage(u32 stringID);
void sub_81B47E0(u8 taskId);
bool8 FieldCallback_PrepareFadeInFromMenu(void);
void sub_81B58A8(void);
void LoadHeldItemIcons(void);
void sub_81B5D4C(u8 *a, u8 *b, u8 c);
void DrawHeldItemIconsForTrade(u8 *a, u8 *b, u8 c);
void sub_81B617C(void);
void ItemUseCB_Medicine(u8 taskId, TaskFunc task);
void sub_81B67C8(u8 taskId, TaskFunc task);
@@ -69,7 +69,8 @@ void InitChooseHalfPartyForBattle(u8 unused);
void sub_81B8558(void);
void sub_81B8904(u8 initArg, MainCallback callback);
void OpenPartyMenuForMoveTutor(void);
void sub_81B8958(void);
void ChooseMonForWirelessMinigame(void);
void ChooseMonForWirelessMinigame(void);
void OpenPartyMenuInBattle(u8 arg);
void sub_81B89F0(void);
void sub_81B8C68(void);

2
include/pokeball.h
View File

@@ -25,7 +25,7 @@ extern const struct SpriteTemplate gBallSpriteTemplates[];
u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow);
void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 battler, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h, u16 species);
u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h);
u8 CreateTradePokeballSprite(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h);
void sub_8076918(u8 battler);
void DoHitAnimHealthboxEffect(u8 battler);
void LoadBallGfx(u8 ballId);

4
include/pokemon_icon.h
View File

@@ -21,8 +21,8 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u
u8 UpdateMonIconFrame(struct Sprite *sprite);
void LoadMonIconPalette(u16 species);
void sub_80D328C(struct Sprite *sprite);
void sub_80D3014(struct Sprite *sprite);
void sub_80D32C8(struct Sprite *sprite, u8 animNum);
void UpdateTradeMonIconFrame(struct Sprite *sprite);
void SetPartyHPBarSprite(struct Sprite *sprite, u8 animNum);
u8 GetMonIconPaletteIndexFromSpecies(u16 species);
#endif // GUARD_POKEMON_ICON_H

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 IsPokemonJumpSpeciesInParty(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);

2
include/pokemon_storage_system.h
View File

@@ -25,7 +25,7 @@ struct PokemonStorage
extern struct PokemonStorage *gPokemonStoragePtr;
void sub_80C6D80(const u8 *string, void *dst, u8 arg2, u8 arg3, s32 arg4);
void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 arg2, u8 arg3, s32 bytesToBuffer);
u8 CountMonsInBox(u8 boxId);
s16 GetFirstFreeBoxSpot(u8 boxId);
u8 CountPartyAliveNonEggMonsExcept(u8 slotToIgnore);

27
include/trade.h
View File

@@ -2,25 +2,26 @@
#define GUARD_TRADE_H
#include "link_rfu.h"
#include "constants/trade.h"
// Exported type declarations
// Exported RAM declarations
extern struct MailStruct gUnknown_020321C0[PARTY_SIZE];
extern u8 gUnknown_02032298[2];
extern struct MailStruct gTradeMail[PARTY_SIZE];
extern u8 gSelectedTradeMonPositions[2];
// Exported ROM declarations
extern const struct WindowTemplate gUnknown_0833900C;
extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate;
s32 sub_807A728(void);
void sub_80773AC(void);
void sub_807AE50(void);
int sub_807A8D0(struct UnkLinkRfuStruct_02022B14Substruct a0, u16, u16, u8);
int sub_807A7E0(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 a2, u16 a3, u8 a4, u16 a5, u8 a6);
int sub_807A918(struct Pokemon*, u16);
void sub_807B140(void);
void sub_807B154(void);
void sub_807F19C(void);
void sub_807F1A8(u8, const u8 *, u8);
s32 GetGameProgressForLinkTrade(void);
void CB2_StartCreateTradeMenu(void);
void CB2_LinkTrade(void);
int CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct a0, u16, u16, u8);
int GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 a2, u16 a3, u8 a4, u16 a5, u8 a6);
int CanTradeSelectedPartyMenuMon(struct Pokemon*, u16);
void InitTradeSequenceBgGpuRegs(void);
void LinkTradeDrawWindow(void);
void InitTradeBg(void);
void DrawTextOnTradeWindow(u8, const u8 *, u8);
#endif //GUARD_TRADE_H

6
include/union_room.h
View File

@@ -135,7 +135,7 @@ union UnkUnion_Main
struct UnkStruct_URoom *uRoom;
};
struct TradeUnkStruct
struct UnionRoomTrade
{
u16 field_0;
u16 type;
@@ -156,8 +156,8 @@ extern u8 gUnknown_02022C2C;
extern union UnkUnion_Main gUnknown_02022C30;
extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38;
extern u16 gUnknown_02022C3C;
extern u8 gUnknown_02022C3E;
extern u16 gUnionRoomOfferedSpecies;
extern u8 gUnionRoomRequestedMonType;
// Exported ROM declarations

2
src/battle_anim_mons.c
View File

@@ -988,7 +988,7 @@ void sub_80A6DAC(bool8 arg0)
}
}
void sub_80A6DEC(struct Sprite *sprite)
void TradeMenuBouncePartySprites(struct Sprite *sprite)
{
sprite->data[1] = sprite->pos1.x;
sprite->data[3] = sprite->pos1.y;

2
src/battle_main.c
View File

@@ -1491,7 +1491,7 @@ static void CB2_PreInitMultiBattle(void)
case 3:
if (gWirelessCommType)
{
if (sub_8010500())
if (IsLinkRfuTaskFinished())
{
gBattleTypeFlags = *savedBattleTypeFlags;
gMain.savedCallback = *savedCallback;

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:

122
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 = {
@@ -123,9 +125,9 @@ static u32 sub_80B2478(u8 lower, u8 upper)
return 1;
case EXCHANGE_IN_PROGRESS:
return 3;
case EXCHANGE_STAT_4:
case EXCHANGE_PLAYER_NOT_READY:
return 7;
case EXCHANGE_STAT_5:
case EXCHANGE_PARTNER_NOT_READY:
return 9;
case EXCHANGE_STAT_6:
ConvertIntToDecimalStringN(gStringVar1, GetLinkPlayerCount_2(), STR_CONV_MODE_LEFT_ALIGN, 1);
@@ -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();
@@ -1084,8 +1086,8 @@ static void sub_80B37FC(u8 taskId)
task->data[0]++;
break;
case 2:
gUnknown_02032298[0] = 0;
gUnknown_02032298[1] = 0;
gSelectedTradeMonPositions[TRADE_PLAYER] = 0;
gSelectedTradeMonPositions[TRADE_PARTNER] = 0;
m4aMPlayAllStop();
sub_800AC34();
task->data[0]++;
@@ -1093,7 +1095,7 @@ static void sub_80B37FC(u8 taskId)
case 3:
if (!gReceivedRemoteLinkPlayers)
{
SetMainCallback2(sub_80773AC);
SetMainCallback2(CB2_StartCreateTradeMenu);
DestroyTask(taskId);
}
break;
@@ -1109,7 +1111,7 @@ static void sub_80B3894(u8 taskId)
case 0:
ScriptContext2_Enable();
FadeScreen(1, 0);
Rfu_set_zero();
ClearLinkRfuCallback();
data[0]++;
break;
case 1:
@@ -1117,8 +1119,8 @@ static void sub_80B3894(u8 taskId)
data[0]++;
break;
case 2:
gUnknown_02032298[0] = 0;
gUnknown_02032298[1] = 0;
gSelectedTradeMonPositions[TRADE_PLAYER] = 0;
gSelectedTradeMonPositions[TRADE_PARTNER] = 0;
m4aMPlayAllStop();
sub_800ADF8();
data[0]++;
@@ -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;
}
}

1197
src/data/trade.h Normal file
View File

File diff suppressed because it is too large Load Diff

1044
src/data/union_room.h Normal file
View File

File diff suppressed because it is too large Load Diff

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 IsDodrioInParty(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]);
}

40
src/evolution_scene.c
View File

@@ -406,7 +406,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
gMain.state++;
break;
case 2:
sub_807F19C();
InitTradeBg();
gMain.state++;
break;
case 3:
@@ -438,7 +438,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
gSprites[ID].callback = SpriteCallbackDummy_2;
gSprites[ID].oam.paletteNum = 2;
gMain.state++;
sub_807B154();
LinkTradeDrawWindow();
}
break;
case 6:
@@ -452,7 +452,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
break;
case 7:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
sub_807B140();
InitTradeSequenceBgGpuRegs();
ShowBg(0);
ShowBg(1);
SetMainCallback2(CB2_TradeEvolutionSceneUpdate);
@@ -985,7 +985,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
{
case 0:
StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving);
sub_807F1A8(0, gStringVar4, 1);
DrawTextOnTradeWindow(0, gStringVar4, 1);
gTasks[taskID].tState++;
break;
case 1:
@@ -1075,7 +1075,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
if (IsCryFinished())
{
StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved);
sub_807F1A8(0, gStringVar4, 1);
DrawTextOnTradeWindow(0, gStringVar4, 1);
PlayFanfare(MUS_FANFA5);
gTasks[taskID].tState++;
SetMonData(mon, MON_DATA_SPECIES, (&gTasks[taskID].tPostEvoSpecies));
@@ -1110,7 +1110,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
else
{
PlayBGM(MUS_SHINKA);
sub_807F1A8(0, gText_CommunicationStandby5, 1);
DrawTextOnTradeWindow(0, gText_CommunicationStandby5, 1);
gTasks[taskID].tState++;
}
}
@@ -1144,7 +1144,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteID))
{
StringExpandPlaceholders(gStringVar4, gText_EllipsisQuestionMark);
sub_807F1A8(0, gStringVar4, 1);
DrawTextOnTradeWindow(0, gStringVar4, 1);
gTasks[taskID].tEvoWasStopped = 1;
gTasks[taskID].tState = 13;
}
@@ -1155,7 +1155,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
BufferMoveToLearnIntoBattleTextBuff2();
PlayFanfare(MUS_FANFA1);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
gTasks[taskID].tState++;
}
@@ -1172,7 +1172,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
{
BufferMoveToLearnIntoBattleTextBuff2();
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tLearnMoveState++;
}
break;
@@ -1180,7 +1180,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tLearnMoveState++;
}
break;
@@ -1188,7 +1188,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tData7 = 5;
gTasks[taskID].tData8 = 9;
gTasks[taskID].tLearnMoveState++;
@@ -1197,7 +1197,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
LoadUserWindowBorderGfx(0, 0xA8, 0xE0);
CreateYesNoMenu(&gUnknown_0833900C, 0xA8, 0xE, 0);
CreateYesNoMenu(&gTradeEvolutionSceneYesNoWindowTemplate, 0xA8, 0xE, 0);
sEvoCursorPos = 0;
gTasks[taskID].tLearnMoveState++;
sEvoCursorPos = 0;
@@ -1209,7 +1209,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
case 0:
sEvoCursorPos = 0;
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7;
if (gTasks[taskID].tLearnMoveState == 5)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
@@ -1218,7 +1218,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
case -1:
sEvoCursorPos = 1;
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tLearnMoveState = gTasks[taskID].tData8;
break;
}
@@ -1254,7 +1254,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
if (IsHMMove2(move))
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tLearnMoveState = 11;
}
else
@@ -1264,7 +1264,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
RemoveMonPPBonus(mon, var);
SetMonMoveSlot(mon, gMoveToLearn, var);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tLearnMoveState++;
}
}
@@ -1274,7 +1274,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tLearnMoveState++;
}
break;
@@ -1282,20 +1282,20 @@ static void Task_TradeEvolutionScene(u8 taskID)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tState = 18;
}
break;
case 9:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tData7 = 10;
gTasks[taskID].tData8 = 0;
gTasks[taskID].tLearnMoveState = 3;
break;
case 10:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_ID_ADDER]);
sub_807F1A8(0, gDisplayedStringBattle, 1);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskID].tState = 13;
break;
case 11:

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