mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Resolve #723: treat std scripts like specials and predefs
This commit is contained in:
parent
32e7e368f4
commit
518cee440e
@ -46,7 +46,6 @@ INCLUDE "constants/sfx_constants.asm"
|
||||
INCLUDE "constants/sprite_anim_constants.asm"
|
||||
INCLUDE "constants/sprite_constants.asm"
|
||||
INCLUDE "constants/sprite_data_constants.asm"
|
||||
INCLUDE "constants/std_constants.asm"
|
||||
INCLUDE "constants/tileset_constants.asm"
|
||||
INCLUDE "constants/trainer_constants.asm"
|
||||
INCLUDE "constants/trainer_data_constants.asm"
|
||||
|
@ -1,55 +0,0 @@
|
||||
; StdScripts indexes (see engine/events/std_scripts.asm)
|
||||
; also used in TileCollisionStdScripts (see data/events/collision_stdscripts.asm)
|
||||
enum_start
|
||||
enum pokecenternurse
|
||||
enum difficultbookshelf
|
||||
enum picturebookshelf
|
||||
enum magazinebookshelf
|
||||
enum teamrocketoath
|
||||
enum incenseburner
|
||||
enum merchandiseshelf
|
||||
enum townmap
|
||||
enum window
|
||||
enum tv
|
||||
enum homepage
|
||||
enum radio1
|
||||
enum radio2
|
||||
enum trashcan
|
||||
enum strengthboulder
|
||||
enum smashrock
|
||||
enum pokecentersign
|
||||
enum martsign
|
||||
enum goldenrodrockets
|
||||
enum radiotowerrockets
|
||||
enum elevatorbutton
|
||||
enum daytotext
|
||||
enum bugcontestresultswarp
|
||||
enum bugcontestresults
|
||||
enum initializeevents
|
||||
enum asknumber1m
|
||||
enum asknumber2m
|
||||
enum registerednumberm
|
||||
enum numberacceptedm
|
||||
enum numberdeclinedm
|
||||
enum phonefullm
|
||||
enum rematchm
|
||||
enum giftm
|
||||
enum packfullm
|
||||
enum rematchgiftm
|
||||
enum asknumber1f
|
||||
enum asknumber2f
|
||||
enum registerednumberf
|
||||
enum numberacceptedf
|
||||
enum numberdeclinedf
|
||||
enum phonefullf
|
||||
enum rematchf
|
||||
enum giftf
|
||||
enum packfullf
|
||||
enum rematchgiftf
|
||||
enum gymstatue1
|
||||
enum gymstatue2
|
||||
enum receiveitem
|
||||
enum receivetogepiegg
|
||||
enum pcscript
|
||||
enum gamecornercoinvendor
|
||||
enum happinesschecknpc
|
@ -1,13 +1,18 @@
|
||||
; stdscripts associated with tile collisions
|
||||
; std scripts associated with tile collisions
|
||||
|
||||
stdcoll: MACRO
|
||||
db \1
|
||||
dw (\2StdScript - StdScripts) / 3
|
||||
ENDM
|
||||
|
||||
TileCollisionStdScripts:
|
||||
; collision type, stdscript
|
||||
dbw COLL_BOOKSHELF, magazinebookshelf
|
||||
dbw COLL_PC, pcscript
|
||||
dbw COLL_RADIO, radio1
|
||||
dbw COLL_TOWN_MAP, townmap
|
||||
dbw COLL_MART_SHELF, merchandiseshelf
|
||||
dbw COLL_TV, tv
|
||||
dbw COLL_WINDOW, window
|
||||
dbw COLL_INCENSE_BURNER, incenseburner
|
||||
; collision type, std script
|
||||
stdcoll COLL_BOOKSHELF, MagazineBookshelfScript
|
||||
stdcoll COLL_PC, PCScript
|
||||
stdcoll COLL_RADIO, Radio1Script
|
||||
stdcoll COLL_TOWN_MAP, TownMapScript
|
||||
stdcoll COLL_MART_SHELF, MerchandiseShelfScript
|
||||
stdcoll COLL_TV, TVScript
|
||||
stdcoll COLL_WINDOW, WindowScript
|
||||
stdcoll COLL_INCENSE_BURNER, IncenseBurnerScript
|
||||
db -1 ; end
|
||||
|
@ -30,7 +30,7 @@ BugCatchingContestOutOfBallsScript:
|
||||
|
||||
BugCatchingContestReturnToGateScript:
|
||||
closetext
|
||||
jumpstd bugcontestresultswarp
|
||||
jumpstd BugContestResultsWarpScript
|
||||
|
||||
BugCatchingContestTimeUpText:
|
||||
text_far _BugCatchingContestTimeUpText
|
||||
|
@ -1,57 +1,61 @@
|
||||
add_stdscript: MACRO
|
||||
\1StdScript::
|
||||
dba \1
|
||||
ENDM
|
||||
|
||||
StdScripts::
|
||||
; entries correspond to constants/std_constants.asm
|
||||
dba PokecenterNurseScript
|
||||
dba DifficultBookshelfScript
|
||||
dba PictureBookshelfScript
|
||||
dba MagazineBookshelfScript
|
||||
dba TeamRocketOathScript
|
||||
dba IncenseBurnerScript
|
||||
dba MerchandiseShelfScript
|
||||
dba TownMapScript
|
||||
dba WindowScript
|
||||
dba TVScript
|
||||
dba HomepageScript
|
||||
dba Radio1Script
|
||||
dba Radio2Script
|
||||
dba TrashCanScript
|
||||
dba StrengthBoulderScript
|
||||
dba SmashRockScript
|
||||
dba PokecenterSignScript
|
||||
dba MartSignScript
|
||||
dba GoldenrodRocketsScript
|
||||
dba RadioTowerRocketsScript
|
||||
dba ElevatorButtonScript
|
||||
dba DayToTextScript
|
||||
dba BugContestResultsWarpScript
|
||||
dba BugContestResultsScript
|
||||
dba InitializeEventsScript
|
||||
dba AskNumber1MScript
|
||||
dba AskNumber2MScript
|
||||
dba RegisteredNumberMScript
|
||||
dba NumberAcceptedMScript
|
||||
dba NumberDeclinedMScript
|
||||
dba PhoneFullMScript
|
||||
dba RematchMScript
|
||||
dba GiftMScript
|
||||
dba PackFullMScript
|
||||
dba RematchGiftMScript
|
||||
dba AskNumber1FScript
|
||||
dba AskNumber2FScript
|
||||
dba RegisteredNumberFScript
|
||||
dba NumberAcceptedFScript
|
||||
dba NumberDeclinedFScript
|
||||
dba PhoneFullFScript
|
||||
dba RematchFScript
|
||||
dba GiftFScript
|
||||
dba PackFullFScript
|
||||
dba RematchGiftFScript
|
||||
dba GymStatue1Script
|
||||
dba GymStatue2Script
|
||||
dba ReceiveItemScript
|
||||
dba ReceiveTogepiEggScript
|
||||
dba PCScript
|
||||
dba GameCornerCoinVendorScript
|
||||
dba HappinessCheckScript
|
||||
add_stdscript PokecenterNurseScript
|
||||
add_stdscript DifficultBookshelfScript
|
||||
add_stdscript PictureBookshelfScript
|
||||
add_stdscript MagazineBookshelfScript
|
||||
add_stdscript TeamRocketOathScript
|
||||
add_stdscript IncenseBurnerScript
|
||||
add_stdscript MerchandiseShelfScript
|
||||
add_stdscript TownMapScript
|
||||
add_stdscript WindowScript
|
||||
add_stdscript TVScript
|
||||
add_stdscript HomepageScript
|
||||
add_stdscript Radio1Script
|
||||
add_stdscript Radio2Script
|
||||
add_stdscript TrashCanScript
|
||||
add_stdscript StrengthBoulderScript
|
||||
add_stdscript SmashRockScript
|
||||
add_stdscript PokecenterSignScript
|
||||
add_stdscript MartSignScript
|
||||
add_stdscript GoldenrodRocketsScript
|
||||
add_stdscript RadioTowerRocketsScript
|
||||
add_stdscript ElevatorButtonScript
|
||||
add_stdscript DayToTextScript
|
||||
add_stdscript BugContestResultsWarpScript
|
||||
add_stdscript BugContestResultsScript
|
||||
add_stdscript InitializeEventsScript
|
||||
add_stdscript AskNumber1MScript
|
||||
add_stdscript AskNumber2MScript
|
||||
add_stdscript RegisteredNumberMScript
|
||||
add_stdscript NumberAcceptedMScript
|
||||
add_stdscript NumberDeclinedMScript
|
||||
add_stdscript PhoneFullMScript
|
||||
add_stdscript RematchMScript
|
||||
add_stdscript GiftMScript
|
||||
add_stdscript PackFullMScript
|
||||
add_stdscript RematchGiftMScript
|
||||
add_stdscript AskNumber1FScript
|
||||
add_stdscript AskNumber2FScript
|
||||
add_stdscript RegisteredNumberFScript
|
||||
add_stdscript NumberAcceptedFScript
|
||||
add_stdscript NumberDeclinedFScript
|
||||
add_stdscript PhoneFullFScript
|
||||
add_stdscript RematchFScript
|
||||
add_stdscript GiftFScript
|
||||
add_stdscript PackFullFScript
|
||||
add_stdscript RematchGiftFScript
|
||||
add_stdscript GymStatue1Script
|
||||
add_stdscript GymStatue2Script
|
||||
add_stdscript ReceiveItemScript
|
||||
add_stdscript ReceiveTogepiEggScript
|
||||
add_stdscript PCScript
|
||||
add_stdscript GameCornerCoinVendorScript
|
||||
add_stdscript HappinessCheckScript
|
||||
|
||||
PokecenterNurseScript:
|
||||
; EVENT_WELCOMED_TO_POKECOM_CENTER is never set
|
||||
|
@ -22,7 +22,7 @@ Script_Whiteout:
|
||||
endall
|
||||
|
||||
.bug_contest
|
||||
jumpstd bugcontestresultswarp
|
||||
jumpstd BugContestResultsWarpScript
|
||||
|
||||
.WhitedOutText:
|
||||
text_far _WhitedOutText
|
||||
|
@ -327,3 +327,57 @@ text_jump EQUS "text_far"
|
||||
anim_enemyfeetobj EQUS "anim_battlergfx_2row"
|
||||
anim_playerheadobj EQUS "anim_battlergfx_1row"
|
||||
anim_clearsprites EQUS "anim_keepsprites"
|
||||
|
||||
; engine/events/std_scripts.asm
|
||||
pokecenternurse EQUS "PokecenterNurseScript"
|
||||
difficultbookshelf EQUS "DifficultBookshelfScript"
|
||||
picturebookshelf EQUS "PictureBookshelfScript"
|
||||
magazinebookshelf EQUS "MagazineBookshelfScript"
|
||||
teamrocketoath EQUS "TeamRocketOathScript"
|
||||
incenseburner EQUS "IncenseBurnerScript"
|
||||
merchandiseshelf EQUS "MerchandiseShelfScript"
|
||||
townmap EQUS "TownMapScript"
|
||||
window EQUS "WindowScript"
|
||||
tv EQUS "TVScript"
|
||||
homepage EQUS "HomepageScript"
|
||||
radio1 EQUS "Radio1Script"
|
||||
radio2 EQUS "Radio2Script"
|
||||
trashcan EQUS "TrashCanScript"
|
||||
strengthboulder EQUS "StrengthBoulderScript"
|
||||
smashrock EQUS "SmashRockScript"
|
||||
pokecentersign EQUS "PokecenterSignScript"
|
||||
martsign EQUS "MartSignScript"
|
||||
goldenrodrockets EQUS "GoldenrodRocketsScript"
|
||||
radiotowerrockets EQUS "RadioTowerRocketsScript"
|
||||
elevatorbutton EQUS "ElevatorButtonScript"
|
||||
daytotext EQUS "DayToTextScript"
|
||||
bugcontestresultswarp EQUS "BugContestResultsWarpScript"
|
||||
bugcontestresults EQUS "BugContestResultsScript"
|
||||
initializeevents EQUS "InitializeEventsScript"
|
||||
asknumber1m EQUS "AskNumber1MScript"
|
||||
asknumber2m EQUS "AskNumber2MScript"
|
||||
registerednumberm EQUS "RegisteredNumberMScript"
|
||||
numberacceptedm EQUS "NumberAcceptedMScript"
|
||||
numberdeclinedm EQUS "NumberDeclinedMScript"
|
||||
phonefullm EQUS "PhoneFullMScript"
|
||||
rematchm EQUS "RematchMScript"
|
||||
giftm EQUS "GiftMScript"
|
||||
packfullm EQUS "PackFullMScript"
|
||||
rematchgiftm EQUS "RematchGiftMScript"
|
||||
asknumber1f EQUS "AskNumber1FScript"
|
||||
asknumber2f EQUS "AskNumber2FScript"
|
||||
registerednumberf EQUS "RegisteredNumberFScript"
|
||||
numberacceptedf EQUS "NumberAcceptedFScript"
|
||||
numberdeclinedf EQUS "NumberDeclinedFScript"
|
||||
phonefullf EQUS "PhoneFullFScript"
|
||||
rematchf EQUS "RematchFScript"
|
||||
giftf EQUS "GiftFScript"
|
||||
packfullf EQUS "PackFullFScript"
|
||||
rematchgiftf EQUS "RematchGiftFScript"
|
||||
gymstatue1 EQUS "GymStatue1Script"
|
||||
gymstatue2 EQUS "GymStatue2Script"
|
||||
receiveitem EQUS "ReceiveItemScript"
|
||||
receivetogepiegg EQUS "ReceiveTogepiEggScript"
|
||||
pcscript EQUS "PCScript"
|
||||
gamecornercoinvendor EQUS "GameCornerCoinVendorScript"
|
||||
happinesschecknpc EQUS "HappinessCheckScript"
|
||||
|
@ -80,13 +80,13 @@ ENDM
|
||||
enum jumpstd_command ; $0c
|
||||
jumpstd: MACRO
|
||||
db jumpstd_command
|
||||
dw \1 ; predefined_script
|
||||
dw (\1StdScript - StdScripts) / 3
|
||||
ENDM
|
||||
|
||||
enum callstd_command ; $0d
|
||||
callstd: MACRO
|
||||
db callstd_command
|
||||
dw \1 ; predefined_script
|
||||
dw (\1StdScript - StdScripts) / 3
|
||||
ENDM
|
||||
|
||||
enum callasm_command ; $0e
|
||||
|
@ -62,10 +62,10 @@ AzaleaGymActivateRockets:
|
||||
end
|
||||
|
||||
.GoldenrodRockets:
|
||||
jumpstd goldenrodrockets
|
||||
jumpstd GoldenrodRocketsScript
|
||||
|
||||
.RadioTowerRockets:
|
||||
jumpstd radiotowerrockets
|
||||
jumpstd RadioTowerRocketsScript
|
||||
|
||||
TrainerTwinsAmyandmay1:
|
||||
trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript
|
||||
@ -142,10 +142,10 @@ AzaleaGymGuyScript:
|
||||
AzaleaGymStatue:
|
||||
checkflag ENGINE_HIVEBADGE
|
||||
iftrue .Beaten
|
||||
jumpstd gymstatue1
|
||||
jumpstd GymStatue1Script
|
||||
.Beaten:
|
||||
gettrainername STRING_BUFFER_4, BUGSY, BUGSY1
|
||||
jumpstd gymstatue2
|
||||
jumpstd GymStatue2Script
|
||||
|
||||
BugsyText_INeverLose:
|
||||
text "I'm BUGSY!"
|
||||
|
@ -14,7 +14,7 @@ AzaleaPokecenter1F_MapScripts:
|
||||
end
|
||||
|
||||
AzaleaPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
AzaleaPokecenter1FGentlemanScript:
|
||||
jumptextfaceplayer AzaleaPokecenter1FGentlemanText
|
||||
|
@ -200,10 +200,10 @@ AzaleaTownIlextForestSign:
|
||||
jumptext AzaleaTownIlexForestSignText
|
||||
|
||||
AzaleaTownPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
AzaleaTownMartSign:
|
||||
jumpstd martsign
|
||||
jumpstd MartSignScript
|
||||
|
||||
WhiteApricornTree:
|
||||
fruittree FRUITTREE_AZALEA_TOWN
|
||||
|
@ -98,13 +98,13 @@ BillsSisterScript:
|
||||
sjump .Refused
|
||||
|
||||
BillsHouseBookshelf1:
|
||||
jumpstd picturebookshelf
|
||||
jumpstd PictureBookshelfScript
|
||||
|
||||
BillsHouseBookshelf2:
|
||||
jumpstd magazinebookshelf
|
||||
jumpstd MagazineBookshelfScript
|
||||
|
||||
BillsHouseRadio:
|
||||
jumpstd radio2
|
||||
jumpstd Radio2Script
|
||||
|
||||
BillTakeThisEeveeText:
|
||||
text "BILL: Hi, <PLAYER>!"
|
||||
|
@ -137,10 +137,10 @@ BlackthornCityTrainerTips:
|
||||
jumptext BlackthornCityTrainerTipsText
|
||||
|
||||
BlackthornCityPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
BlackthornCityMartSign:
|
||||
jumpstd martsign
|
||||
jumpstd MartSignScript
|
||||
|
||||
Text_ClairIsOut:
|
||||
text "I am sorry."
|
||||
|
@ -20,11 +20,11 @@ BlackthornDragonSpeechHouseDratiniScript:
|
||||
|
||||
; unused
|
||||
BlackthornDragonSpeechHousePictureBookshelf:
|
||||
jumpstd picturebookshelf
|
||||
jumpstd PictureBookshelfScript
|
||||
|
||||
; unused
|
||||
BlackthornDragonSpeechHouseMagazineBookshelf:
|
||||
jumpstd magazinebookshelf
|
||||
jumpstd MagazineBookshelfScript
|
||||
|
||||
BlackthornDragonSpeechHouseGrannyText:
|
||||
text "A clan of trainers"
|
||||
|
@ -15,7 +15,7 @@ Emy:
|
||||
end
|
||||
|
||||
EmysHouseBookshelf:
|
||||
jumpstd magazinebookshelf
|
||||
jumpstd MagazineBookshelfScript
|
||||
|
||||
BlackthornEmysHouse_MapEvents:
|
||||
db 0, 0 ; filler
|
||||
|
@ -142,10 +142,10 @@ BlackthornGymGuyScript:
|
||||
BlackthornGymStatue:
|
||||
checkflag ENGINE_RISINGBADGE
|
||||
iftrue .Beaten
|
||||
jumpstd gymstatue1
|
||||
jumpstd GymStatue1Script
|
||||
.Beaten:
|
||||
gettrainername STRING_BUFFER_4, CLAIR, CLAIR1
|
||||
jumpstd gymstatue2
|
||||
jumpstd GymStatue2Script
|
||||
|
||||
ClairIntroText:
|
||||
text "I am CLAIR."
|
||||
|
@ -54,7 +54,7 @@ BlackthornGym2F_MapScripts:
|
||||
end
|
||||
|
||||
BlackthornGymBoulder:
|
||||
jumpstd strengthboulder
|
||||
jumpstd StrengthBoulderScript
|
||||
|
||||
TrainerCooltrainermCody:
|
||||
trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script
|
||||
|
@ -10,7 +10,7 @@ BlackthornPokecenter1F_MapScripts:
|
||||
db 0 ; callbacks
|
||||
|
||||
BlackthornPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
BlackthornPokecenter1FGentlemanScript:
|
||||
jumptextfaceplayer BlackthornPokecenter1FGentlemanText
|
||||
@ -19,7 +19,7 @@ BlackthornPokecenter1FTwinScript:
|
||||
jumptextfaceplayer BlackthornPokecenter1FTwinText
|
||||
|
||||
BlackthornPokecenter1FCooltrainerMScript:
|
||||
jumpstd happinesschecknpc
|
||||
jumpstd HappinessCheckScript
|
||||
|
||||
BlackthornPokecenter1FGentlemanText:
|
||||
text "Deep inside far-"
|
||||
|
@ -126,7 +126,7 @@ BurnedTower1FMortyScript:
|
||||
jumptextfaceplayer BurnedTower1FMortyText
|
||||
|
||||
BurnedTower1FRock:
|
||||
jumpstd smashrock
|
||||
jumpstd SmashRockScript
|
||||
|
||||
BurnedTower1FHiddenEther:
|
||||
hiddenitem ETHER, EVENT_BURNED_TOWER_1F_HIDDEN_ETHER
|
||||
|
@ -120,7 +120,7 @@ BurnedTowerB1FTMEndure:
|
||||
itemball TM_ENDURE
|
||||
|
||||
BurnedTowerB1FBoulder:
|
||||
jumpstd strengthboulder
|
||||
jumpstd StrengthBoulderScript
|
||||
|
||||
BurnedTowerRaikouMovement:
|
||||
set_sliding
|
||||
|
@ -114,7 +114,7 @@ CeladonCafeTrashcan:
|
||||
end
|
||||
|
||||
.TrashEmpty:
|
||||
jumpstd trashcan
|
||||
jumpstd TrashCanScript
|
||||
|
||||
ChefText_Eatathon:
|
||||
text "Hi!"
|
||||
|
@ -70,7 +70,7 @@ CeladonCityTrainerTips:
|
||||
jumptext CeladonCityTrainerTipsText
|
||||
|
||||
CeladonCityPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
CeladonCityHiddenPpUp:
|
||||
hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP
|
||||
|
@ -21,7 +21,7 @@ CeladonDeptStore1FDirectory:
|
||||
jumptext CeladonDeptStore1FDirectoryText
|
||||
|
||||
CeladonDeptStore1FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
CeladonDeptStore1FReceptionistText:
|
||||
text "Hello! Welcome to"
|
||||
|
@ -33,7 +33,7 @@ CeladonDeptStore2FDirectory:
|
||||
jumptext CeladonDeptStore2FDirectoryText
|
||||
|
||||
CeladonDeptStore2FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
CeladonDeptStore2FPokefanMText:
|
||||
text "I just recently"
|
||||
|
@ -42,7 +42,7 @@ CeladonDeptStore3FSuperNerdScript:
|
||||
jumptextfaceplayer CeladonDeptStore3FSuperNerdText
|
||||
|
||||
CeladonDeptStore3FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
CeladonDeptStore3FDirectory:
|
||||
jumptext CeladonDeptStore3FDirectoryText
|
||||
|
@ -25,7 +25,7 @@ CeladonDeptStore4FDirectory:
|
||||
jumptext CeladonDeptStore4FDirectoryText
|
||||
|
||||
CeladonDeptStore4FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
CeladonDeptStore4FSuperNerdText:
|
||||
text "I'm here to buy"
|
||||
|
@ -37,7 +37,7 @@ CeladonDeptStore5FDirectory:
|
||||
jumptext CeladonDeptStore5FDirectoryText
|
||||
|
||||
CeladonDeptStore5FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
CeladonDeptStore5FGentlemanText:
|
||||
text "I want to buy some"
|
||||
|
@ -100,7 +100,7 @@ CeladonDeptStore6FDirectory:
|
||||
|
||||
; unused
|
||||
CeladonDeptStore6FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
CeladonVendingText:
|
||||
text "A vending machine!"
|
||||
|
@ -15,7 +15,7 @@ CeladonGameCorner_MapScripts:
|
||||
db 0 ; callbacks
|
||||
|
||||
CeladonGameCornerClerkScript:
|
||||
jumpstd gamecornercoinvendor
|
||||
jumpstd GameCornerCoinVendorScript
|
||||
|
||||
CeladonGameCornerReceptionistScript:
|
||||
jumptextfaceplayer CeladonGameCornerReceptionistText
|
||||
@ -70,7 +70,7 @@ CeladonGameCornerFisherScript:
|
||||
end
|
||||
|
||||
.GiveCoins:
|
||||
jumpstd receiveitem
|
||||
jumpstd ReceiveItemScript
|
||||
end
|
||||
|
||||
.coinname
|
||||
|
@ -105,10 +105,10 @@ TrainerTwinsJoAndZoe2:
|
||||
CeladonGymStatue:
|
||||
checkflag ENGINE_RAINBOWBADGE
|
||||
iftrue .Beaten
|
||||
jumpstd gymstatue1
|
||||
jumpstd GymStatue1Script
|
||||
.Beaten:
|
||||
gettrainername STRING_BUFFER_4, ERIKA, ERIKA1
|
||||
jumpstd gymstatue2
|
||||
jumpstd GymStatue2Script
|
||||
|
||||
ErikaBeforeBattleText:
|
||||
text "ERIKA: Hello…"
|
||||
|
@ -40,7 +40,7 @@ CeladonMansionManagersSuiteSign:
|
||||
jumptext CeladonMansionManagersSuiteSignText
|
||||
|
||||
CeladonMansion1FBookshelf:
|
||||
jumpstd picturebookshelf
|
||||
jumpstd PictureBookshelfScript
|
||||
|
||||
CeladonMansionManagerText:
|
||||
text "My dear #MON"
|
||||
|
@ -10,7 +10,7 @@ CeladonMansion2FMeetingRoomSign:
|
||||
jumptext CeladonMansion2FMeetingRoomSignText
|
||||
|
||||
CeladonMansion2FBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
CeladonMansion2FComputerText:
|
||||
text "<PLAYER> turned on"
|
||||
|
@ -11,10 +11,10 @@ CeladonPokecenter1F_MapScripts:
|
||||
db 0 ; callbacks
|
||||
|
||||
CeladonPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
CeladonPokecenter1FGentlemanScript:
|
||||
jumpstd happinesschecknpc
|
||||
jumpstd HappinessCheckScript
|
||||
|
||||
CeladonPokecenter1FCooltrainerFScript:
|
||||
jumptextfaceplayer CeladonPokecenter1FCooltrainerFText
|
||||
|
@ -139,10 +139,10 @@ CeruleanLockedDoor:
|
||||
jumptext CeruleanLockedDoorText
|
||||
|
||||
CeruleanCityPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
CeruleanCityMartSign:
|
||||
jumpstd martsign
|
||||
jumpstd MartSignScript
|
||||
|
||||
CeruleanCityHiddenBerserkGene:
|
||||
hiddenitem BERSERK_GENE, EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY
|
||||
|
@ -156,10 +156,10 @@ CeruleanGymStatue2:
|
||||
CeruleanGymStatue:
|
||||
checkflag ENGINE_CASCADEBADGE
|
||||
iftrue .Beaten
|
||||
jumpstd gymstatue1
|
||||
jumpstd GymStatue1Script
|
||||
.Beaten:
|
||||
gettrainername STRING_BUFFER_4, MISTY, MISTY1
|
||||
jumpstd gymstatue2
|
||||
jumpstd GymStatue2Script
|
||||
|
||||
CeruleanGymGruntRunsDownMovement:
|
||||
big_step DOWN
|
||||
|
@ -9,7 +9,7 @@ CeruleanPokecenter1F_MapScripts:
|
||||
db 0 ; callbacks
|
||||
|
||||
CeruleanPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
CeruleanPokecenter1FSuperNerdScript:
|
||||
special Mobile_DummyReturnFalse
|
||||
|
@ -70,10 +70,10 @@ CharcoalKilnFarfetchd:
|
||||
end
|
||||
|
||||
CharcoalKilnBookshelf:
|
||||
jumpstd magazinebookshelf
|
||||
jumpstd MagazineBookshelfScript
|
||||
|
||||
CharcoalKilnRadio:
|
||||
jumpstd radio2
|
||||
jumpstd Radio2Script
|
||||
|
||||
CharcoalKilnBossText1:
|
||||
text "All the SLOWPOKE"
|
||||
|
@ -86,7 +86,7 @@ CherrygroveCityGuideGent:
|
||||
end
|
||||
|
||||
.JumpstdReceiveItem:
|
||||
jumpstd receiveitem
|
||||
jumpstd ReceiveItemScript
|
||||
end
|
||||
|
||||
.mapcardname
|
||||
@ -230,10 +230,10 @@ GuideGentsHouseSign:
|
||||
jumptext GuideGentsHouseSignText
|
||||
|
||||
CherrygroveCityPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
CherrygroveCityMartSign:
|
||||
jumpstd martsign
|
||||
jumpstd MartSignScript
|
||||
|
||||
GuideGentMovement1:
|
||||
step LEFT
|
||||
|
@ -22,7 +22,7 @@ CherrygroveEvolutionSpeechHouseLassScript:
|
||||
end
|
||||
|
||||
CherrygroveEvolutionSpeechHouseBookshelf:
|
||||
jumpstd magazinebookshelf
|
||||
jumpstd MagazineBookshelfScript
|
||||
|
||||
CherrygroveEvolutionSpeechHouseYoungsterText:
|
||||
text "#MON gain expe-"
|
||||
|
@ -14,7 +14,7 @@ CherrygroveGymSpeechHouseBugCatcherScript:
|
||||
jumptextfaceplayer CherrygroveGymSpeechHouseBugCatcherText
|
||||
|
||||
CherrygroveGymSpeechHouseBookshelf:
|
||||
jumpstd picturebookshelf
|
||||
jumpstd PictureBookshelfScript
|
||||
|
||||
CherrygroveGymSpeechHousePokefanMText:
|
||||
text "You're trying to"
|
||||
|
@ -10,7 +10,7 @@ CherrygrovePokecenter1F_MapScripts:
|
||||
db 0 ; callbacks
|
||||
|
||||
CherrygrovePokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
CherrygrovePokecenter1FFisherScript:
|
||||
jumptextfaceplayer CherrygrovePokecenter1FFisherText
|
||||
|
@ -138,10 +138,10 @@ CianwoodPokeSeerSign:
|
||||
jumptext CianwoodPokeSeerSignText
|
||||
|
||||
CianwoodPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
CianwoodCityRock:
|
||||
jumpstd smashrock
|
||||
jumpstd SmashRockScript
|
||||
|
||||
CianwoodCityHiddenRevive:
|
||||
hiddenitem REVIVE, EVENT_CIANWOOD_CITY_HIDDEN_REVIVE
|
||||
|
@ -79,10 +79,10 @@ CianwoodGymActivateRockets:
|
||||
end
|
||||
|
||||
.GoldenrodRockets:
|
||||
jumpstd goldenrodrockets
|
||||
jumpstd GoldenrodRocketsScript
|
||||
|
||||
.RadioTowerRockets:
|
||||
jumpstd radiotowerrockets
|
||||
jumpstd RadioTowerRocketsScript
|
||||
|
||||
TrainerBlackbeltYoshi:
|
||||
trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script
|
||||
@ -129,15 +129,15 @@ TrainerBlackbeltLung:
|
||||
end
|
||||
|
||||
CianwoodGymBoulder:
|
||||
jumpstd strengthboulder
|
||||
jumpstd StrengthBoulderScript
|
||||
|
||||
CianwoodGymStatue:
|
||||
checkflag ENGINE_STORMBADGE
|
||||
iftrue .Beaten
|
||||
jumpstd gymstatue1
|
||||
jumpstd GymStatue1Script
|
||||
.Beaten:
|
||||
gettrainername STRING_BUFFER_4, CHUCK, CHUCK1
|
||||
jumpstd gymstatue2
|
||||
jumpstd GymStatue2Script
|
||||
|
||||
CianwoodGymMovement_ChuckChucksBoulder:
|
||||
set_sliding
|
||||
|
@ -18,7 +18,7 @@ CianwoodLugiaSpeechHouseTwinScript:
|
||||
jumptextfaceplayer CianwoodLugiaSpeechHouseTwinText
|
||||
|
||||
CianwoodLugiaSpeechHouseBookshelf:
|
||||
jumpstd picturebookshelf
|
||||
jumpstd PictureBookshelfScript
|
||||
|
||||
CianwoodLugiaSpeechHouseTeacherText:
|
||||
text "You came from"
|
||||
|
@ -36,7 +36,7 @@ CianwoodPharmacist:
|
||||
end
|
||||
|
||||
CianwoodPharmacyBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
PharmacistGiveSecretpotionText:
|
||||
text "Your #MON ap-"
|
||||
|
@ -10,7 +10,7 @@ CianwoodPokecenter1F_MapScripts:
|
||||
db 0 ; callbacks
|
||||
|
||||
CianwoodPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
CianwoodPokecenter1FLassScript:
|
||||
jumptextfaceplayer CianwoodPokecenter1FLassText
|
||||
|
@ -30,7 +30,7 @@ CinnabarIslandSign:
|
||||
jumptext CinnabarIslandSignText
|
||||
|
||||
CinnabarIslandPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
CinnabarIslandHiddenRareCandy:
|
||||
hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY
|
||||
|
@ -9,7 +9,7 @@ CinnabarPokecenter1F_MapScripts:
|
||||
db 0 ; callbacks
|
||||
|
||||
CinnabarPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
CinnabarPokecenter1FCooltrainerFScript:
|
||||
jumptextfaceplayer CinnabarPokecenter1FCooltrainerFText
|
||||
|
@ -184,7 +184,7 @@ CopycatsHouse2FDoll:
|
||||
jumptext CopycatsHouse2FDollText
|
||||
|
||||
CopycatsHouse2FBookshelf:
|
||||
jumpstd picturebookshelf
|
||||
jumpstd PictureBookshelfScript
|
||||
|
||||
CopycatSpinAroundMovementData:
|
||||
turn_head DOWN
|
||||
|
@ -26,7 +26,7 @@ DarkCaveVioletEntranceDireHit:
|
||||
itemball DIRE_HIT
|
||||
|
||||
DarkCaveVioletEntranceRock:
|
||||
jumpstd smashrock
|
||||
jumpstd SmashRockScript
|
||||
|
||||
DarkCaveVioletEntranceHiddenElixer:
|
||||
hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER
|
||||
|
@ -71,7 +71,7 @@ DayCareLadyScript:
|
||||
end
|
||||
|
||||
DayCareBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
Text_GrampsLookingForYou:
|
||||
text "Gramps was looking"
|
||||
|
@ -143,7 +143,7 @@ AcademyStickerMachine:
|
||||
jumptext AcademyStickerMachineText
|
||||
|
||||
AcademyBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
AcademyEarlSpinMovement:
|
||||
turn_head DOWN
|
||||
|
@ -80,10 +80,10 @@ BurnedTowerSign:
|
||||
jumptext BurnedTowerSignText
|
||||
|
||||
EcruteakCityPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
EcruteakCityMartSign:
|
||||
jumpstd martsign
|
||||
jumpstd MartSignScript
|
||||
|
||||
EcruteakCityHiddenHyperPotion:
|
||||
hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION
|
||||
|
@ -74,10 +74,10 @@ EcruteakGymActivateRockets:
|
||||
end
|
||||
|
||||
.GoldenrodRockets:
|
||||
jumpstd goldenrodrockets
|
||||
jumpstd GoldenrodRocketsScript
|
||||
|
||||
.RadioTowerRockets:
|
||||
jumpstd radiotowerrockets
|
||||
jumpstd RadioTowerRocketsScript
|
||||
|
||||
EcruteakGymClosed:
|
||||
applymovement PLAYER, EcruteakGymPlayerStepUpMovement
|
||||
@ -158,10 +158,10 @@ EcruteakGymGuyScript:
|
||||
EcruteakGymStatue:
|
||||
checkflag ENGINE_FOGBADGE
|
||||
iftrue .Beaten
|
||||
jumpstd gymstatue1
|
||||
jumpstd GymStatue1Script
|
||||
.Beaten:
|
||||
gettrainername STRING_BUFFER_4, MORTY, MORTY1
|
||||
jumpstd gymstatue2
|
||||
jumpstd GymStatue2Script
|
||||
|
||||
EcruteakGymPlayerStepUpMovement:
|
||||
step UP
|
||||
|
@ -53,7 +53,7 @@ EcruteakHistoryBook:
|
||||
end
|
||||
|
||||
ItemFinderHouseRadio:
|
||||
jumpstd radio2
|
||||
jumpstd Radio2Script
|
||||
|
||||
EcruteakItemfinderAdventureText:
|
||||
text "Ah. You're on an"
|
||||
|
@ -14,7 +14,7 @@ EcruteakLugiaSpeechHouseYoungsterScript:
|
||||
jumptextfaceplayer EcruteakLugiaSpeechHouseYoungsterText
|
||||
|
||||
LugiaSpeechHouseRadio:
|
||||
jumpstd radio2
|
||||
jumpstd Radio2Script
|
||||
|
||||
EcruteakLugiaSpeechHouseGrampsText:
|
||||
text "This happened when"
|
||||
|
@ -56,7 +56,7 @@ EcruteakPokecenter1F_MapScripts:
|
||||
end
|
||||
|
||||
EcruteakPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
EcruteakPokecenter1FPokefanMScript:
|
||||
special Mobile_DummyReturnFalse
|
||||
|
@ -17,7 +17,7 @@ ElmsHousePC:
|
||||
jumptext ElmsHousePCText
|
||||
|
||||
ElmsHouseBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
ElmsWifeText:
|
||||
text "Hi, <PLAY_G>! My"
|
||||
|
@ -509,7 +509,7 @@ AideScript_GiveYouBalls:
|
||||
end
|
||||
|
||||
AideScript_ReceiveTheBalls:
|
||||
jumpstd receiveitem
|
||||
jumpstd ReceiveItemScript
|
||||
end
|
||||
|
||||
ElmsAideScript:
|
||||
@ -603,10 +603,10 @@ ElmsLabPC:
|
||||
|
||||
ElmsLabTrashcan2:
|
||||
; unused
|
||||
jumpstd trashcan
|
||||
jumpstd TrashCanScript
|
||||
|
||||
ElmsLabBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
ElmsLab_WalkUpToElmMovement:
|
||||
step UP
|
||||
|
@ -202,7 +202,7 @@ TrainerSchoolboyRicky:
|
||||
end
|
||||
|
||||
FastShipB1FTrashcan:
|
||||
jumpstd trashcan
|
||||
jumpstd TrashCanScript
|
||||
|
||||
FastShipB1FSailorBlocksRightMovement:
|
||||
fix_facing
|
||||
|
@ -113,7 +113,7 @@ FastShipLazySailorScript:
|
||||
end
|
||||
|
||||
FastShipCabins_NNW_NNE_NETrashcan:
|
||||
jumpstd trashcan
|
||||
jumpstd TrashCanScript
|
||||
|
||||
FastShipLazySailorLeavesMovement1:
|
||||
step LEFT
|
||||
|
@ -216,7 +216,7 @@ TrainerSupernerdShawn:
|
||||
end
|
||||
|
||||
FastShipCaptainsCabinTrashcan:
|
||||
jumpstd trashcan
|
||||
jumpstd TrashCanScript
|
||||
|
||||
MovementData_0x76004:
|
||||
big_step RIGHT
|
||||
|
@ -109,7 +109,7 @@ FastShipBed:
|
||||
end
|
||||
|
||||
FastShipCabinsNorthwestCabinTrashcan:
|
||||
jumpstd trashcan
|
||||
jumpstd TrashCanScript
|
||||
|
||||
FirebreatherLyleSeenText:
|
||||
text "I'm going to KANTO"
|
||||
|
@ -42,10 +42,10 @@ NoLitteringSign:
|
||||
jumptext NoLitteringSignText
|
||||
|
||||
FuchsiaCityPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
FuchsiaCityMartSign:
|
||||
jumpstd martsign
|
||||
jumpstd MartSignScript
|
||||
|
||||
FuchsiaCityFruitTree:
|
||||
fruittree FRUITTREE_FUCHSIA_CITY
|
||||
|
@ -212,10 +212,10 @@ FuchsiaGymGuyScript:
|
||||
FuchsiaGymStatue:
|
||||
checkflag ENGINE_SOULBADGE
|
||||
iftrue .Beaten
|
||||
jumpstd gymstatue1
|
||||
jumpstd GymStatue1Script
|
||||
.Beaten:
|
||||
gettrainername STRING_BUFFER_4, JANINE, JANINE1
|
||||
jumpstd gymstatue2
|
||||
jumpstd GymStatue2Script
|
||||
|
||||
Movement_NinjaSpin:
|
||||
turn_head DOWN
|
||||
|
@ -14,7 +14,7 @@ FuchsiaPokecenter1F_MapScripts:
|
||||
end
|
||||
|
||||
FuchsiaPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
FuchsiaPokecenter1FCooltrainerMScript:
|
||||
jumptextfaceplayer FuchsiaPokecenter1FCooltrainerMText
|
||||
|
@ -262,7 +262,7 @@ GoldenrodCityUndergroundSignSouth:
|
||||
jumptext GoldenrodCityUndergroundSignSouthText
|
||||
|
||||
GoldenrodCityPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
GoldenrodCityFlowerShopSign:
|
||||
jumptext GoldenrodCityFlowerShopSignText
|
||||
|
@ -25,7 +25,7 @@ GoldenrodDeptStore1FDirectory:
|
||||
jumptext GoldenrodDeptStore1FDirectoryText
|
||||
|
||||
GoldenrodDeptStore1FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
GoldenrodDeptStore1FReceptionistText:
|
||||
text "Welcome to GOLDEN-"
|
||||
|
@ -37,7 +37,7 @@ GoldenrodDeptStore2FDirectory:
|
||||
jumptext GoldenrodDeptStore2FDirectoryText
|
||||
|
||||
GoldenrodDeptStore2FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
GoldenrodDeptStore2FUnusedText1:
|
||||
; unused
|
||||
|
@ -25,7 +25,7 @@ GoldenrodDeptStore3FDirectory:
|
||||
jumptext GoldenrodDeptStore3FDirectoryText
|
||||
|
||||
GoldenrodDeptStore3FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
GoldenrodDeptStore3FSuperNerdText:
|
||||
text "I, I, I'm really"
|
||||
|
@ -35,7 +35,7 @@ GoldenrodDeptStore4FDirectory:
|
||||
jumptext GoldenrodDeptStore4FDirectoryText
|
||||
|
||||
GoldenrodDeptStore4FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
GoldenrodDeptStore4FCooltrainerMText:
|
||||
text "Hey. I love strong"
|
||||
|
@ -136,7 +136,7 @@ GoldenrodDeptStore5FDirectory:
|
||||
jumptext GoldenrodDeptStore5FDirectoryText
|
||||
|
||||
GoldenrodDeptStore5FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
GoldenrodDeptStore5FReceptionistOhYourMonDotDotDotText:
|
||||
text "Hello. Oh, your"
|
||||
|
@ -94,7 +94,7 @@ GoldenrodDeptStore6FDirectory:
|
||||
jumptext GoldenrodDeptStore6FDirectoryText
|
||||
|
||||
GoldenrodDeptStore6FElevatorButton:
|
||||
jumpstd elevatorbutton
|
||||
jumpstd ElevatorButtonScript
|
||||
|
||||
GoldenrodVendingText:
|
||||
text "A vending machine!"
|
||||
|
@ -75,15 +75,15 @@ FlowerShopFloriaScript:
|
||||
|
||||
FlowerShopShelf1:
|
||||
; unused
|
||||
jumpstd picturebookshelf
|
||||
jumpstd PictureBookshelfScript
|
||||
|
||||
FlowerShopShelf2:
|
||||
; unused
|
||||
jumpstd magazinebookshelf
|
||||
jumpstd MagazineBookshelfScript
|
||||
|
||||
FlowerShopRadio:
|
||||
; unused
|
||||
jumpstd radio2
|
||||
jumpstd Radio2Script
|
||||
|
||||
GoldenrodFlowerShopTeacherMySisterWentToSeeWigglyTreeRoute36Text:
|
||||
text "Have you seen that"
|
||||
|
@ -54,7 +54,7 @@ MoveTutorInsideScript:
|
||||
end
|
||||
|
||||
GoldenrodGameCornerCoinVendorScript:
|
||||
jumpstd gamecornercoinvendor
|
||||
jumpstd GameCornerCoinVendorScript
|
||||
|
||||
GoldenrodGameCornerTMVendorScript:
|
||||
faceplayer
|
||||
|
@ -85,10 +85,10 @@ GoldenrodGymActivateRockets:
|
||||
end
|
||||
|
||||
.GoldenrodRockets:
|
||||
jumpstd goldenrodrockets
|
||||
jumpstd GoldenrodRocketsScript
|
||||
|
||||
.RadioTowerRockets:
|
||||
jumpstd radiotowerrockets
|
||||
jumpstd RadioTowerRocketsScript
|
||||
|
||||
TrainerLassCarrie:
|
||||
trainer LASS, CARRIE, EVENT_BEAT_LASS_CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script
|
||||
@ -167,10 +167,10 @@ GoldenrodGymGuyScript:
|
||||
GoldenrodGymStatue:
|
||||
checkflag ENGINE_PLAINBADGE
|
||||
iftrue .Beaten
|
||||
jumpstd gymstatue1
|
||||
jumpstd GymStatue1Script
|
||||
.Beaten:
|
||||
gettrainername STRING_BUFFER_4, WHITNEY, WHITNEY1
|
||||
jumpstd gymstatue2
|
||||
jumpstd GymStatue2Script
|
||||
|
||||
BridgetWalksUpMovement:
|
||||
step LEFT
|
||||
|
@ -64,10 +64,10 @@ GoldenrodHappinessRaterTwinScript:
|
||||
jumptextfaceplayer GoldenrodHappinessRaterTwinText
|
||||
|
||||
HappinessRatersHouseBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
HappinessRatersHouseRadio:
|
||||
jumpstd radio2
|
||||
jumpstd Radio2Script
|
||||
|
||||
GoldenrodHappinessRaterTeacherText:
|
||||
text "If you treat your"
|
||||
|
@ -15,10 +15,10 @@ GoldenrodNameRater:
|
||||
end
|
||||
|
||||
GoldenrodNameRaterBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
GoldenrodNameRaterRadio:
|
||||
jumpstd radio2
|
||||
jumpstd Radio2Script
|
||||
|
||||
INCLUDE "data/text/unused_sweet_honey.asm"
|
||||
|
||||
|
@ -14,13 +14,13 @@ GoldenrodPPSpeechHouseLassScript:
|
||||
jumptextfaceplayer GoldenrodPPSpeechHouseLassText
|
||||
|
||||
GoldenrodPPSpeechHouseBookshelf2:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
GoldenrodPPSpeechHouseBookshelf1:
|
||||
jumpstd magazinebookshelf
|
||||
jumpstd MagazineBookshelfScript
|
||||
|
||||
GoldenrodPPSpeechHouseRadio:
|
||||
jumpstd radio2
|
||||
jumpstd Radio2Script
|
||||
|
||||
GoldenrodPPSpeechHouseFisherText:
|
||||
text "Once while I was"
|
||||
|
@ -11,7 +11,7 @@ GoldenrodPokecenter1F_MapScripts:
|
||||
db 0 ; callbacks
|
||||
|
||||
GoldenrodPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
GoldenrodPokecenter1F_GSBallSceneLeft:
|
||||
setval BATTLETOWERACTION_CHECKMOBILEEVENT
|
||||
|
@ -10,7 +10,7 @@ GuideGentsHouseGuideGent:
|
||||
jumptextfaceplayer GuideGentsHouseGuideGentText
|
||||
|
||||
GuideGentsHouseBookshelf:
|
||||
jumpstd magazinebookshelf
|
||||
jumpstd MagazineBookshelfScript
|
||||
|
||||
GuideGentsHouseGuideGentText:
|
||||
text "When I was a wee"
|
||||
|
@ -60,7 +60,7 @@ IcePathB1F_MapScripts:
|
||||
end
|
||||
|
||||
IcePathB1FBoulder:
|
||||
jumpstd strengthboulder
|
||||
jumpstd StrengthBoulderScript
|
||||
|
||||
IcePathB1FIron:
|
||||
itemball IRON
|
||||
|
@ -11,7 +11,7 @@ IcePathB3FNevermeltice:
|
||||
itemball NEVERMELTICE
|
||||
|
||||
IcePathB3FRock:
|
||||
jumpstd smashrock
|
||||
jumpstd SmashRockScript
|
||||
|
||||
IcePathB3F_MapEvents:
|
||||
db 0, 0 ; filler
|
||||
|
@ -422,7 +422,7 @@ IlexForestHiddenFullHeal:
|
||||
|
||||
IlexForestBoulder:
|
||||
; unused
|
||||
jumpstd strengthboulder
|
||||
jumpstd StrengthBoulderScript
|
||||
|
||||
IlexForestSignpost:
|
||||
jumptext IlexForestSignpostText
|
||||
|
@ -135,7 +135,7 @@ PlateauRivalScriptDone:
|
||||
end
|
||||
|
||||
IndigoPlateauPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
IndigoPlateauPokecenter1FClerkScript:
|
||||
opentext
|
||||
|
@ -426,10 +426,10 @@ KurtsHouseCelebiStatue:
|
||||
jumptext KurtsHouseCelebiStatueText
|
||||
|
||||
KurtsHouseBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
KurtsHouseRadio:
|
||||
jumpstd radio2
|
||||
jumpstd Radio2Script
|
||||
|
||||
KurtsHouseKurtExitHouseMovement:
|
||||
big_step DOWN
|
||||
|
@ -28,7 +28,7 @@ HiddenPowerGuy:
|
||||
end
|
||||
|
||||
HiddenPowerHouseBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
HiddenPowerGuyText1:
|
||||
text "…You have strayed"
|
||||
|
@ -88,7 +88,7 @@ LakeOfRageMagikarpHouseUnusedRecordSign:
|
||||
jumptext LakeOfRageMagikarpHouseUnusedRecordText
|
||||
|
||||
MagikarpHouseBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
MagikarpLengthRaterText_LakeOfRageHistory:
|
||||
text "LAKE OF RAGE is"
|
||||
|
@ -44,7 +44,7 @@ LavRadioTower1FGentlemanScript:
|
||||
end
|
||||
|
||||
.receiveitem:
|
||||
jumpstd receiveitem
|
||||
jumpstd ReceiveItemScript
|
||||
end
|
||||
|
||||
.expncardname
|
||||
|
@ -20,7 +20,7 @@ LavenderNameRater:
|
||||
|
||||
LavenderNameRaterUnusedBookshelf:
|
||||
; unused
|
||||
jumpstd difficultbookshelf
|
||||
jumpstd DifficultBookshelfScript
|
||||
|
||||
LavenderNameRater_MapEvents:
|
||||
db 0, 0 ; filler
|
||||
|
@ -10,7 +10,7 @@ LavenderPokecenter1F_MapScripts:
|
||||
db 0 ; callbacks
|
||||
|
||||
LavenderPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
LavenderPokecenter1FGentlemanScript:
|
||||
jumptextfaceplayer LavenderPokecenter1FGentlemanText
|
||||
|
@ -10,7 +10,7 @@ LavenderSpeechHousePokefanFScript:
|
||||
jumptextfaceplayer LavenderSpeechHousePokefanFText
|
||||
|
||||
LavenderSpeechHouseBookshelf:
|
||||
jumpstd picturebookshelf
|
||||
jumpstd PictureBookshelfScript
|
||||
|
||||
LavenderSpeechHousePokefanFText:
|
||||
text "LAVENDER is a"
|
||||
|
@ -39,10 +39,10 @@ SoulHouseSign:
|
||||
jumptext SoulHouseSignText
|
||||
|
||||
LavenderPokecenterSignText:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
LavenderMartSignText:
|
||||
jumpstd martsign
|
||||
jumpstd MartSignScript
|
||||
|
||||
LavenderTownPokefanMText:
|
||||
text "That's quite some"
|
||||
|
@ -63,10 +63,10 @@ MahoganyGymActivateRockets:
|
||||
end
|
||||
|
||||
.GoldenrodRockets:
|
||||
jumpstd goldenrodrockets
|
||||
jumpstd GoldenrodRocketsScript
|
||||
|
||||
.RadioTowerRockets:
|
||||
jumpstd radiotowerrockets
|
||||
jumpstd RadioTowerRocketsScript
|
||||
|
||||
TrainerSkierRoxanne:
|
||||
trainer SKIER, ROXANNE, EVENT_BEAT_SKIER_ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script
|
||||
@ -142,10 +142,10 @@ MahoganyGymGuyScript:
|
||||
MahoganyGymStatue:
|
||||
checkflag ENGINE_GLACIERBADGE
|
||||
iftrue .Beaten
|
||||
jumpstd gymstatue1
|
||||
jumpstd GymStatue1Script
|
||||
.Beaten:
|
||||
gettrainername STRING_BUFFER_4, PRYCE, PRYCE1
|
||||
jumpstd gymstatue2
|
||||
jumpstd GymStatue2Script
|
||||
|
||||
PryceText_Intro:
|
||||
text "#MON have many"
|
||||
|
@ -10,7 +10,7 @@ MahoganyPokecenter1F_MapScripts:
|
||||
db 0 ; callbacks
|
||||
|
||||
MahoganyPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
jumpstd PokecenterNurseScript
|
||||
|
||||
MahoganyPokecenter1FPokefanMScript:
|
||||
jumptextfaceplayer MahoganyPokecenter1FPokefanMText
|
||||
|
@ -28,11 +28,11 @@ MahoganyRedGyaradosSpeechHouseTeacherScript:
|
||||
|
||||
MahoganyRedGyaradosSpeechHouseUnusedBookshelf1:
|
||||
; unused
|
||||
jumpstd picturebookshelf
|
||||
jumpstd PictureBookshelfScript
|
||||
|
||||
MahoganyRedGyaradosSpeechHouseUnusedBookshelf2:
|
||||
; unused
|
||||
jumpstd magazinebookshelf
|
||||
jumpstd MagazineBookshelfScript
|
||||
|
||||
MahoganyRedGyaradosSpeechHouseBlackBeltText:
|
||||
text "I heard that a red"
|
||||
|
@ -119,7 +119,7 @@ MahoganyGymSign:
|
||||
jumptext MahoganyGymSignText
|
||||
|
||||
MahoganyTownPokecenterSign:
|
||||
jumpstd pokecentersign
|
||||
jumpstd PokecenterSignScript
|
||||
|
||||
MovementData_0x1900a4:
|
||||
step DOWN
|
||||
|
@ -97,7 +97,7 @@ ManiaScript:
|
||||
|
||||
ManiasHouseUnusedBookshelf:
|
||||
; unused
|
||||
jumpstd picturebookshelf
|
||||
jumpstd PictureBookshelfScript
|
||||
|
||||
ManiaText_AskLookAfterShuckle:
|
||||
text "I, I'm in shock!"
|
||||
|
@ -79,7 +79,7 @@ DontLitterSign:
|
||||
jumptext DontLitterSignText
|
||||
|
||||
MtMoonSquareRock:
|
||||
jumpstd smashrock
|
||||
jumpstd SmashRockScript
|
||||
|
||||
PlayerWalksUpToDancingClefairies:
|
||||
step UP
|
||||
|
@ -38,7 +38,7 @@ TrainerSupernerdMarkus:
|
||||
end
|
||||
|
||||
MountMortar1FBoulder:
|
||||
jumpstd strengthboulder
|
||||
jumpstd StrengthBoulderScript
|
||||
|
||||
MountMortar1FInsideEscapeRope:
|
||||
itemball ESCAPE_ROPE
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user