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
asm/macros/event.inc
+23 -2
View File
@@ -1432,15 +1432,36 @@
.endm
@ Message box types
MSGBOX_NPC = 2
MSGBOX_SIGN = 3
MSGBOX_DEFAULT = 4
MSGBOX_YESNO = 5
MSGBOX_AUTOCLOSE = 6
YES = 1
NO = 0
.macro giveitem item, amount=1, function=0
@ Other callstd function names
STD_OBTAIN_ITEM = 0
STD_FIND_ITEM = 1
STD_PUT_ITEM_AWAY = 8
.macro giveitem item, amount=1
setorcopyvar 0x8000, \item
setorcopyvar 0x8001, \amount
callstd \function
callstd STD_OBTAIN_ITEM
.endm
.macro finditem item, amount=1
setorcopyvar 0x8000, \item
setorcopyvar 0x8001, \amount
callstd STD_FIND_ITEM
.endm
.macro putitemaway item, amount=1
setorcopyvar 0x8000, \item
setorcopyvar 0x8001, \amount
callstd STD_PUT_ITEM_AWAY
.endm
.macro giveitemfanfaremsg msg, item, amount=1, fanfare=MUS_FANFA1
data/event_scripts.s
+95 -3113
View File
File diff suppressed because it is too large Load Diff
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
data/scripts/cable_club.inc
+1910
View File
File diff suppressed because it is too large Load Diff
data/scripts/item_ball_scripts.inc
+168 -168
View File
@@ -1,671 +1,671 @@
Route2_EventScript_1BE58E:: @ 81BE58E
giveitem ITEM_ETHER, 1, 1
finditem ITEM_ETHER
end
Route2_EventScript_1BE59B:: @ 81BE59B
giveitem ITEM_PARALYZE_HEAL, 1, 1
finditem ITEM_PARALYZE_HEAL
end
ViridianForest_EventScript_1BE5A8:: @ 81BE5A8
giveitem ITEM_POKE_BALL, 1, 1
finditem ITEM_POKE_BALL
end
ViridianForest_EventScript_1BE5B5:: @ 81BE5B5
giveitem ITEM_ANTIDOTE, 1, 1
finditem ITEM_ANTIDOTE
end
ViridianForest_EventScript_1BE5C2:: @ 81BE5C2
giveitem ITEM_POTION, 1, 1
finditem ITEM_POTION
end
MtMoon_1F_EventScript_1BE5CF:: @ 81BE5CF
giveitem ITEM_PARALYZE_HEAL, 1, 1
finditem ITEM_PARALYZE_HEAL
end
MtMoon_1F_EventScript_1BE5DC:: @ 81BE5DC
giveitem ITEM_TM09, 1, 1
finditem ITEM_TM09
end
MtMoon_1F_EventScript_1BE5E9:: @ 81BE5E9
giveitem ITEM_POTION, 1, 1
finditem ITEM_POTION
end
MtMoon_1F_EventScript_1BE5F6:: @ 81BE5F6
giveitem ITEM_RARE_CANDY, 1, 1
finditem ITEM_RARE_CANDY
end
MtMoon_1F_EventScript_1BE603:: @ 81BE603
giveitem ITEM_ESCAPE_ROPE, 1, 1
finditem ITEM_ESCAPE_ROPE
end
MtMoon_1F_EventScript_1BE610:: @ 81BE610
giveitem ITEM_MOON_STONE, 1, 1
finditem ITEM_MOON_STONE
end
MtMoon_B2F_EventScript_1BE61D:: @ 81BE61D
giveitem ITEM_STAR_PIECE, 1, 1
finditem ITEM_STAR_PIECE
end
MtMoon_B2F_EventScript_1BE62A:: @ 81BE62A
giveitem ITEM_TM46, 1, 1
finditem ITEM_TM46
end
Route4_EventScript_1BE637:: @ 81BE637
giveitem ITEM_TM05, 1, 1
finditem ITEM_TM05
end
Route24_EventScript_1BE644:: @ 81BE644
giveitem ITEM_TM45, 1, 1
finditem ITEM_TM45
end
Route25_EventScript_1BE651:: @ 81BE651
giveitem ITEM_TM43, 1, 1
finditem ITEM_TM43
end
SSAnne_1F_Room2_EventScript_1BE65E:: @ 81BE65E
giveitem ITEM_TM31, 1, 1
finditem ITEM_TM31
end
SSAnne_2F_Room2_EventScript_1BE66B:: @ 81BE66B
giveitem ITEM_STARDUST, 1, 1
finditem ITEM_STARDUST
end
SSAnne_2F_Room4_EventScript_1BE678:: @ 81BE678
giveitem ITEM_X_ATTACK, 1, 1
finditem ITEM_X_ATTACK
end
SSAnne_B1F_Room2_EventScript_1BE685:: @ 81BE685
giveitem ITEM_TM44, 1, 1
finditem ITEM_TM44
end
SSAnne_B1F_Room3_EventScript_1BE692:: @ 81BE692
giveitem ITEM_ETHER, 1, 1
finditem ITEM_ETHER
end
SSAnne_B1F_Room5_EventScript_1BE69F:: @ 81BE69F
giveitem ITEM_SUPER_POTION, 1, 1
finditem ITEM_SUPER_POTION
end
SSAnne_Kitchen_EventScript_1BE6AC:: @ 81BE6AC
giveitem ITEM_GREAT_BALL, 1, 1
finditem ITEM_GREAT_BALL
end
Route9_EventScript_1BE6B9:: @ 81BE6B9
giveitem ITEM_TM40, 1, 1
finditem ITEM_TM40
end
RocketHideout_B1F_EventScript_1BE6C6:: @ 81BE6C6
giveitem ITEM_ESCAPE_ROPE, 1, 1
finditem ITEM_ESCAPE_ROPE
end
RocketHideout_B1F_EventScript_1BE6D3:: @ 81BE6D3
giveitem ITEM_HYPER_POTION, 1, 1
finditem ITEM_HYPER_POTION
end
RocketHideout_B2F_EventScript_1BE6E0:: @ 81BE6E0
giveitem ITEM_X_SPEED, 1, 1
finditem ITEM_X_SPEED
end
RocketHideout_B2F_EventScript_1BE6ED:: @ 81BE6ED
giveitem ITEM_MOON_STONE, 1, 1
finditem ITEM_MOON_STONE
end
RocketHideout_B2F_EventScript_1BE6FA:: @ 81BE6FA
giveitem ITEM_TM12, 1, 1
finditem ITEM_TM12
end
RocketHideout_B2F_EventScript_1BE707:: @ 81BE707
giveitem ITEM_SUPER_POTION, 1, 1
finditem ITEM_SUPER_POTION
end
RocketHideout_B3F_EventScript_1BE714:: @ 81BE714
giveitem ITEM_RARE_CANDY, 1, 1
finditem ITEM_RARE_CANDY
end
RocketHideout_B3F_EventScript_1BE721:: @ 81BE721
giveitem ITEM_TM21, 1, 1
finditem ITEM_TM21
end
RocketHideout_B4F_EventScript_1BE72E:: @ 81BE72E
giveitem ITEM_TM49, 1, 1
finditem ITEM_TM49
end
RocketHideout_B4F_EventScript_1BE73B:: @ 81BE73B
giveitem ITEM_MAX_ETHER, 1, 1
finditem ITEM_MAX_ETHER
end
RocketHideout_B4F_EventScript_1BE748:: @ 81BE748
giveitem ITEM_CALCIUM, 1, 1
finditem ITEM_CALCIUM
end
PokemonTower_3F_EventScript_1BE755:: @ 81BE755
giveitem ITEM_ESCAPE_ROPE, 1, 1
finditem ITEM_ESCAPE_ROPE
end
PokemonTower_4F_EventScript_1BE762:: @ 81BE762
giveitem ITEM_ELIXIR, 1, 1
finditem ITEM_ELIXIR
end
PokemonTower_4F_EventScript_1BE76F:: @ 81BE76F
giveitem ITEM_AWAKENING, 1, 1
finditem ITEM_AWAKENING
end
PokemonTower_4F_EventScript_1BE77C:: @ 81BE77C
giveitem ITEM_GREAT_BALL, 1, 1
finditem ITEM_GREAT_BALL
end
PokemonTower_5F_EventScript_1BE789:: @ 81BE789
giveitem ITEM_NUGGET, 1, 1
finditem ITEM_NUGGET
end
PokemonTower_6F_EventScript_1BE796:: @ 81BE796
giveitem ITEM_RARE_CANDY, 1, 1
finditem ITEM_RARE_CANDY
end
PokemonTower_6F_EventScript_1BE7A3:: @ 81BE7A3
giveitem ITEM_X_ACCURACY, 1, 1
finditem ITEM_X_ACCURACY
end
Route12_EventScript_1BE7B0:: @ 81BE7B0
giveitem ITEM_TM48, 1, 1
finditem ITEM_TM48
end
Route12_EventScript_1BE7BD:: @ 81BE7BD
giveitem ITEM_IRON, 1, 1
finditem ITEM_IRON
end
Route15_EventScript_1BE7CA:: @ 81BE7CA
giveitem ITEM_TM18, 1, 1
finditem ITEM_TM18
end
SafariZone_Center_EventScript_1BE7D7:: @ 81BE7D7
giveitem ITEM_NUGGET, 1, 1
finditem ITEM_NUGGET
end
SafariZone_East_EventScript_1BE7E4:: @ 81BE7E4
giveitem ITEM_MAX_POTION, 1, 1
finditem ITEM_MAX_POTION
end
SafariZone_East_EventScript_1BE7F1:: @ 81BE7F1
giveitem ITEM_FULL_RESTORE, 1, 1
finditem ITEM_FULL_RESTORE
end
SafariZone_East_EventScript_1BE7FE:: @ 81BE7FE
giveitem ITEM_TM11, 1, 1
finditem ITEM_TM11
end
SafariZone_East_EventScript_1BE80B:: @ 81BE80B
giveitem ITEM_LEAF_STONE, 1, 1
finditem ITEM_LEAF_STONE
end
SafariZone_North_EventScript_1BE818:: @ 81BE818
giveitem ITEM_PROTEIN, 1, 1
finditem ITEM_PROTEIN
end
SafariZone_North_EventScript_1BE825:: @ 81BE825
giveitem ITEM_TM47, 1, 1
finditem ITEM_TM47
end
SafariZone_West_EventScript_1BE832:: @ 81BE832
giveitem ITEM_TM32, 1, 1
finditem ITEM_TM32
end
SafariZone_West_EventScript_1BE83F:: @ 81BE83F
giveitem ITEM_GOLD_TEETH, 1, 1
finditem ITEM_GOLD_TEETH
end
SafariZone_West_EventScript_1BE84C:: @ 81BE84C
giveitem ITEM_MAX_POTION, 1, 1
finditem ITEM_MAX_POTION
end
SafariZone_West_EventScript_1BE859:: @ 81BE859
giveitem ITEM_MAX_REVIVE, 1, 1
finditem ITEM_MAX_REVIVE
end
SilphCo_3F_EventScript_1BE866:: @ 81BE866
giveitem ITEM_HYPER_POTION, 1, 1
finditem ITEM_HYPER_POTION
end
SilphCo_4F_EventScript_1BE873:: @ 81BE873
giveitem ITEM_MAX_REVIVE, 1, 1
finditem ITEM_MAX_REVIVE
end
SilphCo_4F_EventScript_1BE880:: @ 81BE880
giveitem ITEM_ESCAPE_ROPE, 1, 1
finditem ITEM_ESCAPE_ROPE
end
SilphCo_4F_EventScript_1BE88D:: @ 81BE88D
giveitem ITEM_FULL_HEAL, 1, 1
finditem ITEM_FULL_HEAL
end
SilphCo_5F_EventScript_1BE89A:: @ 81BE89A
giveitem ITEM_PROTEIN, 1, 1
finditem ITEM_PROTEIN
end
SilphCo_5F_EventScript_1BE8A7:: @ 81BE8A7
giveitem ITEM_TM01, 1, 1
finditem ITEM_TM01
end
SilphCo_5F_EventScript_1BE8B4:: @ 81BE8B4
giveitem ITEM_CARD_KEY, 1, 1
finditem ITEM_CARD_KEY
end
SilphCo_6F_EventScript_1BE8C1:: @ 81BE8C1
giveitem ITEM_HP_UP, 1, 1
finditem ITEM_HP_UP
end
SilphCo_6F_EventScript_1BE8CE:: @ 81BE8CE
giveitem ITEM_X_SPECIAL, 1, 1
finditem ITEM_X_SPECIAL
end
SilphCo_7F_EventScript_1BE8DB:: @ 81BE8DB
giveitem ITEM_CALCIUM, 1, 1
finditem ITEM_CALCIUM
end
SilphCo_7F_EventScript_1BE8E8:: @ 81BE8E8
giveitem ITEM_TM08, 1, 1
finditem ITEM_TM08
end
SilphCo_10F_EventScript_1BE8F5:: @ 81BE8F5
giveitem ITEM_CARBOS, 1, 1
finditem ITEM_CARBOS
end
SilphCo_10F_EventScript_1BE902:: @ 81BE902
giveitem ITEM_ULTRA_BALL, 1, 1
finditem ITEM_ULTRA_BALL
end
SilphCo_10F_EventScript_1BE90F:: @ 81BE90F
giveitem ITEM_RARE_CANDY, 1, 1
finditem ITEM_RARE_CANDY
end
PowerPlant_EventScript_1BE91C:: @ 81BE91C
giveitem ITEM_MAX_POTION, 1, 1
finditem ITEM_MAX_POTION
end
PowerPlant_EventScript_1BE929:: @ 81BE929
giveitem ITEM_TM17, 1, 1
finditem ITEM_TM17
end
PowerPlant_EventScript_1BE936:: @ 81BE936
giveitem ITEM_TM25, 1, 1
finditem ITEM_TM25
end
PowerPlant_EventScript_1BE943:: @ 81BE943
giveitem ITEM_THUNDER_STONE, 1, 1
finditem ITEM_THUNDER_STONE
end
PowerPlant_EventScript_1BE950:: @ 81BE950
giveitem ITEM_ELIXIR, 1, 1
finditem ITEM_ELIXIR
end
PokemonMansion_1F_EventScript_1BE95D:: @ 81BE95D
giveitem ITEM_CARBOS, 1, 1
finditem ITEM_CARBOS
end
PokemonMansion_1F_EventScript_1BE96A:: @ 81BE96A
giveitem ITEM_ESCAPE_ROPE, 1, 1
finditem ITEM_ESCAPE_ROPE
end
PokemonMansion_2F_EventScript_1BE977:: @ 81BE977
giveitem ITEM_CALCIUM, 1, 1
finditem ITEM_CALCIUM
end
PokemonMansion_3F_EventScript_1BE984:: @ 81BE984
giveitem ITEM_MAX_POTION, 1, 1
finditem ITEM_MAX_POTION
end
PokemonMansion_3F_EventScript_1BE991:: @ 81BE991
giveitem ITEM_IRON, 1, 1
finditem ITEM_IRON
end
PokemonMansion_B1F_EventScript_1BE99E:: @ 81BE99E
giveitem ITEM_TM14, 1, 1
finditem ITEM_TM14
end
PokemonMansion_B1F_EventScript_1BE9AB:: @ 81BE9AB
giveitem ITEM_FULL_RESTORE, 1, 1
finditem ITEM_FULL_RESTORE
end
PokemonMansion_B1F_EventScript_1BE9B8:: @ 81BE9B8
giveitem ITEM_TM22, 1, 1
finditem ITEM_TM22
end
PokemonMansion_B1F_EventScript_1BE9C5:: @ 81BE9C5
giveitem ITEM_SECRET_KEY, 1, 1
finditem ITEM_SECRET_KEY
end
VictoryRoad_1F_EventScript_1BE9D2:: @ 81BE9D2
giveitem ITEM_RARE_CANDY, 1, 1
finditem ITEM_RARE_CANDY
end
VictoryRoad_1F_EventScript_1BE9DF:: @ 81BE9DF
giveitem ITEM_TM02, 1, 1
finditem ITEM_TM02
end
VictoryRoad_2F_EventScript_1BE9EC:: @ 81BE9EC
giveitem ITEM_GUARD_SPEC, 1, 1
finditem ITEM_GUARD_SPEC
end
VictoryRoad_2F_EventScript_1BE9F9:: @ 81BE9F9
giveitem ITEM_TM07, 1, 1
finditem ITEM_TM07
end
VictoryRoad_2F_EventScript_1BEA06:: @ 81BEA06
giveitem ITEM_FULL_HEAL, 1, 1
finditem ITEM_FULL_HEAL
end
VictoryRoad_2F_EventScript_1BEA13:: @ 81BEA13
giveitem ITEM_TM37, 1, 1
finditem ITEM_TM37
end
VictoryRoad_3F_EventScript_1BEA20:: @ 81BEA20
giveitem ITEM_MAX_REVIVE, 1, 1
finditem ITEM_MAX_REVIVE
end
VictoryRoad_3F_EventScript_1BEA2D:: @ 81BEA2D
giveitem ITEM_TM50, 1, 1
finditem ITEM_TM50
end
CeruleanCave_1F_EventScript_1BEA3A:: @ 81BEA3A
giveitem ITEM_MAX_ELIXIR, 1, 1
finditem ITEM_MAX_ELIXIR
end
CeruleanCave_1F_EventScript_1BEA47:: @ 81BEA47
giveitem ITEM_NUGGET, 1, 1
finditem ITEM_NUGGET
end
CeruleanCave_1F_EventScript_1BEA54:: @ 81BEA54
giveitem ITEM_FULL_RESTORE, 1, 1
finditem ITEM_FULL_RESTORE
end
CeruleanCave_2F_EventScript_1BEA61:: @ 81BEA61
giveitem ITEM_FULL_RESTORE, 1, 1
finditem ITEM_FULL_RESTORE
end
CeruleanCave_2F_EventScript_1BEA6E:: @ 81BEA6E
giveitem ITEM_PP_UP, 1, 1
finditem ITEM_PP_UP
end
CeruleanCave_2F_EventScript_1BEA7B:: @ 81BEA7B
giveitem ITEM_ULTRA_BALL, 1, 1
finditem ITEM_ULTRA_BALL
end
CeruleanCave_B1F_EventScript_1BEA88:: @ 81BEA88
giveitem ITEM_MAX_REVIVE, 1, 1
finditem ITEM_MAX_REVIVE
end
CeruleanCave_B1F_EventScript_1BEA95:: @ 81BEA95
giveitem ITEM_ULTRA_BALL, 1, 1
finditem ITEM_ULTRA_BALL
end
FuchsiaCity_Building1_EventScript_1BEAA2:: @ 81BEAA2
giveitem ITEM_RARE_CANDY, 1, 1
finditem ITEM_RARE_CANDY
end
TwoIsland_EventScript_1BEAAF:: @ 81BEAAF
giveitem ITEM_REVIVE, 1, 1
finditem ITEM_REVIVE
end
ThreeIsland_EventScript_1BEABC:: @ 81BEABC
giveitem ITEM_ZINC, 1, 1
finditem ITEM_ZINC
end
ViridianForest_EventScript_1BEAC9:: @ 81BEAC9
giveitem ITEM_POTION, 1, 1
finditem ITEM_POTION
end
MtMoon_B2F_EventScript_1BEAD6:: @ 81BEAD6
giveitem ITEM_REVIVE, 1, 1
finditem ITEM_REVIVE
end
MtMoon_B2F_EventScript_1BEAE3:: @ 81BEAE3
giveitem ITEM_ANTIDOTE, 1, 1
finditem ITEM_ANTIDOTE
end
Route11_EventScript_1BEAF0:: @ 81BEAF0
giveitem ITEM_X_DEFEND, 1, 1
finditem ITEM_X_DEFEND
end
Route9_EventScript_1BEAFD:: @ 81BEAFD
giveitem ITEM_BURN_HEAL, 1, 1
finditem ITEM_BURN_HEAL
end
RockTunnel_1F_EventScript_1BEB0A:: @ 81BEB0A
giveitem ITEM_REPEL, 1, 1
finditem ITEM_REPEL
end
RockTunnel_1F_EventScript_1BEB17:: @ 81BEB17
giveitem ITEM_PEARL, 1, 1
finditem ITEM_PEARL
end
RockTunnel_1F_EventScript_1BEB24:: @ 81BEB24
giveitem ITEM_ESCAPE_ROPE, 1, 1
finditem ITEM_ESCAPE_ROPE
end
RockTunnel_B1F_EventScript_1BEB31:: @ 81BEB31
giveitem ITEM_REVIVE, 1, 1
finditem ITEM_REVIVE
end
RockTunnel_B1F_EventScript_1BEB3E:: @ 81BEB3E
giveitem ITEM_MAX_ETHER, 1, 1
finditem ITEM_MAX_ETHER
end
SilphCo_8F_EventScript_1BEB4B:: @ 81BEB4B
giveitem ITEM_IRON, 1, 1
finditem ITEM_IRON
end
SilphCo_11F_EventScript_1BEB58:: @ 81BEB58
giveitem ITEM_ZINC, 1, 1
finditem ITEM_ZINC
end
PokemonMansion_1F_EventScript_1BEB65:: @ 81BEB65
giveitem ITEM_PROTEIN, 1, 1
finditem ITEM_PROTEIN
end
PokemonMansion_2F_EventScript_1BEB72:: @ 81BEB72
giveitem ITEM_ZINC, 1, 1
finditem ITEM_ZINC
end
PokemonMansion_2F_EventScript_1BEB7F:: @ 81BEB7F
giveitem ITEM_HP_UP, 1, 1
finditem ITEM_HP_UP
end
ViridianCity_EventScript_1BEB8C:: @ 81BEB8C
giveitem ITEM_POTION, 1, 1
finditem ITEM_POTION
end
Route11_EventScript_1BEB99:: @ 81BEB99
giveitem ITEM_GREAT_BALL, 1, 1
finditem ITEM_GREAT_BALL
end
Route11_EventScript_1BEBA6:: @ 81BEBA6
giveitem ITEM_AWAKENING, 1, 1
finditem ITEM_AWAKENING
end
PokemonTower_5F_EventScript_1BEBB3:: @ 81BEBB3
giveitem ITEM_CLEANSE_TAG, 1, 1
finditem ITEM_CLEANSE_TAG
end
CeladonCity_EventScript_1BEBC0:: @ 81BEBC0
giveitem ITEM_ETHER, 1, 1
finditem ITEM_ETHER
end
RocketHideout_B3F_EventScript_1BEBCD:: @ 81BEBCD
giveitem ITEM_BLACK_GLASSES, 1, 1
finditem ITEM_BLACK_GLASSES
end
SafariZone_North_EventScript_1BEBDA:: @ 81BEBDA
giveitem ITEM_QUICK_CLAW, 1, 1
finditem ITEM_QUICK_CLAW
end
SeafoamIslands_1F_EventScript_1BEBE7:: @ 81BEBE7
giveitem ITEM_ICE_HEAL, 1, 1
finditem ITEM_ICE_HEAL
end
SeafoamIslands_B1F_EventScript_1BEBF4:: @ 81BEBF4
giveitem ITEM_WATER_STONE, 1, 1
finditem ITEM_WATER_STONE
end
SeafoamIslands_B1F_EventScript_1BEC01:: @ 81BEC01
giveitem ITEM_REVIVE, 1, 1
finditem ITEM_REVIVE
end
SeafoamIslands_B2F_EventScript_1BEC0E:: @ 81BEC0E
giveitem ITEM_BIG_PEARL, 1, 1
finditem ITEM_BIG_PEARL
end
SeafoamIslands_B4F_EventScript_1BEC1B:: @ 81BEC1B
giveitem ITEM_ULTRA_BALL, 1, 1
finditem ITEM_ULTRA_BALL
end
FourIsland_EventScript_1BEC28:: @ 81BEC28
giveitem ITEM_STAR_PIECE, 1, 1
finditem ITEM_STAR_PIECE
end
FourIsland_EventScript_1BEC35:: @ 81BEC35
giveitem ITEM_STARDUST, 1, 1
finditem ITEM_STARDUST
end
OneIsland_KindleRoad_EventScript_1BEC42:: @ 81BEC42
giveitem ITEM_ETHER, 1, 1
finditem ITEM_ETHER
end
OneIsland_KindleRoad_EventScript_1BEC4F:: @ 81BEC4F
giveitem ITEM_MAX_REPEL, 1, 1
finditem ITEM_MAX_REPEL
end
OneIsland_KindleRoad_EventScript_1BEC5C:: @ 81BEC5C
giveitem ITEM_CARBOS, 1, 1
finditem ITEM_CARBOS
end
FiveIsland_Meadow_EventScript_1BEC69:: @ 81BEC69
giveitem ITEM_MAX_POTION, 1, 1
finditem ITEM_MAX_POTION
end
FiveIsland_Meadow_EventScript_1BEC76:: @ 81BEC76
giveitem ITEM_PP_UP, 1, 1
finditem ITEM_PP_UP
end
FiveIsland_MemorialPillar_EventScript_1BEC83:: @ 81BEC83
giveitem ITEM_METAL_COAT, 1, 1
finditem ITEM_METAL_COAT
end
SixIsland_OutcastIsland_EventScript_1BEC90:: @ 81BEC90
giveitem ITEM_PP_UP, 1, 1
finditem ITEM_PP_UP
end
SixIsland_WaterPath_EventScript_1BEC9D:: @ 81BEC9D
giveitem ITEM_ELIXIR, 1, 1
finditem ITEM_ELIXIR
end
SixIsland_WaterPath_EventScript_1BECAA:: @ 81BECAA
giveitem ITEM_DRAGON_SCALE, 1, 1
finditem ITEM_DRAGON_SCALE
end
SixIsland_RuinValley_EventScript_1BECB7:: @ 81BECB7
giveitem ITEM_FULL_RESTORE, 1, 1
finditem ITEM_FULL_RESTORE
end
SixIsland_RuinValley_EventScript_1BECC4:: @ 81BECC4
giveitem ITEM_HP_UP, 1, 1
finditem ITEM_HP_UP
end
SixIsland_RuinValley_EventScript_1BECD1:: @ 81BECD1
giveitem ITEM_SUN_STONE, 1, 1
finditem ITEM_SUN_STONE
end
SevenIsland_SevaultCanyon_EventScript_1BECDE:: @ 81BECDE
giveitem ITEM_KINGS_ROCK, 1, 1
finditem ITEM_KINGS_ROCK
end
SevenIsland_SevaultCanyon_EventScript_1BECEB:: @ 81BECEB
giveitem ITEM_MAX_ELIXIR, 1, 1
finditem ITEM_MAX_ELIXIR
end
SevenIsland_SevaultCanyon_EventScript_1BECF8:: @ 81BECF8
giveitem ITEM_NUGGET, 1, 1
finditem ITEM_NUGGET
end
ThreeIsland_BerryForest_EventScript_1BED05:: @ 81BED05
giveitem ITEM_MAX_ETHER, 1, 1
finditem ITEM_MAX_ETHER
end
ThreeIsland_BerryForest_EventScript_1BED12:: @ 81BED12
giveitem ITEM_FULL_HEAL, 1, 1
finditem ITEM_FULL_HEAL
end
ThreeIsland_BerryForest_EventScript_1BED1F:: @ 81BED1F
giveitem ITEM_MAX_ELIXIR, 1, 1
finditem ITEM_MAX_ELIXIR
end
MtEmber_Exterior_EventScript_1BED2C:: @ 81BED2C
giveitem ITEM_ULTRA_BALL, 1, 1
finditem ITEM_ULTRA_BALL
end
MtEmber_Exterior_EventScript_1BED39:: @ 81BED39
giveitem ITEM_FIRE_STONE, 1, 1
finditem ITEM_FIRE_STONE
end
MtEmber_Exterior_EventScript_1BED46:: @ 81BED46
giveitem ITEM_DIRE_HIT, 1, 1
finditem ITEM_DIRE_HIT
end
FourIsland_IcefallCave_1F_EventScript_1BED53:: @ 81BED53
giveitem ITEM_ULTRA_BALL, 1, 1
finditem ITEM_ULTRA_BALL
end
FourIsland_IcefallCave_1F_EventScript_1BED60:: @ 81BED60
giveitem ITEM_HM07, 1, 1
finditem ITEM_HM07
end
FourIsland_IcefallCave_B1F_EventScript_1BED6D:: @ 81BED6D
giveitem ITEM_FULL_RESTORE, 1, 1
finditem ITEM_FULL_RESTORE
end
FourIsland_IcefallCave_B1F_EventScript_1BED7A:: @ 81BED7A
giveitem ITEM_NEVER_MELT_ICE, 1, 1
finditem ITEM_NEVER_MELT_ICE
end
FiveIsland_RocketWarehouse_EventScript_1BED87:: @ 81BED87
giveitem ITEM_BIG_PEARL, 1, 1
finditem ITEM_BIG_PEARL
end
FiveIsland_RocketWarehouse_EventScript_1BED94:: @ 81BED94
giveitem ITEM_TM36, 1, 1
finditem ITEM_TM36
end
FiveIsland_RocketWarehouse_EventScript_1BEDA1:: @ 81BEDA1
giveitem ITEM_PEARL, 1, 1
finditem ITEM_PEARL
end
FiveIsland_RocketWarehouse_EventScript_1BEDAE:: @ 81BEDAE
giveitem ITEM_UP_GRADE, 1, 1
finditem ITEM_UP_GRADE
end
FiveIsland_LostCave_Room10_EventScript_1BEDBB:: @ 81BEDBB
giveitem ITEM_SILK_SCARF, 1, 1
finditem ITEM_SILK_SCARF
end
FiveIsland_LostCave_Room11_EventScript_1BEDC8:: @ 81BEDC8
giveitem ITEM_LAX_INCENSE, 1, 1
finditem ITEM_LAX_INCENSE
end
FiveIsland_LostCave_Room12_EventScript_1BEDD5:: @ 81BEDD5
giveitem ITEM_SEA_INCENSE, 1, 1
finditem ITEM_SEA_INCENSE
end
FiveIsland_LostCave_Room13_EventScript_1BEDE2:: @ 81BEDE2
giveitem ITEM_MAX_REVIVE, 1, 1
finditem ITEM_MAX_REVIVE
end
FiveIsland_LostCave_Room14_EventScript_1BEDEF:: @ 81BEDEF
giveitem ITEM_RARE_CANDY, 1, 1
finditem ITEM_RARE_CANDY
end
SevenIsland_SevaultCanyon_House_EventScript_1BEDFC:: @ 81BEDFC
giveitem ITEM_LUCKY_PUNCH, 1, 1
finditem ITEM_LUCKY_PUNCH
end
SilphCo_4F_EventScript_1BEE09:: @ 81BEE09
giveitem ITEM_TM41, 1, 1
finditem ITEM_TM41
end
data/scripts/move_tutors.inc
+33 -33
View File
@@ -3,8 +3,8 @@ VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE
faceplayer
checkflag FLAG_TUTOR_DOUBLE_EDGE
goto_if TRUE, EventScript_1C480C
msgbox Text_1749F9, 5
compare VAR_RESULT, 0
msgbox Text_1749F9, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4802
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -33,8 +33,8 @@ EventScript_1C4816:: @ 81C4816
faceplayer
checkflag FLAG_TUTOR_THUNDER_WAVE
goto_if TRUE, EventScript_1C4874
msgbox Text_175711, 5
compare VAR_RESULT, 0
msgbox Text_175711, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C486A
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -63,8 +63,8 @@ RockTunnel_B1F_EventScript_1C487E:: @ 81C487E
faceplayer
checkflag FLAG_TUTOR_ROCK_SLIDE
goto_if TRUE, EventScript_1C48DC
msgbox Text_1799E0, 5
compare VAR_RESULT, 0
msgbox Text_1799E0, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C48D2
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -93,8 +93,8 @@ MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6
faceplayer
checkflag FLAG_TUTOR_EXPLOSION
goto_if TRUE, EventScript_1C4944
msgbox Text_17A642, 5
compare VAR_RESULT, 0
msgbox Text_17A642, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C493A
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -123,8 +123,8 @@ Route4_EventScript_1C494E:: @ 81C494E
faceplayer
checkflag FLAG_TUTOR_META_PUNCH
goto_if TRUE, EventScript_1C49AC
msgbox Text_1839D5, 5
compare VAR_RESULT, 0
msgbox Text_1839D5, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C49A2
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -153,8 +153,8 @@ Route4_EventScript_1C49B6:: @ 81C49B6
faceplayer
checkflag FLAG_TUTOR_MEGA_KICK
goto_if TRUE, EventScript_1C4A14
msgbox Text_183B74, 5
compare VAR_RESULT, 0
msgbox Text_183B74, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4A0A
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -183,8 +183,8 @@ EventScript_1C4A1E:: @ 81C4A1E
faceplayer
checkflag FLAG_TUTOR_DREAM_EATER
goto_if TRUE, EventScript_1C4A7C
msgbox Text_17E316, 5
compare VAR_RESULT, 0
msgbox Text_17E316, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4A72
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -213,8 +213,8 @@ EventScript_1C4A86:: @ 81C4A86
faceplayer
checkflag FLAG_TUTOR_SOFT_BOILED
goto_if TRUE, EventScript_1C4AE4
msgbox Text_180388, 5
compare VAR_RESULT, 0
msgbox Text_180388, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4ADA
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -243,8 +243,8 @@ FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE
faceplayer
checkflag FLAG_TUTOR_SUBSTITUTE
goto_if TRUE, EventScript_1C4B4C
msgbox Text_180948, 5
compare VAR_RESULT, 0
msgbox Text_180948, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4B42
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -273,8 +273,8 @@ SevenIsland_EventScript_1C4B56:: @ 81C4B56
faceplayer
checkflag FLAG_TUTOR_SWORDS_DANCE
goto_if TRUE, EventScript_1C4BB4
msgbox Text_182F01, 5
compare VAR_RESULT, 0
msgbox Text_182F01, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4BAA
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -303,8 +303,8 @@ PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE
faceplayer
checkflag FLAG_TUTOR_SEISMIC_TOSS
goto_if TRUE, EventScript_1C4C1C
msgbox Text_1909A3, 5
compare VAR_RESULT, 0
msgbox Text_1909A3, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4C12
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -333,8 +333,8 @@ EventScript_1C4C26:: @ 81C4C26
faceplayer
checkflag FLAG_TUTOR_COUNTER
goto_if TRUE, EventScript_1C4C84
msgbox Text_195928, 5
compare VAR_RESULT, 0
msgbox Text_195928, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4C7A
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -363,8 +363,8 @@ EventScript_1C4C8E:: @ 81C4C8E
faceplayer
checkflag FLAG_TUTOR_METRONOME
goto_if TRUE, EventScript_1C4CEC
msgbox Text_19A137, 5
compare VAR_RESULT, 0
msgbox Text_19A137, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4CE2
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -391,8 +391,8 @@ EventScript_1C4CEC:: @ 81C4CEC
EventScript_1C4CF6:: @ 81C4CF6
checkflag FLAG_TUTOR_MIMIC
goto_if TRUE, EventScript_1C4D59
msgbox Text_19AD85, 5
compare VAR_RESULT, 0
msgbox Text_19AD85, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4D4F
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -436,8 +436,8 @@ FourIsland_House1_EventScript_1C4D84:: @ 81C4D84
faceplayer
checkflag FLAG_TUTOR_BODY_SLAM
goto_if TRUE, EventScript_1C4DE2
msgbox Text_1A3505, 5
compare VAR_RESULT, 0
msgbox Text_1A3505, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4DD8
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -486,8 +486,8 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC
call_if eq, EventScript_1C4F06
compare VAR_FACING, 3
call_if eq, EventScript_1C4F11
msgbox Text_1A4751, 5
compare VAR_RESULT, 0
msgbox Text_1A4751, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if eq, EventScript_1C4F1C
call EventScript_1C4F37
compare VAR_RESULT, 0
@@ -576,7 +576,7 @@ EventScript_1C4F37:: @ 81C4F37
textcolor 3
special sub_80699BC
signmsg
msgbox Text_1A644F, 5
msgbox Text_1A644F, MSGBOX_YESNO
normalmsg
call EventScript_1A6675
return
data/scripts/repel.inc
+1 -1
View File
@@ -1,5 +1,5 @@
EventScript_RepelWoreOff:: @ 81BFB65
msgbox Text_1BFB6E, 3
msgbox Text_1BFB6E, MSGBOX_SIGN
end
Text_1BFB6E:: @ 81BFB6E
data/scripts/trainer_battle.inc
+1 -1
View File
@@ -150,7 +150,7 @@ EventScript_1A501A:: @ 81A501A
releaseall
end
gStdScript_Message_WaitButton_AndRelease:: @ 81A501F
Std_MsgboxAutoclose:: @ 81A501F
message 0x0
waitmessage
waitbuttonpress
data/scripts/trainers.inc
+468 -468
View File
File diff suppressed because it is too large Load Diff
data/text/trainers.inc
+1006
View File
File diff suppressed because it is too large Load Diff
include/constants/cable_club.h
+15
View File
@@ -0,0 +1,15 @@
#ifndef GUARD_CONSTANTS_CABLE_CLUB_H
#define GUARD_CONSTANTS_CABLE_CLUB_H
// States for VAR_CABLE_CLUB_STATE
#define USING_SINGLE_BATTLE 1
#define USING_DOUBLE_BATTLE 2
#define USING_TRADE_CENTER 3
#define USING_RECORD_CORNER 4
#define USING_MULTI_BATTLE 5
#define USING_UNION_ROOM 6
#define USING_BERRY_CRUSH 7
#define USING_MINIGAME 8
#define USING_BATTLE_TOWER 9
#endif //GUARD_CONSTANTS_CABLE_CLUB_H
include/constants/vars.h
+1 -1
View File
@@ -155,7 +155,7 @@
#define VAR_MAP_SCENE_PEWTER_CITY 0x406C
#define VAR_0x406D 0x406D
#define VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 0x406E
#define VAR_0x406F 0x406F
#define VAR_CABLE_CLUB_STATE 0x406F
#define VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY 0x4070
#define VAR_MAP_SCENE_CINNABAR_ISLAND 0x4071
#define VAR_0x4072 0x4072