dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync Cable Club scripts

Browse Source
This commit is contained in:
GriffinR
2020-01-10 16:55:58 -05:00
parent a537577671
commit 0bb7f18b8e
120 changed files with 1142 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+14 -69
View File
@@ -5,6 +5,7 @@
#include "constants/items.h"
#include "constants/layouts.h"
#include "constants/maps.h"
#include "constants/pokemon.h"
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/species.h"
@@ -23,6 +24,7 @@
#include "constants/map_scripts.h"
#include "constants/cable_club.h"
#include "constants/field_weather.h"
#include "constants/union_room.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.set FALSE, 0
@@ -72,11 +74,11 @@ gStdScripts:: @ 8160450
.4byte Std_ReceivedItem
gStdScriptsEnd::
.include "data/maps/UnknownMap_00_00/scripts.inc"
.include "data/maps/UnknownMap_00_01/scripts.inc"
.include "data/maps/UnknownMap_00_02/scripts.inc"
.include "data/maps/UnknownMap_00_03/scripts.inc"
.include "data/maps/UnknownMap_00_04/scripts.inc"
.include "data/maps/BattleColosseum2P/scripts.inc"
.include "data/maps/TradeCenter/scripts.inc"
.include "data/maps/RecordCenter/scripts.inc"
.include "data/maps/BattleColosseum4P/scripts.inc"
.include "data/maps/UnionRoom/scripts.inc"
.include "data/maps/ViridianForest/scripts.inc"
.include "data/maps/MtMoon_1F/scripts.inc"
.include "data/maps/MtMoon_B1F/scripts.inc"
@@ -1236,7 +1238,7 @@ EventScript_OutOfCenterPartyHeal:: @ 81A6C26
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
fadescreen FADE_FROM_BLACK
return
@@ -1699,73 +1701,16 @@ gUnknown_81A8CED:: @ 81A8CED
releaseall
end
CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
FiveIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
OneIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
PewterCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
SevenIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
VermilionCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
FourIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
SixIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
TwoIsland_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
Route10_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
Route10_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
Route4_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
SaffronCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
CeladonCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
LavenderTown_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
ViridianCity_PokemonCenter_2F_EventScript_1A8CF6:: @ 81A8CF6
call EventScript_1BBA04
Common_EventScript_UnionRoomAttendant:: @ 81A8CF6
call CableClub_EventScript_UnionRoomAttendant
end
CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
FiveIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
OneIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
PewterCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
SevenIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
VermilionCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
FourIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
SixIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
TwoIsland_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
Route10_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
Route10_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
Route4_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
SaffronCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
CeladonCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
LavenderTown_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
ViridianCity_PokemonCenter_2F_EventScript_1A8CFC:: @ 81A8CFC
call EventScript_1BBB6A
Common_EventScript_WirelessClubAttendant:: @ 81A8CFC
call CableClub_EventScript_WirelessClubAttendant
end
CeruleanCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
FiveIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
OneIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
PewterCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
SevenIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
VermilionCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
FourIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
SixIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
ThreeIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
TwoIsland_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
Route10_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
Route10_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
Route4_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
SaffronCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
CeladonCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
LavenderTown_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
call EventScript_1BBB9C
Common_EventScript_DirectCornerAttendant:: @ 81A8D02
call CableClub_EventScript_DirectCornerAttendant
end
VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
data/layouts/UnknownMap_00_00/border.bin → data/layouts/BattleColosseum2P/border.bin
View File
data/layouts/UnknownMap_00_00/map.bin → data/layouts/BattleColosseum2P/map.bin
View File
data/layouts/UnknownMap_00_01/border.bin → data/layouts/BattleColosseum4P/border.bin
View File
data/layouts/UnknownMap_00_03/map.bin → data/layouts/BattleColosseum4P/map.bin
View File
data/layouts/UnknownMap_00_02/border.bin → data/layouts/RecordCenter/border.bin
View File
data/layouts/UnknownMap_00_02/map.bin → data/layouts/RecordCenter/map.bin
View File
data/layouts/UnknownMap_00_03/border.bin → data/layouts/TradeCenter/border.bin
View File
data/layouts/UnknownMap_00_01/map.bin → data/layouts/TradeCenter/map.bin
View File
data/layouts/UnknownMap_00_04/border.bin → data/layouts/UnionRoom/border.bin
View File
data/layouts/UnknownMap_00_04/map.bin → data/layouts/UnionRoom/map.bin
View File
data/layouts/layouts.json
+20 -20
View File
@@ -433,52 +433,52 @@
"blockdata_filepath": "data/layouts/UnusedLayout_82D88C8/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_MAP_00_00",
"name": "UnknownMap_00_00_Layout",
"id": "LAYOUT_BATTLE_COLOSSEUM_2P",
"name": "BattleColosseum2P_Layout",
"width": 14,
"height": 9,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C44",
"border_filepath": "data/layouts/UnknownMap_00_00/border.bin",
"blockdata_filepath": "data/layouts/UnknownMap_00_00/map.bin"
"border_filepath": "data/layouts/BattleColosseum2P/border.bin",
"blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_MAP_00_01",
"name": "UnknownMap_00_01_Layout",
"id": "LAYOUT_TRADE_CENTER",
"name": "TradeCenter_Layout",
"width": 12,
"height": 9,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C44",
"border_filepath": "data/layouts/UnknownMap_00_01/border.bin",
"blockdata_filepath": "data/layouts/UnknownMap_00_01/map.bin"
"border_filepath": "data/layouts/TradeCenter/border.bin",
"blockdata_filepath": "data/layouts/TradeCenter/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_MAP_00_02",
"name": "UnknownMap_00_02_Layout",
"id": "LAYOUT_RECORD_CENTER",
"name": "RecordCenter_Layout",
"width": 20,
"height": 10,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C44",
"border_filepath": "data/layouts/UnknownMap_00_02/border.bin",
"blockdata_filepath": "data/layouts/UnknownMap_00_02/map.bin"
"border_filepath": "data/layouts/RecordCenter/border.bin",
"blockdata_filepath": "data/layouts/RecordCenter/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_MAP_00_03",
"name": "UnknownMap_00_03_Layout",
"id": "LAYOUT_BATTLE_COLOSSEUM_4P",
"name": "BattleColosseum4P_Layout",
"width": 14,
"height": 9,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C44",
"border_filepath": "data/layouts/UnknownMap_00_03/border.bin",
"blockdata_filepath": "data/layouts/UnknownMap_00_03/map.bin"
"border_filepath": "data/layouts/BattleColosseum4P/border.bin",
"blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin"
},
{
"id": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
@@ -2936,16 +2936,16 @@
"blockdata_filepath": "data/layouts/UnusedLayout_8338738/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_MAP_00_04",
"name": "UnknownMap_00_04_Layout",
"id": "LAYOUT_UNION_ROOM",
"name": "UnionRoom_Layout",
"width": 15,
"height": 12,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D50DC",
"border_filepath": "data/layouts/UnknownMap_00_04/border.bin",
"blockdata_filepath": "data/layouts/UnknownMap_00_04/map.bin"
"border_filepath": "data/layouts/UnionRoom/border.bin",
"blockdata_filepath": "data/layouts/UnionRoom/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB",
data/maps/UnknownMap_00_00/map.json → data/maps/BattleColosseum2P/map.json
+6 -6
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_UNKNOWN_MAP_00_00",
"name": "UnknownMap_00_00",
"layout": "LAYOUT_UNKNOWN_MAP_00_00",
"id": "MAP_BATTLE_COLOSSEUM_2P",
"name": "BattleColosseum2P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_00_EventScript_1BB9AF",
"script": "BattleColosseum2P_EventScript_Attendant",
"flag": "0"
}
],
@@ -51,7 +51,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_00_EventScript_1BB8C3"
"script": "BattleColosseum2P_EventScript_PlayerSpot0"
},
{
"type": "trigger",
@@ -60,7 +60,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_00_EventScript_1BB8CF"
"script": "BattleColosseum2P_EventScript_PlayerSpot1"
}
],
"bg_events": []
data/maps/BattleColosseum2P/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
BattleColosseum2P_MapScripts:: @ 8160478
.byte 0
data/maps/UnknownMap_00_03/map.json → data/maps/BattleColosseum4P/map.json
+7 -7
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_UNKNOWN_MAP_00_03",
"name": "UnknownMap_00_03",
"layout": "LAYOUT_UNKNOWN_MAP_00_03",
"id": "MAP_BATTLE_COLOSSEUM_4P",
"name": "BattleColosseum4P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false,
@@ -51,7 +51,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_03_EventScript_1BB8DB"
"script": "BattleColosseum4P_EventScript_PlayerSpot0"
},
{
"type": "trigger",
@@ -60,7 +60,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_03_EventScript_1BB915"
"script": "BattleColosseum4P_EventScript_PlayerSpot2"
},
{
"type": "trigger",
@@ -69,7 +69,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_03_EventScript_1BB8F8"
"script": "BattleColosseum4P_EventScript_PlayerSpot1"
},
{
"type": "trigger",
@@ -78,7 +78,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_03_EventScript_1BB932"
"script": "BattleColosseum4P_EventScript_PlayerSpot3"
}
],
"bg_events": []
data/maps/BattleColosseum4P/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
BattleColosseum4P_MapScripts:: @ 816047B
.byte 0
data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC
map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7
data/maps/CeladonCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/CeladonCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
CeladonCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816C634
call CableClub_EventScript_Colosseum
end
EventScript_16C63A:: @ 816C63A
call EventScript_1BB6AB
CeladonCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816C63A
call CableClub_EventScript_TradeCenter
end
EventScript_16C640:: @ 816C640
call EventScript_1BB7DE
CeladonCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816C640
call CableClub_EventScript_RecordCorner
end
data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D
map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38
data/maps/CeruleanCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
CeruleanCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816AA8E
call CableClub_EventScript_Colosseum
end
EventScript_16AA94:: @ 816AA94
call EventScript_1BB6AB
CeruleanCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816AA94
call CableClub_EventScript_TradeCenter
end
EventScript_16AA9A:: @ 816AA9A
call EventScript_1BB7DE
CeruleanCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816AA9A
call CableClub_EventScript_RecordCorner
end
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7
map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2
data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
CinnabarIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 816E9FD
call CableClub_EventScript_Colosseum
end
EventScript_16EA03:: @ 816EA03
call EventScript_1BB6AB
CinnabarIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EA03
call CableClub_EventScript_TradeCenter
end
EventScript_16EA09:: @ 816EA09
call EventScript_1BB7DE
CinnabarIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EA09
call CableClub_EventScript_RecordCorner
end
data/maps/FiveIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1
map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC
data/maps/FiveIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/FiveIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
FiveIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171D30
call CableClub_EventScript_Colosseum
end
EventScript_171D36:: @ 8171D36
call EventScript_1BB6AB
FiveIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171D36
call CableClub_EventScript_TradeCenter
end
EventScript_171D3C:: @ 8171D3C
call EventScript_1BB7DE
FiveIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171D3C
call CableClub_EventScript_RecordCorner
end
data/maps/FourIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA
map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FourIsland_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5
data/maps/FourIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/FourIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
FourIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171C32
call CableClub_EventScript_Colosseum
end
EventScript_171C38:: @ 8171C38
call EventScript_1BB6AB
FourIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171C38
call CableClub_EventScript_TradeCenter
end
EventScript_171C3E:: @ 8171C3E
call EventScript_1BB7DE
FourIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171C3E
call CableClub_EventScript_RecordCorner
end
data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1
map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC
data/maps/FuchsiaCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
FuchsiaCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816D739
call CableClub_EventScript_Colosseum
end
EventScript_16D73F:: @ 816D73F
call EventScript_1BB6AB
FuchsiaCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816D73F
call CableClub_EventScript_TradeCenter
end
EventScript_16D745:: @ 816D745
call EventScript_1BB7DE
FuchsiaCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816D745
call CableClub_EventScript_RecordCorner
end
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A
map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65
data/maps/IndigoPlateau_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
IndigoPlateau_PokemonCenter_2F_EventScript_Colosseum:: @ 816EB24
call CableClub_EventScript_Colosseum
end
EventScript_16EB2A:: @ 816EB2A
call EventScript_1BB6AB
IndigoPlateau_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EB2A
call CableClub_EventScript_TradeCenter
end
EventScript_16EB30:: @ 816EB30
call EventScript_1BB7DE
IndigoPlateau_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EB30
call CableClub_EventScript_RecordCorner
end
data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF
map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA
data/maps/LavenderTown_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "LavenderTown_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/LavenderTown_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
LavenderTown_PokemonCenter_2F_EventScript_Colosseum:: @ 816B137
call CableClub_EventScript_Colosseum
end
EventScript_16B13D:: @ 816B13D
call EventScript_1BB6AB
LavenderTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B13D
call CableClub_EventScript_TradeCenter
end
EventScript_16B143:: @ 816B143
call EventScript_1BB7DE
LavenderTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B143
call CableClub_EventScript_RecordCorner
end
data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
+1 -1
View File
@@ -44,7 +44,7 @@ EventScript_1653C5:: @ 81653C5
OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF
lockall
fadescreen FADE_TO_WHITE
special sp000_heal_pokemon
special HealPlayerParty
fadescreen FADE_FROM_WHITE
msgbox gUnknown_817D450
setvar VAR_TEMP_1, 1
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8
map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, OneIsland_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_1F_OnLoad
map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_1F_OnFrame
.byte 0
data/maps/OneIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/OneIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
OneIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171349
call CableClub_EventScript_Colosseum
end
EventScript_17134F:: @ 817134F
call EventScript_1BB6AB
OneIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 817134F
call CableClub_EventScript_TradeCenter
end
EventScript_171355:: @ 8171355
call EventScript_1BB7DE
OneIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171355
call CableClub_EventScript_RecordCorner
end
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+1 -1
View File
@@ -487,7 +487,7 @@ Movement_1694BE:: @ 81694BE
step_end
EventScript_1694C2:: @ 81694C2
special sp000_heal_pokemon
special HealPlayerParty
msgbox gUnknown_818DE38
closemessage
playbgm MUS_RIVAL2, 0
data/maps/PewterCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760
map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, PewterCity_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B
data/maps/PewterCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/PewterCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
PewterCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A7CA
call CableClub_EventScript_Colosseum
end
EventScript_16A7D0:: @ 816A7D0
call EventScript_1BB6AB
PewterCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A7D0
call CableClub_EventScript_TradeCenter
end
EventScript_16A7D6:: @ 816A7D6
call EventScript_1BB7DE
PewterCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A7D6
call CableClub_EventScript_RecordCorner
end
data/maps/PokemonTower_5F/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ PokemonTower_5F_EventScript_163433:: @ 8163433
PokemonTower_5F_EventScript_16343C:: @ 816343C
lockall
fadescreen FADE_TO_WHITE
special sp000_heal_pokemon
special HealPlayerParty
fadescreen FADE_FROM_WHITE
msgbox gUnknown_817A1FA
setvar VAR_TEMP_1, 1
data/maps/UnknownMap_00_02/map.json → data/maps/RecordCenter/map.json
+8 -8
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_UNKNOWN_MAP_00_02",
"name": "UnknownMap_00_02",
"layout": "LAYOUT_UNKNOWN_MAP_00_02",
"id": "MAP_RECORD_CENTER",
"name": "RecordCenter",
"layout": "LAYOUT_RECORD_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_02_EventScript_1BB9D3",
"script": "RecordCenter_EventScript_Attendant",
"flag": "0"
}
],
@@ -65,7 +65,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_02_EventScript_1BB980"
"script": "RecordCenter_EventScript_Spot"
},
{
"type": "trigger",
@@ -74,7 +74,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_02_EventScript_1BB980"
"script": "RecordCenter_EventScript_Spot"
},
{
"type": "trigger",
@@ -83,7 +83,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_02_EventScript_1BB980"
"script": "RecordCenter_EventScript_Spot"
},
{
"type": "trigger",
@@ -92,7 +92,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_02_EventScript_1BB980"
"script": "RecordCenter_EventScript_Spot"
}
],
"bg_events": []
data/maps/RecordCenter/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
RecordCenter_MapScripts:: @ 816047A
.byte 0
data/maps/Route10_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F
map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, Route10_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A
data/maps/Route10_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route10_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route10_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route10_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/Route10_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
Route10_PokemonCenter_2F_EventScript_Colosseum:: @ 816FD0F
call CableClub_EventScript_Colosseum
end
EventScript_16FD15:: @ 816FD15
call EventScript_1BB6AB
Route10_PokemonCenter_2F_EventScript_TradeCenter:: @ 816FD15
call CableClub_EventScript_TradeCenter
end
EventScript_16FD1B:: @ 816FD1B
call EventScript_1BB7DE
Route10_PokemonCenter_2F_EventScript_RecordCorner:: @ 816FD1B
call CableClub_EventScript_RecordCorner
end
data/maps/Route4_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
Route4_PokemonCenter_1F_MapScripts:: @ 816F739
map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, Route4_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
Route4_PokemonCenter_1F_OnTransition:: @ 816F744
data/maps/Route4_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route4_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route4_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route4_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/Route4_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
Route4_PokemonCenter_2F_EventScript_Colosseum:: @ 816F8ED
call CableClub_EventScript_Colosseum
end
EventScript_16F8F3:: @ 816F8F3
call EventScript_1BB6AB
Route4_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F8F3
call CableClub_EventScript_TradeCenter
end
EventScript_16F8F9:: @ 816F8F9
call EventScript_1BB7DE
Route4_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F8F9
call CableClub_EventScript_RecordCorner
end
data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC
map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7
data/maps/SaffronCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/SaffronCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
SaffronCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816F04C
call CableClub_EventScript_Colosseum
end
EventScript_16F052:: @ 816F052
call EventScript_1BB6AB
SaffronCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F052
call CableClub_EventScript_TradeCenter
end
EventScript_16F058:: @ 816F058
call EventScript_1BB7DE
SaffronCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F058
call CableClub_EventScript_RecordCorner
end
data/maps/SevenIsland_House_Room1/scripts.inc
+1 -1
View File
@@ -128,7 +128,7 @@ EventScript_170A11:: @ 8170A11
EventScript_170A1E:: @ 8170A1E
msgbox gUnknown_81A06AB
fadescreen FADE_TO_BLACK
special sub_80A0334
special ChooseHalfPartyForBattle
waitstate
return
data/maps/SevenIsland_House_Room2/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ EventScript_170A97:: @ 8170A97
compare VAR_RESULT, 2
call_if_eq EventScript_170B17
closemessage
special sp000_heal_pokemon
special HealPlayerParty
applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28
waitmovement 0
special LoadPlayerParty
data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94
data/maps/SevenIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/SevenIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
SevenIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8170BD1
call CableClub_EventScript_Colosseum
end
EventScript_170BD7:: @ 8170BD7
call EventScript_1BB6AB
SevenIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8170BD7
call CableClub_EventScript_TradeCenter
end
EventScript_170BDD:: @ 8170BDD
call EventScript_1BB7DE
SevenIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8170BDD
call CableClub_EventScript_RecordCorner
end
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+1 -1
View File
@@ -196,7 +196,7 @@ EventScript_164A53:: @ 8164A53
EventScript_164AA0:: @ 8164AA0
copyvar VAR_0x8005, VAR_RESULT
setvar VAR_MAP_SCENE_TRAINER_TOWER, 1
special sp000_heal_pokemon
special HealPlayerParty
msgbox gUnknown_817C8BF
setvar VAR_0x8004, 6
special sub_815D9E8
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A
map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SixIsland_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_1F_OnFrame
.byte 0
data/maps/SixIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/SixIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
SixIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171E35
call CableClub_EventScript_Colosseum
end
EventScript_171E3B:: @ 8171E3B
call EventScript_1BB6AB
SixIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171E3B
call CableClub_EventScript_TradeCenter
end
EventScript_171E41:: @ 8171E41
call EventScript_1BB7DE
SixIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171E41
call CableClub_EventScript_RecordCorner
end
data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832
map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D
data/maps/ThreeIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
ThreeIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 817187A
call CableClub_EventScript_Colosseum
end
EventScript_171880:: @ 8171880
call EventScript_1BB6AB
ThreeIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171880
call CableClub_EventScript_TradeCenter
end
EventScript_171886:: @ 8171886
call EventScript_1BB7DE
ThreeIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171886
call CableClub_EventScript_RecordCorner
end
data/maps/UnknownMap_00_01/map.json → data/maps/TradeCenter/map.json
+6 -6
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_UNKNOWN_MAP_00_01",
"name": "UnknownMap_00_01",
"layout": "LAYOUT_UNKNOWN_MAP_00_01",
"id": "MAP_TRADE_CENTER",
"name": "TradeCenter",
"layout": "LAYOUT_TRADE_CENTER",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_01_EventScript_1BB9C1",
"script": "TradeCenter_EventScript_Attendant",
"flag": "0"
}
],
@@ -51,7 +51,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_01_EventScript_1BB950"
"script": "TradeCenter_EventScript_Chair0"
},
{
"type": "trigger",
@@ -60,7 +60,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"script": "UnknownMap_00_01_EventScript_1BB95C"
"script": "TradeCenter_EventScript_Chair1"
}
],
"bg_events": []
data/maps/TradeCenter/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
TradeCenter_MapScripts:: @ 8160479
.byte 0
data/maps/TwoIsland_JoyfulGameCorner/map.json
+2 -2
View File
@@ -82,14 +82,14 @@
"x": 1,
"y": 1,
"elevation": 0,
"script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2E7"
"script": "TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords"
},
{
"type": "bg_event_type_0",
"x": 0,
"y": 1,
"elevation": 0,
"script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC"
"script": "TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords"
}
]
}
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+2 -2
View File
@@ -125,7 +125,7 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535
lock
faceplayer
compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
goto_if_eq EventScript_1BC060
goto_if_eq JoyfulGameCorner_EventScript_InfoMan2
goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171555
msgbox gUnknown_81A285C
release
@@ -140,7 +140,7 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F
lock
faceplayer
compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
goto_if_eq EventScript_1BC0CE
goto_if_eq JoyfulGameCorner_EventScript_MinigameAttendant
goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1715F5
compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
goto_if_eq EventScript_17158A
data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4
map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF
data/maps/TwoIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TwoIsland_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/TwoIsland_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
TwoIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 81717F3
call CableClub_EventScript_Colosseum
end
EventScript_1717F9:: @ 81717F9
call EventScript_1BB6AB
TwoIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 81717F9
call CableClub_EventScript_TradeCenter
end
EventScript_1717FF:: @ 81717FF
call EventScript_1BB7DE
TwoIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 81717FF
call CableClub_EventScript_RecordCorner
end
data/maps/UnknownMap_00_04/map.json → data/maps/UnionRoom/map.json
+12 -12
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_UNKNOWN_MAP_00_04",
"name": "UnknownMap_00_04",
"layout": "LAYOUT_UNKNOWN_MAP_00_04",
"id": "MAP_UNION_ROOM",
"name": "UnionRoom",
"layout": "LAYOUT_UNION_ROOM",
"music": "MUS_UNION",
"region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_04_EventScript_16050C",
"script": "UnionRoom_EventScript_16050C",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_04_EventScript_1604DA",
"script": "UnionRoom_EventScript_1604DA",
"flag": "FLAG_HIDE_UNION_ROOM_4"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_04_EventScript_160502",
"script": "UnionRoom_EventScript_160502",
"flag": "FLAG_HIDE_UNION_ROOM_8"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_04_EventScript_1604F8",
"script": "UnionRoom_EventScript_1604F8",
"flag": "FLAG_HIDE_UNION_ROOM_7"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_04_EventScript_1604EE",
"script": "UnionRoom_EventScript_1604EE",
"flag": "FLAG_HIDE_UNION_ROOM_6"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_04_EventScript_1604E4",
"script": "UnionRoom_EventScript_1604E4",
"flag": "FLAG_HIDE_UNION_ROOM_5"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_04_EventScript_1604D0",
"script": "UnionRoom_EventScript_1604D0",
"flag": "FLAG_HIDE_UNION_ROOM_3"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_04_EventScript_1604C6",
"script": "UnionRoom_EventScript_1604C6",
"flag": "FLAG_HIDE_UNION_ROOM_2"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UnknownMap_00_04_EventScript_1604BC",
"script": "UnionRoom_EventScript_1604BC",
"flag": "FLAG_HIDE_UNION_ROOM_1"
}
],
data/maps/UnknownMap_00_04/scripts.inc → data/maps/UnionRoom/scripts.inc
+15 -15
View File
@@ -1,9 +1,9 @@
UnknownMap_00_04_MapScripts:: @ 816047C
map_script MAP_SCRIPT_ON_RESUME, UnknownMap_00_04_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, UnknownMap_00_04_OnTransition
UnionRoom_MapScripts:: @ 816047C
map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition
.byte 0
UnknownMap_00_04_OnResume:: @ 8160487
UnionRoom_OnResume:: @ 8160487
setflag FLAG_HIDE_UNION_ROOM_1
setflag FLAG_HIDE_UNION_ROOM_2
setflag FLAG_HIDE_UNION_ROOM_3
@@ -23,10 +23,10 @@ UnknownMap_00_04_OnResume:: @ 8160487
special UnionRoomSpecial
end
UnknownMap_00_04_OnTransition:: @ 81604BB
UnionRoom_OnTransition:: @ 81604BB
end
UnknownMap_00_04_EventScript_1604BC:: @ 81604BC
UnionRoom_EventScript_1604BC:: @ 81604BC
lock
faceplayer
setvar VAR_RESULT, 1
@@ -34,7 +34,7 @@ UnknownMap_00_04_EventScript_1604BC:: @ 81604BC
release
end
UnknownMap_00_04_EventScript_1604C6:: @ 81604C6
UnionRoom_EventScript_1604C6:: @ 81604C6
lock
faceplayer
setvar VAR_RESULT, 2
@@ -42,7 +42,7 @@ UnknownMap_00_04_EventScript_1604C6:: @ 81604C6
release
end
UnknownMap_00_04_EventScript_1604D0:: @ 81604D0
UnionRoom_EventScript_1604D0:: @ 81604D0
lock
faceplayer
setvar VAR_RESULT, 3
@@ -50,7 +50,7 @@ UnknownMap_00_04_EventScript_1604D0:: @ 81604D0
release
end
UnknownMap_00_04_EventScript_1604DA:: @ 81604DA
UnionRoom_EventScript_1604DA:: @ 81604DA
lock
faceplayer
setvar VAR_RESULT, 4
@@ -58,7 +58,7 @@ UnknownMap_00_04_EventScript_1604DA:: @ 81604DA
release
end
UnknownMap_00_04_EventScript_1604E4:: @ 81604E4
UnionRoom_EventScript_1604E4:: @ 81604E4
lock
faceplayer
setvar VAR_RESULT, 5
@@ -66,7 +66,7 @@ UnknownMap_00_04_EventScript_1604E4:: @ 81604E4
release
end
UnknownMap_00_04_EventScript_1604EE:: @ 81604EE
UnionRoom_EventScript_1604EE:: @ 81604EE
lock
faceplayer
setvar VAR_RESULT, 6
@@ -74,7 +74,7 @@ UnknownMap_00_04_EventScript_1604EE:: @ 81604EE
release
end
UnknownMap_00_04_EventScript_1604F8:: @ 81604F8
UnionRoom_EventScript_1604F8:: @ 81604F8
lock
faceplayer
setvar VAR_RESULT, 7
@@ -82,7 +82,7 @@ UnknownMap_00_04_EventScript_1604F8:: @ 81604F8
release
end
UnknownMap_00_04_EventScript_160502:: @ 8160502
UnionRoom_EventScript_160502:: @ 8160502
lock
faceplayer
setvar VAR_RESULT, 8
@@ -90,7 +90,7 @@ UnknownMap_00_04_EventScript_160502:: @ 8160502
release
end
UnknownMap_00_04_EventScript_16050C:: @ 816050C
UnionRoom_EventScript_16050C:: @ 816050C
lock
faceplayer
setvar VAR_RESULT, 9
@@ -98,7 +98,7 @@ UnknownMap_00_04_EventScript_16050C:: @ 816050C
release
end
UnknownMap_00_04_EventScript_160516:: @ 8160516
UnionRoom_EventScript_160516:: @ 8160516
lockall
setvar VAR_RESULT, 10
waitstate
data/maps/UnknownMap_00_00/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnknownMap_00_00_MapScripts:: @ 8160478
.byte 0
data/maps/UnknownMap_00_01/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnknownMap_00_01_MapScripts:: @ 8160479
.byte 0
data/maps/UnknownMap_00_02/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnknownMap_00_02_MapScripts:: @ 816047A
.byte 0
data/maps/UnknownMap_00_03/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnknownMap_00_03_MapScripts:: @ 816047B
.byte 0
data/maps/VermilionCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424
map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F
data/maps/VermilionCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VermilionCity_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/VermilionCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
VermilionCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816B46C
call CableClub_EventScript_Colosseum
end
EventScript_16B472:: @ 816B472
call EventScript_1BB6AB
VermilionCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B472
call CableClub_EventScript_TradeCenter
end
EventScript_16B478:: @ 816B478
call EventScript_1BB7DE
VermilionCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B478
call CableClub_EventScript_RecordCorner
end
data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -1,6 +1,6 @@
ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0
map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB
data/maps/ViridianCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CF6",
"script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CFC",
"script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_PokemonCenter_2F_EventScript_1A8D02",
"script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_04",
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
"dest_map": "MAP_UNKNOWN_MAP_00_01",
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
data/maps/ViridianCity_PokemonCenter_2F/scripts.inc
+7 -6
View File
@@ -5,14 +5,15 @@ ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308
call EventScript_1BB4A3
@ The below 3 are unused and leftover from RS
ViridianCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A308
call CableClub_EventScript_Colosseum
end
EventScript_16A30E:: @ 816A30E
call EventScript_1BB6AB
ViridianCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A30E
call CableClub_EventScript_TradeCenter
end
EventScript_16A314:: @ 816A314
call EventScript_1BB7DE
ViridianCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A314
call CableClub_EventScript_RecordCorner
end
data/maps/map_groups.json
+5 -5
View File
@@ -45,11 +45,11 @@
"gMapGroup42"
],
"gMapGroup0": [
"UnknownMap_00_00",
"UnknownMap_00_01",
"UnknownMap_00_02",
"UnknownMap_00_03",
"UnknownMap_00_04"
"BattleColosseum2P",
"TradeCenter",
"RecordCenter",
"BattleColosseum4P",
"UnionRoom"
],
"gMapGroup1": [
"ViridianForest",
data/scripts/cable_club.inc
+575 -623
View File
File diff suppressed because it is too large Load Diff
data/scripts/pkmn_center_nurse.inc
+1 -1
View File
@@ -27,7 +27,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE
waitfieldeffect FLDEFF_POKECENTER_HEAL
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestDown
waitmovement 0
special sp000_heal_pokemon
special HealPlayerParty
return
EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC
data/scripts/trainer_battle.inc
+4 -4
View File
@@ -27,8 +27,8 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
compare VAR_RESULT, 0
goto_if_ne EventScript_1A4F20
special CheckForAlivePartyMons
compare VAR_RESULT, 0
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_1A4F19
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
@@ -79,8 +79,8 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare VAR_RESULT, 0
goto_if_eq EventScript_1A4FB0
special CheckForAlivePartyMons
compare VAR_RESULT, 0
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_1A4FB1
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
data/scripts/trainer_tower.inc
+1 -1
View File
@@ -241,7 +241,7 @@ EventScript_1C52D7:
end
EventScript_1C52E0:: @ 81C52E0
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 11
special sub_815D9E8
warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7
data/specials.inc
+20 -20
View File
@@ -8,11 +8,11 @@
.set __special__, 0
.align 2
gSpecials:: @ 815FD60
def_special sp000_heal_pokemon
def_special HealPlayerParty
def_special SetCableClubWarp
def_special DoCableClubWarp
def_special sub_807E704
def_special sub_8081744
def_special ReturnFromLinkRoom
def_special CleanupLinkRoomState
def_special sub_8081770
def_special nullsub_75
def_special nullsub_75
@@ -36,12 +36,12 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_8081064
def_special sub_80810CC
def_special TryBattleLinkup
def_special TryTradeLinkup
def_special sub_80810F4
def_special CloseLink
def_special sub_80819C8
def_special sub_8081978
def_special EnterColosseumPlayerSpot
def_special EnterTradeSeat
def_special sub_80819B8
def_special sub_808130C
def_special nullsub_75
@@ -49,8 +49,8 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special SavePlayerParty
def_special LoadPlayerParty
def_special sub_80A0334
def_special sp02A_crash_sound
def_special ChooseHalfPartyForBattle
def_special Script_ShowLinkTrainerCard
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -69,7 +69,7 @@ gSpecials:: @ 815FD60
def_special ScrSpecial_GetTrainerEyeRematchFlag
def_special ScrSpecial_StartTrainerEyeRematch
def_special ShowPokemonStorageSystem
def_special CheckForAlivePartyMons
def_special HasEnoughMonsForDoubleBattle
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -303,8 +303,8 @@ gSpecials:: @ 815FD60
def_special LeadMonHasEffortRibbon
def_special GiveLeadMonEffortRibbon
def_special ScrSpecial_AreLeadMonEVsMaxedOut
def_special sub_8069740
def_special sub_8069768
def_special Script_FacePlayer
def_special Script_ClearHeldMovement
def_special InitRoamer
def_special nullsub_75
def_special Special_PlayerHasGrassPokemonInParty
@@ -371,8 +371,8 @@ gSpecials:: @ 815FD60
def_special Special_StickerLadyGetBragFlags
def_special sub_80CC524
def_special IsWirelessAdapterConnected
def_special sub_8115A24
def_special BerryBlenderLinkJoinGroup
def_special TryBecomeLinkLeader
def_special TryJoinLinkGroup
def_special UnionRoomSpecial
def_special sub_814F1D4
def_special EnableNationalPokedex
@@ -394,7 +394,7 @@ gSpecials:: @ 815FD60
def_special HelpSystem_RestoreSomeVariable
def_special ValidateReceivedWonderCard
def_special sub_810B810
def_special sub_811999C
def_special InitUnionRoom
def_special BufferUnionRoomPlayerName
def_special sub_811390C
def_special Special_GetMartClerkObjectId
@@ -410,10 +410,10 @@ gSpecials:: @ 815FD60
def_special SetBattledTrainerFlag
def_special sub_812B35C
def_special Special_SSAnneDepartureCutscene
def_special sub_8149A18
def_special IsPokemonJumpSpeciesInParty
def_special IsNationalPokedexEnabled
def_special sub_815D9E8
def_special sub_814B504
def_special ShowPokemonJumpRecords
def_special Special_ItemIsTM_GetMoveName
def_special Special_DaisyMassageServices
def_special HelpSystem_Disable
@@ -430,7 +430,7 @@ gSpecials:: @ 815FD60
def_special Special_CapeBrinkGetMoveToTeachLeadPokemon
def_special Special_HasLearnedAllMovesFromCapeBrinkTutor
def_special Special_Credits
def_special sub_8153810
def_special ShowDodrioBerryPickingRecords
def_special Special_DrawSeagallopDestinationMenu
def_special Special_GetSelectedSeagallopDestination
def_special sub_8147500
@@ -443,10 +443,10 @@ gSpecials:: @ 815FD60
def_special HasAllMons
def_special Special_PlayerIsNotInTrainerTowerLobby
def_special Special_BrailleCursorToggle
def_special sub_811B15C
def_special Script_ResetUnionRoomTrade
def_special Special_PlayerPartyContainsSpeciesWithPlayerID
def_special sub_809C4A8
def_special sub_81537C0
def_special IsDodrioInParty
def_special sub_809C5FC
def_special Special_InitElevatorFloorSelectMenuPos
def_special Special_ComputeLoreleiDollCollection