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

Some stdscript sync, start syncing cable_club.inc

Browse Source
This commit is contained in:
GriffinR
2020-01-08 23:44:55 -05:00
parent 33a4b68486
commit 16dc234d99
64 changed files with 3835 additions and 3901 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+2 -2
View File
@@ -155,10 +155,10 @@ EventScript_16BF7C:: @ 816BF7C
additem VAR_0x8009, 1
textcolor 3
playfanfare MUS_FANFA1
message Text_195DAD
message Text_ReceivedItemFromLittleGirl
waitmessage
waitfanfare
giveitem VAR_0x8009, 1, 8
putitemaway VAR_0x8009
call EventScript_1A6675
compare VAR_0x8008, ITEM_FRESH_WATER
call_if eq, EventScript_16BFDE
data/maps/CeladonCity_DepartmentStore_Roof/text.inc
+1 -1
View File
@@ -12,7 +12,7 @@ gUnknown_8195D75:: @ 8195D75
.string "Thank you!\n"
.string "You can have this from me!$"
Text_195DAD:: @ 8195DAD
Text_ReceivedItemFromLittleGirl:: @ 8195DAD
.string "{PLAYER} received a {STR_VAR_2}\n"
.string "from the little girl.$"
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+1 -1
View File
@@ -340,7 +340,7 @@ EventScript_16CF3F:: @ 816CF3F
EventScript_16CF79:: @ 816CF79
textcolor 3
msgbox gUnknown_81A5242
msgbox Text_TooBadBagFull
hidecoinsbox 0, 0
release
end
data/maps/CeladonCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/CeladonCity_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F
map_script MAP_SCRIPT_ON_FRAME_TABLE, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, CeladonCity_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4
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
CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634
data/maps/CeruleanCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79
map_script MAP_SCRIPT_ON_FRAME_TABLE, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4
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
CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E
data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8
map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4
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
CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD
data/maps/FiveIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/FiveIsland_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B
map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, FiveIsland_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4
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
FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30
data/maps/FiveIsland_ResortGorgeous/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF
.2byte 0
EventScript_1687F9:: @ 81687F9
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
end
FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE
data/maps/FourIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/FourIsland_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D
map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, FourIsland_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4
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
FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32
data/maps/FuchsiaCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724
map_script MAP_SCRIPT_ON_FRAME_TABLE, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4
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
FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739
data/maps/IndigoPlateau_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F
map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4
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
IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24
data/maps/LavenderTown_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "LavenderTown_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/LavenderTown_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122
map_script MAP_SCRIPT_ON_FRAME_TABLE, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, LavenderTown_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4
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
LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137
data/maps/OneIsland_Harbor/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ OneIsland_Harbor_OnWarp:: @ 8171383
.2byte 0
EventScript_17138D:: @ 817138D
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
end
OneIsland_Harbor_OnFrame:: @ 8171392
data/maps/OneIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/OneIsland_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334
map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4
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
OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+1 -1
View File
@@ -17,7 +17,7 @@ PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE
.2byte 0
EventScript_168CC8:: @ 8168CC8
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1
end
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+1 -1
View File
@@ -40,7 +40,7 @@ PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1
.2byte 0
EventScript_168FEB:: @ 8168FEB
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
end
PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0
data/maps/PewterCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/PewterCity_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5
map_script MAP_SCRIPT_ON_FRAME_TABLE, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, PewterCity_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4
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
PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA
data/maps/PokemonLeague_AgathasRoom/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ PokemonLeague_AgathasRoom_OnWarp:: @ 8162851
.2byte 0
EventScript_16285B:: @ 816285B
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
end
PokemonLeague_AgathasRoom_OnFrame:: @ 8162860
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6
.2byte 0
EventScript_1626D0:: @ 81626D0
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
end
PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+1 -1
View File
@@ -45,7 +45,7 @@ PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D
.2byte 0
EventScript_162B67:: @ 8162B67
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
end
PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C
data/maps/PokemonLeague_HallOfFame/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ PokemonLeague_HallOfFame_OnWarp:: @ 8162D57
.2byte 0
EventScript_162D61:: @ 8162D61
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
end
PokemonLeague_HallOfFame_OnFrame:: @ 8162D66
data/maps/PokemonLeague_LancesRoom/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ PokemonLeague_LancesRoom_OnWarp:: @ 816296E
.2byte 0
EventScript_162978:: @ 8162978
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
end
PokemonLeague_LancesRoom_OnFrame:: @ 816297D
data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+1 -1
View File
@@ -35,7 +35,7 @@ PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6
.2byte 0
EventScript_1625C0:: @ 81625C0
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
end
PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5
data/maps/Route10_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route10_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/Route10_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route10_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route10_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, Route10_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_2F_MapScript4_1BB1B4
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
Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F
data/maps/Route4_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route4_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/Route4_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route4_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route4_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, Route4_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_2F_MapScript4_1BB1B4
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
Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED
data/maps/SaffronCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/SaffronCity_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037
map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, SaffronCity_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4
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
SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -1
View File
@@ -69,7 +69,7 @@ SeafoamIslands_B4F_OnWarp:: @ 81630E7
.2byte 0
EventScript_1630F1:: @ 81630F1
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
special Special_ForcePlayerToStartSurfing
end
data/maps/SevenIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/SevenIsland_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, SevenIsland_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4
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
SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1
data/maps/SixIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/SixIsland_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20
map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, SixIsland_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4
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
SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35
data/maps/ThreeIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865
map_script MAP_SCRIPT_ON_FRAME_TABLE, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4
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
ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+4 -4
View File
@@ -2,7 +2,7 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0
map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_JoyfulGameCorner_OnFrame
map_script MAP_SCRIPT_ON_LOAD, TwoIsland_JoyfulGameCorner_MapScript4_1BB237
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
.byte 0
TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5
@@ -19,17 +19,17 @@ EventScript_1713EF:: @ 81713EF
TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404
map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416
map_script_2 VAR_0x406F, 8, EventScript_1BB227
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, EventScript_CheckTurnAttendant
.2byte 0
EventScript_171416:: @ 8171416
turnobject 255, 2
turnobject OBJ_EVENT_ID_PLAYER, 2
end
TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B
map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F
map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435
map_script_2 VAR_0x406F, 8, EventScript_1BB2FD
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
.2byte 0
EventScript_171435:: @ 8171435
data/maps/TwoIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TwoIsland_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/TwoIsland_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE
map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, TwoIsland_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4
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
TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3
data/maps/VermilionCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VermilionCity_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/VermilionCity_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457
map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, VermilionCity_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4
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
VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C
data/maps/ViridianCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_PokemonCenter_2F_EventScript_1BB1D2",
"script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
data/maps/ViridianCity_PokemonCenter_2F/scripts.inc
+4 -4
View File
@@ -1,8 +1,8 @@
ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3
map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED
map_script MAP_SCRIPT_ON_LOAD, ViridianCity_PokemonCenter_2F_MapScript3_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4
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
ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308