diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-22 20:23:19 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-22 20:23:19 -0400 |
| commit | 31287c6aaa71f863a282ccf8ebf43479adff2296 (patch) | |
| tree | cd1728b263d708cb9c821d0e2f6536301c434e82 /engine/events | |
| parent | 3f392c279248562068a80ceaf2884f62a18f6e17 (diff) | |
Revert "Factor out tables into data/overworld/"
This reverts commit 3f392c279248562068a80ceaf2884f62a18f6e17.
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/engine_flags.asm | 2 | ||||
| -rw-r--r-- | engine/events/specials.asm | 2 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 53 |
3 files changed, 54 insertions, 3 deletions
diff --git a/engine/events/engine_flags.asm b/engine/events/engine_flags.asm index aebbacdc..4099dfda 100644 --- a/engine/events/engine_flags.asm +++ b/engine/events/engine_flags.asm @@ -80,4 +80,4 @@ EngineFlagAction:: ld [de], a ret -INCLUDE "data/events/engine_flags.asm" +INCLUDE "data/engine_flags.asm" diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 3cedbf17..6626c081 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -13,7 +13,7 @@ Special:: rst FarCall ret -INCLUDE "data/events/special_pointers.asm" +INCLUDE "data/special_pointers.asm" DummySpecial_c389: ret diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index dc24359b..caa878e0 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -1,4 +1,55 @@ -INCLUDE "data/events/std_scripts.asm" +add_stdscript: MACRO +\1StdScript:: + dba \1 +ENDM + +StdScripts:: + 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 ; unused + 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 AskNumber1FScript + add_stdscript AskNumber2FScript + add_stdscript RegisteredNumberFScript + add_stdscript NumberAcceptedFScript + add_stdscript NumberDeclinedFScript + add_stdscript PhoneFullFScript + add_stdscript RematchFScript + add_stdscript GymStatue1Script + add_stdscript GymStatue2Script + add_stdscript ReceiveItemScript + add_stdscript ReceiveTogepiEggScript + add_stdscript PCScript + add_stdscript GameCornerCoinVendorScript + add_stdscript HappinessCheckScript PokecenterNurseScript: opentext |