pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve #723: treat std scripts like specials and predefs

Browse Source
This commit is contained in:
Rangi 2020-06-10 16:44:16 -04:00
parent 32e7e368f4
commit 518cee440e
180 changed files with 561 additions and 554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants.asm
View File

@ -46,7 +46,6 @@ INCLUDE "constants/sfx_constants.asm"
INCLUDE "constants/sprite_anim_constants.asm" INCLUDE "constants/sprite_anim_constants.asm"
INCLUDE "constants/sprite_constants.asm" INCLUDE "constants/sprite_constants.asm"
INCLUDE "constants/sprite_data_constants.asm" INCLUDE "constants/sprite_data_constants.asm"
INCLUDE "constants/std_constants.asm"
INCLUDE "constants/tileset_constants.asm" INCLUDE "constants/tileset_constants.asm"
INCLUDE "constants/trainer_constants.asm" INCLUDE "constants/trainer_constants.asm"
INCLUDE "constants/trainer_data_constants.asm" INCLUDE "constants/trainer_data_constants.asm"

55
constants/std_constants.asm
View File

@ -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

25
data/events/collision_stdscripts.asm
View File

@ -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: TileCollisionStdScripts:
; collision type, stdscript ; collision type, std script
dbw COLL_BOOKSHELF, magazinebookshelf stdcoll COLL_BOOKSHELF, MagazineBookshelfScript
dbw COLL_PC, pcscript stdcoll COLL_PC, PCScript
dbw COLL_RADIO, radio1 stdcoll COLL_RADIO, Radio1Script
dbw COLL_TOWN_MAP, townmap stdcoll COLL_TOWN_MAP, TownMapScript
dbw COLL_MART_SHELF, merchandiseshelf stdcoll COLL_MART_SHELF, MerchandiseShelfScript
dbw COLL_TV, tv stdcoll COLL_TV, TVScript
dbw COLL_WINDOW, window stdcoll COLL_WINDOW, WindowScript
dbw COLL_INCENSE_BURNER, incenseburner stdcoll COLL_INCENSE_BURNER, IncenseBurnerScript
db -1 ; end db -1 ; end

2
engine/events/bug_contest/contest.asm
View File

@ -30,7 +30,7 @@ BugCatchingContestOutOfBallsScript:
BugCatchingContestReturnToGateScript: BugCatchingContestReturnToGateScript:
closetext closetext
jumpstd bugcontestresultswarp jumpstd BugContestResultsWarpScript
BugCatchingContestTimeUpText: BugCatchingContestTimeUpText:
text_far _BugCatchingContestTimeUpText text_far _BugCatchingContestTimeUpText

110
engine/events/std_scripts.asm
View File

@ -1,57 +1,61 @@
add_stdscript: MACRO
\1StdScript::
dba \1
ENDM
StdScripts:: StdScripts::
; entries correspond to constants/std_constants.asm add_stdscript PokecenterNurseScript
dba PokecenterNurseScript add_stdscript DifficultBookshelfScript
dba DifficultBookshelfScript add_stdscript PictureBookshelfScript
dba PictureBookshelfScript add_stdscript MagazineBookshelfScript
dba MagazineBookshelfScript add_stdscript TeamRocketOathScript
dba TeamRocketOathScript add_stdscript IncenseBurnerScript
dba IncenseBurnerScript add_stdscript MerchandiseShelfScript
dba MerchandiseShelfScript add_stdscript TownMapScript
dba TownMapScript add_stdscript WindowScript
dba WindowScript add_stdscript TVScript
dba TVScript add_stdscript HomepageScript
dba HomepageScript add_stdscript Radio1Script
dba Radio1Script add_stdscript Radio2Script
dba Radio2Script add_stdscript TrashCanScript
dba TrashCanScript add_stdscript StrengthBoulderScript
dba StrengthBoulderScript add_stdscript SmashRockScript
dba SmashRockScript add_stdscript PokecenterSignScript
dba PokecenterSignScript add_stdscript MartSignScript
dba MartSignScript add_stdscript GoldenrodRocketsScript
dba GoldenrodRocketsScript add_stdscript RadioTowerRocketsScript
dba RadioTowerRocketsScript add_stdscript ElevatorButtonScript
dba ElevatorButtonScript add_stdscript DayToTextScript
dba DayToTextScript add_stdscript BugContestResultsWarpScript
dba BugContestResultsWarpScript add_stdscript BugContestResultsScript
dba BugContestResultsScript add_stdscript InitializeEventsScript
dba InitializeEventsScript add_stdscript AskNumber1MScript
dba AskNumber1MScript add_stdscript AskNumber2MScript
dba AskNumber2MScript add_stdscript RegisteredNumberMScript
dba RegisteredNumberMScript add_stdscript NumberAcceptedMScript
dba NumberAcceptedMScript add_stdscript NumberDeclinedMScript
dba NumberDeclinedMScript add_stdscript PhoneFullMScript
dba PhoneFullMScript add_stdscript RematchMScript
dba RematchMScript add_stdscript GiftMScript
dba GiftMScript add_stdscript PackFullMScript
dba PackFullMScript add_stdscript RematchGiftMScript
dba RematchGiftMScript add_stdscript AskNumber1FScript
dba AskNumber1FScript add_stdscript AskNumber2FScript
dba AskNumber2FScript add_stdscript RegisteredNumberFScript
dba RegisteredNumberFScript add_stdscript NumberAcceptedFScript
dba NumberAcceptedFScript add_stdscript NumberDeclinedFScript
dba NumberDeclinedFScript add_stdscript PhoneFullFScript
dba PhoneFullFScript add_stdscript RematchFScript
dba RematchFScript add_stdscript GiftFScript
dba GiftFScript add_stdscript PackFullFScript
dba PackFullFScript add_stdscript RematchGiftFScript
dba RematchGiftFScript add_stdscript GymStatue1Script
dba GymStatue1Script add_stdscript GymStatue2Script
dba GymStatue2Script add_stdscript ReceiveItemScript
dba ReceiveItemScript add_stdscript ReceiveTogepiEggScript
dba ReceiveTogepiEggScript add_stdscript PCScript
dba PCScript add_stdscript GameCornerCoinVendorScript
dba GameCornerCoinVendorScript add_stdscript HappinessCheckScript
dba HappinessCheckScript
PokecenterNurseScript: PokecenterNurseScript:
; EVENT_WELCOMED_TO_POKECOM_CENTER is never set ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set

2
engine/events/whiteout.asm
View File

@ -22,7 +22,7 @@ Script_Whiteout:
endall endall
.bug_contest .bug_contest
jumpstd bugcontestresultswarp jumpstd BugContestResultsWarpScript
.WhitedOutText: .WhitedOutText:
text_far _WhitedOutText text_far _WhitedOutText

54
macros/legacy.asm
View File

@ -327,3 +327,57 @@ text_jump EQUS "text_far"
anim_enemyfeetobj EQUS "anim_battlergfx_2row" anim_enemyfeetobj EQUS "anim_battlergfx_2row"
anim_playerheadobj EQUS "anim_battlergfx_1row" anim_playerheadobj EQUS "anim_battlergfx_1row"
anim_clearsprites EQUS "anim_keepsprites" 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"

4
macros/scripts/events.asm
View File

@ -80,13 +80,13 @@ ENDM
enum jumpstd_command ; $0c enum jumpstd_command ; $0c
jumpstd: MACRO jumpstd: MACRO
db jumpstd_command db jumpstd_command
dw \1 ; predefined_script dw (\1StdScript - StdScripts) / 3
ENDM ENDM
enum callstd_command ; $0d enum callstd_command ; $0d
callstd: MACRO callstd: MACRO
db callstd_command db callstd_command
dw \1 ; predefined_script dw (\1StdScript - StdScripts) / 3
ENDM ENDM
enum callasm_command ; $0e enum callasm_command ; $0e

8
maps/AzaleaGym.asm
View File

@ -62,10 +62,10 @@ AzaleaGymActivateRockets:
end end
.GoldenrodRockets: .GoldenrodRockets:
jumpstd goldenrodrockets jumpstd GoldenrodRocketsScript
.RadioTowerRockets: .RadioTowerRockets:
jumpstd radiotowerrockets jumpstd RadioTowerRocketsScript
TrainerTwinsAmyandmay1: TrainerTwinsAmyandmay1:
trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript
@ -142,10 +142,10 @@ AzaleaGymGuyScript:
AzaleaGymStatue: AzaleaGymStatue:
checkflag ENGINE_HIVEBADGE checkflag ENGINE_HIVEBADGE
iftrue .Beaten iftrue .Beaten
jumpstd gymstatue1 jumpstd GymStatue1Script
.Beaten: .Beaten:
gettrainername STRING_BUFFER_4, BUGSY, BUGSY1 gettrainername STRING_BUFFER_4, BUGSY, BUGSY1
jumpstd gymstatue2 jumpstd GymStatue2Script
BugsyText_INeverLose: BugsyText_INeverLose:
text "I'm BUGSY!" text "I'm BUGSY!"

2
maps/AzaleaPokecenter1F.asm
View File

@ -14,7 +14,7 @@ AzaleaPokecenter1F_MapScripts:
end end
AzaleaPokecenter1FNurseScript: AzaleaPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
AzaleaPokecenter1FGentlemanScript: AzaleaPokecenter1FGentlemanScript:
jumptextfaceplayer AzaleaPokecenter1FGentlemanText jumptextfaceplayer AzaleaPokecenter1FGentlemanText

4
maps/AzaleaTown.asm
View File

@ -200,10 +200,10 @@ AzaleaTownIlextForestSign:
jumptext AzaleaTownIlexForestSignText jumptext AzaleaTownIlexForestSignText
AzaleaTownPokecenterSign: AzaleaTownPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
AzaleaTownMartSign: AzaleaTownMartSign:
jumpstd martsign jumpstd MartSignScript
WhiteApricornTree: WhiteApricornTree:
fruittree FRUITTREE_AZALEA_TOWN fruittree FRUITTREE_AZALEA_TOWN

6
maps/BillsFamilysHouse.asm
View File

@ -98,13 +98,13 @@ BillsSisterScript:
sjump .Refused sjump .Refused
BillsHouseBookshelf1: BillsHouseBookshelf1:
jumpstd picturebookshelf jumpstd PictureBookshelfScript
BillsHouseBookshelf2: BillsHouseBookshelf2:
jumpstd magazinebookshelf jumpstd MagazineBookshelfScript
BillsHouseRadio: BillsHouseRadio:
jumpstd radio2 jumpstd Radio2Script
BillTakeThisEeveeText: BillTakeThisEeveeText:
text "BILL: Hi, <PLAYER>!" text "BILL: Hi, <PLAYER>!"

4
maps/BlackthornCity.asm
View File

@ -137,10 +137,10 @@ BlackthornCityTrainerTips:
jumptext BlackthornCityTrainerTipsText jumptext BlackthornCityTrainerTipsText
BlackthornCityPokecenterSign: BlackthornCityPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
BlackthornCityMartSign: BlackthornCityMartSign:
jumpstd martsign jumpstd MartSignScript
Text_ClairIsOut: Text_ClairIsOut:
text "I am sorry." text "I am sorry."

4
maps/BlackthornDragonSpeechHouse.asm
View File

@ -20,11 +20,11 @@ BlackthornDragonSpeechHouseDratiniScript:
; unused ; unused
BlackthornDragonSpeechHousePictureBookshelf: BlackthornDragonSpeechHousePictureBookshelf:
jumpstd picturebookshelf jumpstd PictureBookshelfScript
; unused ; unused
BlackthornDragonSpeechHouseMagazineBookshelf: BlackthornDragonSpeechHouseMagazineBookshelf:
jumpstd magazinebookshelf jumpstd MagazineBookshelfScript
BlackthornDragonSpeechHouseGrannyText: BlackthornDragonSpeechHouseGrannyText:
text "A clan of trainers" text "A clan of trainers"

2
maps/BlackthornEmysHouse.asm
View File

@ -15,7 +15,7 @@ Emy:
end end
EmysHouseBookshelf: EmysHouseBookshelf:
jumpstd magazinebookshelf jumpstd MagazineBookshelfScript
BlackthornEmysHouse_MapEvents: BlackthornEmysHouse_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler

4
maps/BlackthornGym1F.asm
View File

@ -142,10 +142,10 @@ BlackthornGymGuyScript:
BlackthornGymStatue: BlackthornGymStatue:
checkflag ENGINE_RISINGBADGE checkflag ENGINE_RISINGBADGE
iftrue .Beaten iftrue .Beaten
jumpstd gymstatue1 jumpstd GymStatue1Script
.Beaten: .Beaten:
gettrainername STRING_BUFFER_4, CLAIR, CLAIR1 gettrainername STRING_BUFFER_4, CLAIR, CLAIR1
jumpstd gymstatue2 jumpstd GymStatue2Script
ClairIntroText: ClairIntroText:
text "I am CLAIR." text "I am CLAIR."

2
maps/BlackthornGym2F.asm
View File

@ -54,7 +54,7 @@ BlackthornGym2F_MapScripts:
end end
BlackthornGymBoulder: BlackthornGymBoulder:
jumpstd strengthboulder jumpstd StrengthBoulderScript
TrainerCooltrainermCody: TrainerCooltrainermCody:
trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script

4
maps/BlackthornPokecenter1F.asm
View File

@ -10,7 +10,7 @@ BlackthornPokecenter1F_MapScripts:
db 0 ; callbacks db 0 ; callbacks
BlackthornPokecenter1FNurseScript: BlackthornPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
BlackthornPokecenter1FGentlemanScript: BlackthornPokecenter1FGentlemanScript:
jumptextfaceplayer BlackthornPokecenter1FGentlemanText jumptextfaceplayer BlackthornPokecenter1FGentlemanText
@ -19,7 +19,7 @@ BlackthornPokecenter1FTwinScript:
jumptextfaceplayer BlackthornPokecenter1FTwinText jumptextfaceplayer BlackthornPokecenter1FTwinText
BlackthornPokecenter1FCooltrainerMScript: BlackthornPokecenter1FCooltrainerMScript:
jumpstd happinesschecknpc jumpstd HappinessCheckScript
BlackthornPokecenter1FGentlemanText: BlackthornPokecenter1FGentlemanText:
text "Deep inside far-" text "Deep inside far-"

2
maps/BurnedTower1F.asm
View File

@ -126,7 +126,7 @@ BurnedTower1FMortyScript:
jumptextfaceplayer BurnedTower1FMortyText jumptextfaceplayer BurnedTower1FMortyText
BurnedTower1FRock: BurnedTower1FRock:
jumpstd smashrock jumpstd SmashRockScript
BurnedTower1FHiddenEther: BurnedTower1FHiddenEther:
hiddenitem ETHER, EVENT_BURNED_TOWER_1F_HIDDEN_ETHER hiddenitem ETHER, EVENT_BURNED_TOWER_1F_HIDDEN_ETHER

2
maps/BurnedTowerB1F.asm
View File

@ -120,7 +120,7 @@ BurnedTowerB1FTMEndure:
itemball TM_ENDURE itemball TM_ENDURE
BurnedTowerB1FBoulder: BurnedTowerB1FBoulder:
jumpstd strengthboulder jumpstd StrengthBoulderScript
BurnedTowerRaikouMovement: BurnedTowerRaikouMovement:
set_sliding set_sliding

2
maps/CeladonCafe.asm
View File

@ -114,7 +114,7 @@ CeladonCafeTrashcan:
end end
.TrashEmpty: .TrashEmpty:
jumpstd trashcan jumpstd TrashCanScript
ChefText_Eatathon: ChefText_Eatathon:
text "Hi!" text "Hi!"

2
maps/CeladonCity.asm
View File

@ -70,7 +70,7 @@ CeladonCityTrainerTips:
jumptext CeladonCityTrainerTipsText jumptext CeladonCityTrainerTipsText
CeladonCityPokecenterSign: CeladonCityPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
CeladonCityHiddenPpUp: CeladonCityHiddenPpUp:
hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP

2
maps/CeladonDeptStore1F.asm
View File

@ -21,7 +21,7 @@ CeladonDeptStore1FDirectory:
jumptext CeladonDeptStore1FDirectoryText jumptext CeladonDeptStore1FDirectoryText
CeladonDeptStore1FElevatorButton: CeladonDeptStore1FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
CeladonDeptStore1FReceptionistText: CeladonDeptStore1FReceptionistText:
text "Hello! Welcome to" text "Hello! Welcome to"

2
maps/CeladonDeptStore2F.asm
View File

@ -33,7 +33,7 @@ CeladonDeptStore2FDirectory:
jumptext CeladonDeptStore2FDirectoryText jumptext CeladonDeptStore2FDirectoryText
CeladonDeptStore2FElevatorButton: CeladonDeptStore2FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
CeladonDeptStore2FPokefanMText: CeladonDeptStore2FPokefanMText:
text "I just recently" text "I just recently"

2
maps/CeladonDeptStore3F.asm
View File

@ -42,7 +42,7 @@ CeladonDeptStore3FSuperNerdScript:
jumptextfaceplayer CeladonDeptStore3FSuperNerdText jumptextfaceplayer CeladonDeptStore3FSuperNerdText
CeladonDeptStore3FElevatorButton: CeladonDeptStore3FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
CeladonDeptStore3FDirectory: CeladonDeptStore3FDirectory:
jumptext CeladonDeptStore3FDirectoryText jumptext CeladonDeptStore3FDirectoryText

2
maps/CeladonDeptStore4F.asm
View File

@ -25,7 +25,7 @@ CeladonDeptStore4FDirectory:
jumptext CeladonDeptStore4FDirectoryText jumptext CeladonDeptStore4FDirectoryText
CeladonDeptStore4FElevatorButton: CeladonDeptStore4FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
CeladonDeptStore4FSuperNerdText: CeladonDeptStore4FSuperNerdText:
text "I'm here to buy" text "I'm here to buy"

2
maps/CeladonDeptStore5F.asm
View File

@ -37,7 +37,7 @@ CeladonDeptStore5FDirectory:
jumptext CeladonDeptStore5FDirectoryText jumptext CeladonDeptStore5FDirectoryText
CeladonDeptStore5FElevatorButton: CeladonDeptStore5FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
CeladonDeptStore5FGentlemanText: CeladonDeptStore5FGentlemanText:
text "I want to buy some" text "I want to buy some"

2
maps/CeladonDeptStore6F.asm
View File

@ -100,7 +100,7 @@ CeladonDeptStore6FDirectory:
; unused ; unused
CeladonDeptStore6FElevatorButton: CeladonDeptStore6FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
CeladonVendingText: CeladonVendingText:
text "A vending machine!" text "A vending machine!"

4
maps/CeladonGameCorner.asm
View File

@ -15,7 +15,7 @@ CeladonGameCorner_MapScripts:
db 0 ; callbacks db 0 ; callbacks
CeladonGameCornerClerkScript: CeladonGameCornerClerkScript:
jumpstd gamecornercoinvendor jumpstd GameCornerCoinVendorScript
CeladonGameCornerReceptionistScript: CeladonGameCornerReceptionistScript:
jumptextfaceplayer CeladonGameCornerReceptionistText jumptextfaceplayer CeladonGameCornerReceptionistText
@ -70,7 +70,7 @@ CeladonGameCornerFisherScript:
end end
.GiveCoins: .GiveCoins:
jumpstd receiveitem jumpstd ReceiveItemScript
end end
.coinname .coinname

4
maps/CeladonGym.asm
View File

@ -105,10 +105,10 @@ TrainerTwinsJoAndZoe2:
CeladonGymStatue: CeladonGymStatue:
checkflag ENGINE_RAINBOWBADGE checkflag ENGINE_RAINBOWBADGE
iftrue .Beaten iftrue .Beaten
jumpstd gymstatue1 jumpstd GymStatue1Script
.Beaten: .Beaten:
gettrainername STRING_BUFFER_4, ERIKA, ERIKA1 gettrainername STRING_BUFFER_4, ERIKA, ERIKA1
jumpstd gymstatue2 jumpstd GymStatue2Script
ErikaBeforeBattleText: ErikaBeforeBattleText:
text "ERIKA: Hello…" text "ERIKA: Hello…"

2
maps/CeladonMansion1F.asm
View File

@ -40,7 +40,7 @@ CeladonMansionManagersSuiteSign:
jumptext CeladonMansionManagersSuiteSignText jumptext CeladonMansionManagersSuiteSignText
CeladonMansion1FBookshelf: CeladonMansion1FBookshelf:
jumpstd picturebookshelf jumpstd PictureBookshelfScript
CeladonMansionManagerText: CeladonMansionManagerText:
text "My dear #MON" text "My dear #MON"

2
maps/CeladonMansion2F.asm
View File

@ -10,7 +10,7 @@ CeladonMansion2FMeetingRoomSign:
jumptext CeladonMansion2FMeetingRoomSignText jumptext CeladonMansion2FMeetingRoomSignText
CeladonMansion2FBookshelf: CeladonMansion2FBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
CeladonMansion2FComputerText: CeladonMansion2FComputerText:
text "<PLAYER> turned on" text "<PLAYER> turned on"

4
maps/CeladonPokecenter1F.asm
View File

@ -11,10 +11,10 @@ CeladonPokecenter1F_MapScripts:
db 0 ; callbacks db 0 ; callbacks
CeladonPokecenter1FNurseScript: CeladonPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
CeladonPokecenter1FGentlemanScript: CeladonPokecenter1FGentlemanScript:
jumpstd happinesschecknpc jumpstd HappinessCheckScript
CeladonPokecenter1FCooltrainerFScript: CeladonPokecenter1FCooltrainerFScript:
jumptextfaceplayer CeladonPokecenter1FCooltrainerFText jumptextfaceplayer CeladonPokecenter1FCooltrainerFText

4
maps/CeruleanCity.asm
View File

@ -139,10 +139,10 @@ CeruleanLockedDoor:
jumptext CeruleanLockedDoorText jumptext CeruleanLockedDoorText
CeruleanCityPokecenterSign: CeruleanCityPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
CeruleanCityMartSign: CeruleanCityMartSign:
jumpstd martsign jumpstd MartSignScript
CeruleanCityHiddenBerserkGene: CeruleanCityHiddenBerserkGene:
hiddenitem BERSERK_GENE, EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY hiddenitem BERSERK_GENE, EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY

4
maps/CeruleanGym.asm
View File

@ -156,10 +156,10 @@ CeruleanGymStatue2:
CeruleanGymStatue: CeruleanGymStatue:
checkflag ENGINE_CASCADEBADGE checkflag ENGINE_CASCADEBADGE
iftrue .Beaten iftrue .Beaten
jumpstd gymstatue1 jumpstd GymStatue1Script
.Beaten: .Beaten:
gettrainername STRING_BUFFER_4, MISTY, MISTY1 gettrainername STRING_BUFFER_4, MISTY, MISTY1
jumpstd gymstatue2 jumpstd GymStatue2Script
CeruleanGymGruntRunsDownMovement: CeruleanGymGruntRunsDownMovement:
big_step DOWN big_step DOWN

2
maps/CeruleanPokecenter1F.asm
View File

@ -9,7 +9,7 @@ CeruleanPokecenter1F_MapScripts:
db 0 ; callbacks db 0 ; callbacks
CeruleanPokecenter1FNurseScript: CeruleanPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
CeruleanPokecenter1FSuperNerdScript: CeruleanPokecenter1FSuperNerdScript:
special Mobile_DummyReturnFalse special Mobile_DummyReturnFalse

4
maps/CharcoalKiln.asm
View File

@ -70,10 +70,10 @@ CharcoalKilnFarfetchd:
end end
CharcoalKilnBookshelf: CharcoalKilnBookshelf:
jumpstd magazinebookshelf jumpstd MagazineBookshelfScript
CharcoalKilnRadio: CharcoalKilnRadio:
jumpstd radio2 jumpstd Radio2Script
CharcoalKilnBossText1: CharcoalKilnBossText1:
text "All the SLOWPOKE" text "All the SLOWPOKE"

6
maps/CherrygroveCity.asm
View File

@ -86,7 +86,7 @@ CherrygroveCityGuideGent:
end end
.JumpstdReceiveItem: .JumpstdReceiveItem:
jumpstd receiveitem jumpstd ReceiveItemScript
end end
.mapcardname .mapcardname
@ -230,10 +230,10 @@ GuideGentsHouseSign:
jumptext GuideGentsHouseSignText jumptext GuideGentsHouseSignText
CherrygroveCityPokecenterSign: CherrygroveCityPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
CherrygroveCityMartSign: CherrygroveCityMartSign:
jumpstd martsign jumpstd MartSignScript
GuideGentMovement1: GuideGentMovement1:
step LEFT step LEFT

2
maps/CherrygroveEvolutionSpeechHouse.asm
View File

@ -22,7 +22,7 @@ CherrygroveEvolutionSpeechHouseLassScript:
end end
CherrygroveEvolutionSpeechHouseBookshelf: CherrygroveEvolutionSpeechHouseBookshelf:
jumpstd magazinebookshelf jumpstd MagazineBookshelfScript
CherrygroveEvolutionSpeechHouseYoungsterText: CherrygroveEvolutionSpeechHouseYoungsterText:
text "#MON gain expe-" text "#MON gain expe-"

2
maps/CherrygroveGymSpeechHouse.asm
View File

@ -14,7 +14,7 @@ CherrygroveGymSpeechHouseBugCatcherScript:
jumptextfaceplayer CherrygroveGymSpeechHouseBugCatcherText jumptextfaceplayer CherrygroveGymSpeechHouseBugCatcherText
CherrygroveGymSpeechHouseBookshelf: CherrygroveGymSpeechHouseBookshelf:
jumpstd picturebookshelf jumpstd PictureBookshelfScript
CherrygroveGymSpeechHousePokefanMText: CherrygroveGymSpeechHousePokefanMText:
text "You're trying to" text "You're trying to"

2
maps/CherrygrovePokecenter1F.asm
View File

@ -10,7 +10,7 @@ CherrygrovePokecenter1F_MapScripts:
db 0 ; callbacks db 0 ; callbacks
CherrygrovePokecenter1FNurseScript: CherrygrovePokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
CherrygrovePokecenter1FFisherScript: CherrygrovePokecenter1FFisherScript:
jumptextfaceplayer CherrygrovePokecenter1FFisherText jumptextfaceplayer CherrygrovePokecenter1FFisherText

4
maps/CianwoodCity.asm
View File

@ -138,10 +138,10 @@ CianwoodPokeSeerSign:
jumptext CianwoodPokeSeerSignText jumptext CianwoodPokeSeerSignText
CianwoodPokecenterSign: CianwoodPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
CianwoodCityRock: CianwoodCityRock:
jumpstd smashrock jumpstd SmashRockScript
CianwoodCityHiddenRevive: CianwoodCityHiddenRevive:
hiddenitem REVIVE, EVENT_CIANWOOD_CITY_HIDDEN_REVIVE hiddenitem REVIVE, EVENT_CIANWOOD_CITY_HIDDEN_REVIVE

10
maps/CianwoodGym.asm
View File

@ -79,10 +79,10 @@ CianwoodGymActivateRockets:
end end
.GoldenrodRockets: .GoldenrodRockets:
jumpstd goldenrodrockets jumpstd GoldenrodRocketsScript
.RadioTowerRockets: .RadioTowerRockets:
jumpstd radiotowerrockets jumpstd RadioTowerRocketsScript
TrainerBlackbeltYoshi: TrainerBlackbeltYoshi:
trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script
@ -129,15 +129,15 @@ TrainerBlackbeltLung:
end end
CianwoodGymBoulder: CianwoodGymBoulder:
jumpstd strengthboulder jumpstd StrengthBoulderScript
CianwoodGymStatue: CianwoodGymStatue:
checkflag ENGINE_STORMBADGE checkflag ENGINE_STORMBADGE
iftrue .Beaten iftrue .Beaten
jumpstd gymstatue1 jumpstd GymStatue1Script
.Beaten: .Beaten:
gettrainername STRING_BUFFER_4, CHUCK, CHUCK1 gettrainername STRING_BUFFER_4, CHUCK, CHUCK1
jumpstd gymstatue2 jumpstd GymStatue2Script
CianwoodGymMovement_ChuckChucksBoulder: CianwoodGymMovement_ChuckChucksBoulder:
set_sliding set_sliding

2
maps/CianwoodLugiaSpeechHouse.asm
View File

@ -18,7 +18,7 @@ CianwoodLugiaSpeechHouseTwinScript:
jumptextfaceplayer CianwoodLugiaSpeechHouseTwinText jumptextfaceplayer CianwoodLugiaSpeechHouseTwinText
CianwoodLugiaSpeechHouseBookshelf: CianwoodLugiaSpeechHouseBookshelf:
jumpstd picturebookshelf jumpstd PictureBookshelfScript
CianwoodLugiaSpeechHouseTeacherText: CianwoodLugiaSpeechHouseTeacherText:
text "You came from" text "You came from"

2
maps/CianwoodPharmacy.asm
View File

@ -36,7 +36,7 @@ CianwoodPharmacist:
end end
CianwoodPharmacyBookshelf: CianwoodPharmacyBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
PharmacistGiveSecretpotionText: PharmacistGiveSecretpotionText:
text "Your #MON ap-" text "Your #MON ap-"

2
maps/CianwoodPokecenter1F.asm
View File

@ -10,7 +10,7 @@ CianwoodPokecenter1F_MapScripts:
db 0 ; callbacks db 0 ; callbacks
CianwoodPokecenter1FNurseScript: CianwoodPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
CianwoodPokecenter1FLassScript: CianwoodPokecenter1FLassScript:
jumptextfaceplayer CianwoodPokecenter1FLassText jumptextfaceplayer CianwoodPokecenter1FLassText

2
maps/CinnabarIsland.asm
View File

@ -30,7 +30,7 @@ CinnabarIslandSign:
jumptext CinnabarIslandSignText jumptext CinnabarIslandSignText
CinnabarIslandPokecenterSign: CinnabarIslandPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
CinnabarIslandHiddenRareCandy: CinnabarIslandHiddenRareCandy:
hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY

2
maps/CinnabarPokecenter1F.asm
View File

@ -9,7 +9,7 @@ CinnabarPokecenter1F_MapScripts:
db 0 ; callbacks db 0 ; callbacks
CinnabarPokecenter1FNurseScript: CinnabarPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
CinnabarPokecenter1FCooltrainerFScript: CinnabarPokecenter1FCooltrainerFScript:
jumptextfaceplayer CinnabarPokecenter1FCooltrainerFText jumptextfaceplayer CinnabarPokecenter1FCooltrainerFText

2
maps/CopycatsHouse2F.asm
View File

@ -184,7 +184,7 @@ CopycatsHouse2FDoll:
jumptext CopycatsHouse2FDollText jumptext CopycatsHouse2FDollText
CopycatsHouse2FBookshelf: CopycatsHouse2FBookshelf:
jumpstd picturebookshelf jumpstd PictureBookshelfScript
CopycatSpinAroundMovementData: CopycatSpinAroundMovementData:
turn_head DOWN turn_head DOWN

2
maps/DarkCaveVioletEntrance.asm
View File

@ -26,7 +26,7 @@ DarkCaveVioletEntranceDireHit:
itemball DIRE_HIT itemball DIRE_HIT
DarkCaveVioletEntranceRock: DarkCaveVioletEntranceRock:
jumpstd smashrock jumpstd SmashRockScript
DarkCaveVioletEntranceHiddenElixer: DarkCaveVioletEntranceHiddenElixer:
hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER

2
maps/DayCare.asm
View File

@ -71,7 +71,7 @@ DayCareLadyScript:
end end
DayCareBookshelf: DayCareBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
Text_GrampsLookingForYou: Text_GrampsLookingForYou:
text "Gramps was looking" text "Gramps was looking"

2
maps/EarlsPokemonAcademy.asm
View File

@ -143,7 +143,7 @@ AcademyStickerMachine:
jumptext AcademyStickerMachineText jumptext AcademyStickerMachineText
AcademyBookshelf: AcademyBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
AcademyEarlSpinMovement: AcademyEarlSpinMovement:
turn_head DOWN turn_head DOWN

4
maps/EcruteakCity.asm
View File

@ -80,10 +80,10 @@ BurnedTowerSign:
jumptext BurnedTowerSignText jumptext BurnedTowerSignText
EcruteakCityPokecenterSign: EcruteakCityPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
EcruteakCityMartSign: EcruteakCityMartSign:
jumpstd martsign jumpstd MartSignScript
EcruteakCityHiddenHyperPotion: EcruteakCityHiddenHyperPotion:
hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION

8
maps/EcruteakGym.asm
View File

@ -74,10 +74,10 @@ EcruteakGymActivateRockets:
end end
.GoldenrodRockets: .GoldenrodRockets:
jumpstd goldenrodrockets jumpstd GoldenrodRocketsScript
.RadioTowerRockets: .RadioTowerRockets:
jumpstd radiotowerrockets jumpstd RadioTowerRocketsScript
EcruteakGymClosed: EcruteakGymClosed:
applymovement PLAYER, EcruteakGymPlayerStepUpMovement applymovement PLAYER, EcruteakGymPlayerStepUpMovement
@ -158,10 +158,10 @@ EcruteakGymGuyScript:
EcruteakGymStatue: EcruteakGymStatue:
checkflag ENGINE_FOGBADGE checkflag ENGINE_FOGBADGE
iftrue .Beaten iftrue .Beaten
jumpstd gymstatue1 jumpstd GymStatue1Script
.Beaten: .Beaten:
gettrainername STRING_BUFFER_4, MORTY, MORTY1 gettrainername STRING_BUFFER_4, MORTY, MORTY1
jumpstd gymstatue2 jumpstd GymStatue2Script
EcruteakGymPlayerStepUpMovement: EcruteakGymPlayerStepUpMovement:
step UP step UP

2
maps/EcruteakItemfinderHouse.asm
View File

@ -53,7 +53,7 @@ EcruteakHistoryBook:
end end
ItemFinderHouseRadio: ItemFinderHouseRadio:
jumpstd radio2 jumpstd Radio2Script
EcruteakItemfinderAdventureText: EcruteakItemfinderAdventureText:
text "Ah. You're on an" text "Ah. You're on an"

2
maps/EcruteakLugiaSpeechHouse.asm
View File

@ -14,7 +14,7 @@ EcruteakLugiaSpeechHouseYoungsterScript:
jumptextfaceplayer EcruteakLugiaSpeechHouseYoungsterText jumptextfaceplayer EcruteakLugiaSpeechHouseYoungsterText
LugiaSpeechHouseRadio: LugiaSpeechHouseRadio:
jumpstd radio2 jumpstd Radio2Script
EcruteakLugiaSpeechHouseGrampsText: EcruteakLugiaSpeechHouseGrampsText:
text "This happened when" text "This happened when"

2
maps/EcruteakPokecenter1F.asm
View File

@ -56,7 +56,7 @@ EcruteakPokecenter1F_MapScripts:
end end
EcruteakPokecenter1FNurseScript: EcruteakPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
EcruteakPokecenter1FPokefanMScript: EcruteakPokecenter1FPokefanMScript:
special Mobile_DummyReturnFalse special Mobile_DummyReturnFalse

2
maps/ElmsHouse.asm
View File

@ -17,7 +17,7 @@ ElmsHousePC:
jumptext ElmsHousePCText jumptext ElmsHousePCText
ElmsHouseBookshelf: ElmsHouseBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
ElmsWifeText: ElmsWifeText:
text "Hi, <PLAY_G>! My" text "Hi, <PLAY_G>! My"

6
maps/ElmsLab.asm
View File

@ -509,7 +509,7 @@ AideScript_GiveYouBalls:
end end
AideScript_ReceiveTheBalls: AideScript_ReceiveTheBalls:
jumpstd receiveitem jumpstd ReceiveItemScript
end end
ElmsAideScript: ElmsAideScript:
@ -603,10 +603,10 @@ ElmsLabPC:
ElmsLabTrashcan2: ElmsLabTrashcan2:
; unused ; unused
jumpstd trashcan jumpstd TrashCanScript
ElmsLabBookshelf: ElmsLabBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
ElmsLab_WalkUpToElmMovement: ElmsLab_WalkUpToElmMovement:
step UP step UP

2
maps/FastShipB1F.asm
View File

@ -202,7 +202,7 @@ TrainerSchoolboyRicky:
end end
FastShipB1FTrashcan: FastShipB1FTrashcan:
jumpstd trashcan jumpstd TrashCanScript
FastShipB1FSailorBlocksRightMovement: FastShipB1FSailorBlocksRightMovement:
fix_facing fix_facing

2
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@ -113,7 +113,7 @@ FastShipLazySailorScript:
end end
FastShipCabins_NNW_NNE_NETrashcan: FastShipCabins_NNW_NNE_NETrashcan:
jumpstd trashcan jumpstd TrashCanScript
FastShipLazySailorLeavesMovement1: FastShipLazySailorLeavesMovement1:
step LEFT step LEFT

2
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -216,7 +216,7 @@ TrainerSupernerdShawn:
end end
FastShipCaptainsCabinTrashcan: FastShipCaptainsCabinTrashcan:
jumpstd trashcan jumpstd TrashCanScript
MovementData_0x76004: MovementData_0x76004:
big_step RIGHT big_step RIGHT

2
maps/FastShipCabins_SW_SSW_NW.asm
View File

@ -109,7 +109,7 @@ FastShipBed:
end end
FastShipCabinsNorthwestCabinTrashcan: FastShipCabinsNorthwestCabinTrashcan:
jumpstd trashcan jumpstd TrashCanScript
FirebreatherLyleSeenText: FirebreatherLyleSeenText:
text "I'm going to KANTO" text "I'm going to KANTO"

4
maps/FuchsiaCity.asm
View File

@ -42,10 +42,10 @@ NoLitteringSign:
jumptext NoLitteringSignText jumptext NoLitteringSignText
FuchsiaCityPokecenterSign: FuchsiaCityPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
FuchsiaCityMartSign: FuchsiaCityMartSign:
jumpstd martsign jumpstd MartSignScript
FuchsiaCityFruitTree: FuchsiaCityFruitTree:
fruittree FRUITTREE_FUCHSIA_CITY fruittree FRUITTREE_FUCHSIA_CITY

4
maps/FuchsiaGym.asm
View File

@ -212,10 +212,10 @@ FuchsiaGymGuyScript:
FuchsiaGymStatue: FuchsiaGymStatue:
checkflag ENGINE_SOULBADGE checkflag ENGINE_SOULBADGE
iftrue .Beaten iftrue .Beaten
jumpstd gymstatue1 jumpstd GymStatue1Script
.Beaten: .Beaten:
gettrainername STRING_BUFFER_4, JANINE, JANINE1 gettrainername STRING_BUFFER_4, JANINE, JANINE1
jumpstd gymstatue2 jumpstd GymStatue2Script
Movement_NinjaSpin: Movement_NinjaSpin:
turn_head DOWN turn_head DOWN

2
maps/FuchsiaPokecenter1F.asm
View File

@ -14,7 +14,7 @@ FuchsiaPokecenter1F_MapScripts:
end end
FuchsiaPokecenter1FNurseScript: FuchsiaPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
FuchsiaPokecenter1FCooltrainerMScript: FuchsiaPokecenter1FCooltrainerMScript:
jumptextfaceplayer FuchsiaPokecenter1FCooltrainerMText jumptextfaceplayer FuchsiaPokecenter1FCooltrainerMText

2
maps/GoldenrodCity.asm
View File

@ -262,7 +262,7 @@ GoldenrodCityUndergroundSignSouth:
jumptext GoldenrodCityUndergroundSignSouthText jumptext GoldenrodCityUndergroundSignSouthText
GoldenrodCityPokecenterSign: GoldenrodCityPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
GoldenrodCityFlowerShopSign: GoldenrodCityFlowerShopSign:
jumptext GoldenrodCityFlowerShopSignText jumptext GoldenrodCityFlowerShopSignText

2
maps/GoldenrodDeptStore1F.asm
View File

@ -25,7 +25,7 @@ GoldenrodDeptStore1FDirectory:
jumptext GoldenrodDeptStore1FDirectoryText jumptext GoldenrodDeptStore1FDirectoryText
GoldenrodDeptStore1FElevatorButton: GoldenrodDeptStore1FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
GoldenrodDeptStore1FReceptionistText: GoldenrodDeptStore1FReceptionistText:
text "Welcome to GOLDEN-" text "Welcome to GOLDEN-"

2
maps/GoldenrodDeptStore2F.asm
View File

@ -37,7 +37,7 @@ GoldenrodDeptStore2FDirectory:
jumptext GoldenrodDeptStore2FDirectoryText jumptext GoldenrodDeptStore2FDirectoryText
GoldenrodDeptStore2FElevatorButton: GoldenrodDeptStore2FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
GoldenrodDeptStore2FUnusedText1: GoldenrodDeptStore2FUnusedText1:
; unused ; unused

2
maps/GoldenrodDeptStore3F.asm
View File

@ -25,7 +25,7 @@ GoldenrodDeptStore3FDirectory:
jumptext GoldenrodDeptStore3FDirectoryText jumptext GoldenrodDeptStore3FDirectoryText
GoldenrodDeptStore3FElevatorButton: GoldenrodDeptStore3FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
GoldenrodDeptStore3FSuperNerdText: GoldenrodDeptStore3FSuperNerdText:
text "I, I, I'm really" text "I, I, I'm really"

2
maps/GoldenrodDeptStore4F.asm
View File

@ -35,7 +35,7 @@ GoldenrodDeptStore4FDirectory:
jumptext GoldenrodDeptStore4FDirectoryText jumptext GoldenrodDeptStore4FDirectoryText
GoldenrodDeptStore4FElevatorButton: GoldenrodDeptStore4FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
GoldenrodDeptStore4FCooltrainerMText: GoldenrodDeptStore4FCooltrainerMText:
text "Hey. I love strong" text "Hey. I love strong"

2
maps/GoldenrodDeptStore5F.asm
View File

@ -136,7 +136,7 @@ GoldenrodDeptStore5FDirectory:
jumptext GoldenrodDeptStore5FDirectoryText jumptext GoldenrodDeptStore5FDirectoryText
GoldenrodDeptStore5FElevatorButton: GoldenrodDeptStore5FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
GoldenrodDeptStore5FReceptionistOhYourMonDotDotDotText: GoldenrodDeptStore5FReceptionistOhYourMonDotDotDotText:
text "Hello. Oh, your" text "Hello. Oh, your"

2
maps/GoldenrodDeptStore6F.asm
View File

@ -94,7 +94,7 @@ GoldenrodDeptStore6FDirectory:
jumptext GoldenrodDeptStore6FDirectoryText jumptext GoldenrodDeptStore6FDirectoryText
GoldenrodDeptStore6FElevatorButton: GoldenrodDeptStore6FElevatorButton:
jumpstd elevatorbutton jumpstd ElevatorButtonScript
GoldenrodVendingText: GoldenrodVendingText:
text "A vending machine!" text "A vending machine!"

6
maps/GoldenrodFlowerShop.asm
View File

@ -75,15 +75,15 @@ FlowerShopFloriaScript:
FlowerShopShelf1: FlowerShopShelf1:
; unused ; unused
jumpstd picturebookshelf jumpstd PictureBookshelfScript
FlowerShopShelf2: FlowerShopShelf2:
; unused ; unused
jumpstd magazinebookshelf jumpstd MagazineBookshelfScript
FlowerShopRadio: FlowerShopRadio:
; unused ; unused
jumpstd radio2 jumpstd Radio2Script
GoldenrodFlowerShopTeacherMySisterWentToSeeWigglyTreeRoute36Text: GoldenrodFlowerShopTeacherMySisterWentToSeeWigglyTreeRoute36Text:
text "Have you seen that" text "Have you seen that"

2
maps/GoldenrodGameCorner.asm
View File

@ -54,7 +54,7 @@ MoveTutorInsideScript:
end end
GoldenrodGameCornerCoinVendorScript: GoldenrodGameCornerCoinVendorScript:
jumpstd gamecornercoinvendor jumpstd GameCornerCoinVendorScript
GoldenrodGameCornerTMVendorScript: GoldenrodGameCornerTMVendorScript:
faceplayer faceplayer

8
maps/GoldenrodGym.asm
View File

@ -85,10 +85,10 @@ GoldenrodGymActivateRockets:
end end
.GoldenrodRockets: .GoldenrodRockets:
jumpstd goldenrodrockets jumpstd GoldenrodRocketsScript
.RadioTowerRockets: .RadioTowerRockets:
jumpstd radiotowerrockets jumpstd RadioTowerRocketsScript
TrainerLassCarrie: TrainerLassCarrie:
trainer LASS, CARRIE, EVENT_BEAT_LASS_CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script trainer LASS, CARRIE, EVENT_BEAT_LASS_CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script
@ -167,10 +167,10 @@ GoldenrodGymGuyScript:
GoldenrodGymStatue: GoldenrodGymStatue:
checkflag ENGINE_PLAINBADGE checkflag ENGINE_PLAINBADGE
iftrue .Beaten iftrue .Beaten
jumpstd gymstatue1 jumpstd GymStatue1Script
.Beaten: .Beaten:
gettrainername STRING_BUFFER_4, WHITNEY, WHITNEY1 gettrainername STRING_BUFFER_4, WHITNEY, WHITNEY1
jumpstd gymstatue2 jumpstd GymStatue2Script
BridgetWalksUpMovement: BridgetWalksUpMovement:
step LEFT step LEFT

4
maps/GoldenrodHappinessRater.asm
View File

@ -64,10 +64,10 @@ GoldenrodHappinessRaterTwinScript:
jumptextfaceplayer GoldenrodHappinessRaterTwinText jumptextfaceplayer GoldenrodHappinessRaterTwinText
HappinessRatersHouseBookshelf: HappinessRatersHouseBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
HappinessRatersHouseRadio: HappinessRatersHouseRadio:
jumpstd radio2 jumpstd Radio2Script
GoldenrodHappinessRaterTeacherText: GoldenrodHappinessRaterTeacherText:
text "If you treat your" text "If you treat your"

4
maps/GoldenrodNameRater.asm
View File

@ -15,10 +15,10 @@ GoldenrodNameRater:
end end
GoldenrodNameRaterBookshelf: GoldenrodNameRaterBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
GoldenrodNameRaterRadio: GoldenrodNameRaterRadio:
jumpstd radio2 jumpstd Radio2Script
INCLUDE "data/text/unused_sweet_honey.asm" INCLUDE "data/text/unused_sweet_honey.asm"

6
maps/GoldenrodPPSpeechHouse.asm
View File

@ -14,13 +14,13 @@ GoldenrodPPSpeechHouseLassScript:
jumptextfaceplayer GoldenrodPPSpeechHouseLassText jumptextfaceplayer GoldenrodPPSpeechHouseLassText
GoldenrodPPSpeechHouseBookshelf2: GoldenrodPPSpeechHouseBookshelf2:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
GoldenrodPPSpeechHouseBookshelf1: GoldenrodPPSpeechHouseBookshelf1:
jumpstd magazinebookshelf jumpstd MagazineBookshelfScript
GoldenrodPPSpeechHouseRadio: GoldenrodPPSpeechHouseRadio:
jumpstd radio2 jumpstd Radio2Script
GoldenrodPPSpeechHouseFisherText: GoldenrodPPSpeechHouseFisherText:
text "Once while I was" text "Once while I was"

2
maps/GoldenrodPokecenter1F.asm
View File

@ -11,7 +11,7 @@ GoldenrodPokecenter1F_MapScripts:
db 0 ; callbacks db 0 ; callbacks
GoldenrodPokecenter1FNurseScript: GoldenrodPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
GoldenrodPokecenter1F_GSBallSceneLeft: GoldenrodPokecenter1F_GSBallSceneLeft:
setval BATTLETOWERACTION_CHECKMOBILEEVENT setval BATTLETOWERACTION_CHECKMOBILEEVENT

2
maps/GuideGentsHouse.asm
View File

@ -10,7 +10,7 @@ GuideGentsHouseGuideGent:
jumptextfaceplayer GuideGentsHouseGuideGentText jumptextfaceplayer GuideGentsHouseGuideGentText
GuideGentsHouseBookshelf: GuideGentsHouseBookshelf:
jumpstd magazinebookshelf jumpstd MagazineBookshelfScript
GuideGentsHouseGuideGentText: GuideGentsHouseGuideGentText:
text "When I was a wee" text "When I was a wee"

2
maps/IcePathB1F.asm
View File

@ -60,7 +60,7 @@ IcePathB1F_MapScripts:
end end
IcePathB1FBoulder: IcePathB1FBoulder:
jumpstd strengthboulder jumpstd StrengthBoulderScript
IcePathB1FIron: IcePathB1FIron:
itemball IRON itemball IRON

2
maps/IcePathB3F.asm
View File

@ -11,7 +11,7 @@ IcePathB3FNevermeltice:
itemball NEVERMELTICE itemball NEVERMELTICE
IcePathB3FRock: IcePathB3FRock:
jumpstd smashrock jumpstd SmashRockScript
IcePathB3F_MapEvents: IcePathB3F_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler

2
maps/IlexForest.asm
View File

@ -422,7 +422,7 @@ IlexForestHiddenFullHeal:
IlexForestBoulder: IlexForestBoulder:
; unused ; unused
jumpstd strengthboulder jumpstd StrengthBoulderScript
IlexForestSignpost: IlexForestSignpost:
jumptext IlexForestSignpostText jumptext IlexForestSignpostText

2
maps/IndigoPlateauPokecenter1F.asm
View File

@ -135,7 +135,7 @@ PlateauRivalScriptDone:
end end
IndigoPlateauPokecenter1FNurseScript: IndigoPlateauPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
IndigoPlateauPokecenter1FClerkScript: IndigoPlateauPokecenter1FClerkScript:
opentext opentext

4
maps/KurtsHouse.asm
View File

@ -426,10 +426,10 @@ KurtsHouseCelebiStatue:
jumptext KurtsHouseCelebiStatueText jumptext KurtsHouseCelebiStatueText
KurtsHouseBookshelf: KurtsHouseBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
KurtsHouseRadio: KurtsHouseRadio:
jumpstd radio2 jumpstd Radio2Script
KurtsHouseKurtExitHouseMovement: KurtsHouseKurtExitHouseMovement:
big_step DOWN big_step DOWN

2
maps/LakeOfRageHiddenPowerHouse.asm
View File

@ -28,7 +28,7 @@ HiddenPowerGuy:
end end
HiddenPowerHouseBookshelf: HiddenPowerHouseBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
HiddenPowerGuyText1: HiddenPowerGuyText1:
text "…You have strayed" text "…You have strayed"

2
maps/LakeOfRageMagikarpHouse.asm
View File

@ -88,7 +88,7 @@ LakeOfRageMagikarpHouseUnusedRecordSign:
jumptext LakeOfRageMagikarpHouseUnusedRecordText jumptext LakeOfRageMagikarpHouseUnusedRecordText
MagikarpHouseBookshelf: MagikarpHouseBookshelf:
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
MagikarpLengthRaterText_LakeOfRageHistory: MagikarpLengthRaterText_LakeOfRageHistory:
text "LAKE OF RAGE is" text "LAKE OF RAGE is"

2
maps/LavRadioTower1F.asm
View File

@ -44,7 +44,7 @@ LavRadioTower1FGentlemanScript:
end end
.receiveitem: .receiveitem:
jumpstd receiveitem jumpstd ReceiveItemScript
end end
.expncardname .expncardname

2
maps/LavenderNameRater.asm
View File

@ -20,7 +20,7 @@ LavenderNameRater:
LavenderNameRaterUnusedBookshelf: LavenderNameRaterUnusedBookshelf:
; unused ; unused
jumpstd difficultbookshelf jumpstd DifficultBookshelfScript
LavenderNameRater_MapEvents: LavenderNameRater_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler

2
maps/LavenderPokecenter1F.asm
View File

@ -10,7 +10,7 @@ LavenderPokecenter1F_MapScripts:
db 0 ; callbacks db 0 ; callbacks
LavenderPokecenter1FNurseScript: LavenderPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
LavenderPokecenter1FGentlemanScript: LavenderPokecenter1FGentlemanScript:
jumptextfaceplayer LavenderPokecenter1FGentlemanText jumptextfaceplayer LavenderPokecenter1FGentlemanText

2
maps/LavenderSpeechHouse.asm
View File

@ -10,7 +10,7 @@ LavenderSpeechHousePokefanFScript:
jumptextfaceplayer LavenderSpeechHousePokefanFText jumptextfaceplayer LavenderSpeechHousePokefanFText
LavenderSpeechHouseBookshelf: LavenderSpeechHouseBookshelf:
jumpstd picturebookshelf jumpstd PictureBookshelfScript
LavenderSpeechHousePokefanFText: LavenderSpeechHousePokefanFText:
text "LAVENDER is a" text "LAVENDER is a"

4
maps/LavenderTown.asm
View File

@ -39,10 +39,10 @@ SoulHouseSign:
jumptext SoulHouseSignText jumptext SoulHouseSignText
LavenderPokecenterSignText: LavenderPokecenterSignText:
jumpstd pokecentersign jumpstd PokecenterSignScript
LavenderMartSignText: LavenderMartSignText:
jumpstd martsign jumpstd MartSignScript
LavenderTownPokefanMText: LavenderTownPokefanMText:
text "That's quite some" text "That's quite some"

8
maps/MahoganyGym.asm
View File

@ -63,10 +63,10 @@ MahoganyGymActivateRockets:
end end
.GoldenrodRockets: .GoldenrodRockets:
jumpstd goldenrodrockets jumpstd GoldenrodRocketsScript
.RadioTowerRockets: .RadioTowerRockets:
jumpstd radiotowerrockets jumpstd RadioTowerRocketsScript
TrainerSkierRoxanne: TrainerSkierRoxanne:
trainer SKIER, ROXANNE, EVENT_BEAT_SKIER_ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script trainer SKIER, ROXANNE, EVENT_BEAT_SKIER_ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script
@ -142,10 +142,10 @@ MahoganyGymGuyScript:
MahoganyGymStatue: MahoganyGymStatue:
checkflag ENGINE_GLACIERBADGE checkflag ENGINE_GLACIERBADGE
iftrue .Beaten iftrue .Beaten
jumpstd gymstatue1 jumpstd GymStatue1Script
.Beaten: .Beaten:
gettrainername STRING_BUFFER_4, PRYCE, PRYCE1 gettrainername STRING_BUFFER_4, PRYCE, PRYCE1
jumpstd gymstatue2 jumpstd GymStatue2Script
PryceText_Intro: PryceText_Intro:
text "#MON have many" text "#MON have many"

2
maps/MahoganyPokecenter1F.asm
View File

@ -10,7 +10,7 @@ MahoganyPokecenter1F_MapScripts:
db 0 ; callbacks db 0 ; callbacks
MahoganyPokecenter1FNurseScript: MahoganyPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd PokecenterNurseScript
MahoganyPokecenter1FPokefanMScript: MahoganyPokecenter1FPokefanMScript:
jumptextfaceplayer MahoganyPokecenter1FPokefanMText jumptextfaceplayer MahoganyPokecenter1FPokefanMText

4
maps/MahoganyRedGyaradosSpeechHouse.asm
View File

@ -28,11 +28,11 @@ MahoganyRedGyaradosSpeechHouseTeacherScript:
MahoganyRedGyaradosSpeechHouseUnusedBookshelf1: MahoganyRedGyaradosSpeechHouseUnusedBookshelf1:
; unused ; unused
jumpstd picturebookshelf jumpstd PictureBookshelfScript
MahoganyRedGyaradosSpeechHouseUnusedBookshelf2: MahoganyRedGyaradosSpeechHouseUnusedBookshelf2:
; unused ; unused
jumpstd magazinebookshelf jumpstd MagazineBookshelfScript
MahoganyRedGyaradosSpeechHouseBlackBeltText: MahoganyRedGyaradosSpeechHouseBlackBeltText:
text "I heard that a red" text "I heard that a red"

2
maps/MahoganyTown.asm
View File

@ -119,7 +119,7 @@ MahoganyGymSign:
jumptext MahoganyGymSignText jumptext MahoganyGymSignText
MahoganyTownPokecenterSign: MahoganyTownPokecenterSign:
jumpstd pokecentersign jumpstd PokecenterSignScript
MovementData_0x1900a4: MovementData_0x1900a4:
step DOWN step DOWN

2
maps/ManiasHouse.asm
View File

@ -97,7 +97,7 @@ ManiaScript:
ManiasHouseUnusedBookshelf: ManiasHouseUnusedBookshelf:
; unused ; unused
jumpstd picturebookshelf jumpstd PictureBookshelfScript
ManiaText_AskLookAfterShuckle: ManiaText_AskLookAfterShuckle:
text "I, I'm in shock!" text "I, I'm in shock!"

2
maps/MountMoonSquare.asm
View File

@ -79,7 +79,7 @@ DontLitterSign:
jumptext DontLitterSignText jumptext DontLitterSignText
MtMoonSquareRock: MtMoonSquareRock:
jumpstd smashrock jumpstd SmashRockScript
PlayerWalksUpToDancingClefairies: PlayerWalksUpToDancingClefairies:
step UP step UP

2
maps/MountMortar1FInside.asm
View File

@ -38,7 +38,7 @@ TrainerSupernerdMarkus:
end end
MountMortar1FBoulder: MountMortar1FBoulder:
jumpstd strengthboulder jumpstd StrengthBoulderScript
MountMortar1FInsideEscapeRope: MountMortar1FInsideEscapeRope:
itemball ESCAPE_ROPE itemball ESCAPE_ROPE

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