diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/legacy.asm | 54 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 4 |
2 files changed, 56 insertions, 2 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index 8c6f2a9dd..3ba19d234 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -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" diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index b7aa1a1fb..6082c6b13 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -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 |