diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/used_move_text.asm | 2 | ||||
| -rw-r--r-- | engine/events/bug_contest/contest.asm | 2 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 110 | ||||
| -rw-r--r-- | engine/events/whiteout.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/pic_animation.asm | 40 | ||||
| -rw-r--r-- | engine/link/mystery_gift.asm | 2 |
6 files changed, 80 insertions, 78 deletions
diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 94cec8398..605c48e30 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -5,9 +5,9 @@ DisplayUsedMoveText: jp WaitBGMap UsedMoveText: -; this is a stream of text and asm from 105db9 to 105ef6 text_far _ActorNameText text_asm + ldh a, [hBattleTurn] and a jr nz, .start diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 6a3f77994..90d351304 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -30,7 +30,7 @@ BugCatchingContestOutOfBallsScript: BugCatchingContestReturnToGateScript: closetext - jumpstd bugcontestresultswarp + jumpstd BugContestResultsWarpScript BugCatchingContestTimeUpText: text_far _BugCatchingContestTimeUpText diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index b3a0082e1..3112d40e2 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -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 diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index c9141ac2a..6daa8075d 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -22,7 +22,7 @@ Script_Whiteout: endall .bug_contest - jumpstd bugcontestresultswarp + jumpstd BugContestResultsWarpScript .WhitedOutText: text_far _WhitedOutText diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index fda39e5c6..f2a59b75a 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -48,14 +48,10 @@ AnimateMon_HOF: pokeanim: MACRO rept _NARG -; Workaround for a bug where macro args can't come after the start of a symbol -if !DEF(\1_POKEANIM) -\1_POKEANIM EQUS "PokeAnim_\1_" -endc - db (\1_POKEANIM - PokeAnim_SetupCommands) / 2 + db (PokeAnim_\1_SetupCommand - PokeAnim_SetupCommands) / 2 shift endr - db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2 + db (PokeAnim_Finish_SetupCommand - PokeAnim_SetupCommands) / 2 ENDM PokeAnims: @@ -132,22 +128,24 @@ SetUpPokeAnim: scf ret -PokeAnim_SetupCommands: -setup_command: MACRO -\1_: dw \1 +add_setup_command: MACRO +\1_SetupCommand: + dw \1 ENDM - setup_command PokeAnim_Finish - setup_command PokeAnim_BasePic - setup_command PokeAnim_SetWait - setup_command PokeAnim_Wait - setup_command PokeAnim_Setup - setup_command PokeAnim_Setup2 - setup_command PokeAnim_Idle - setup_command PokeAnim_Play - setup_command PokeAnim_Play2 - setup_command PokeAnim_Cry - setup_command PokeAnim_CryNoWait - setup_command PokeAnim_StereoCry + +PokeAnim_SetupCommands: + add_setup_command PokeAnim_Finish + add_setup_command PokeAnim_BasePic + add_setup_command PokeAnim_SetWait + add_setup_command PokeAnim_Wait + add_setup_command PokeAnim_Setup + add_setup_command PokeAnim_Setup2 + add_setup_command PokeAnim_Idle + add_setup_command PokeAnim_Play + add_setup_command PokeAnim_Play2 + add_setup_command PokeAnim_Cry + add_setup_command PokeAnim_CryNoWait + add_setup_command PokeAnim_StereoCry PokeAnim_SetWait: ld a, 18 diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 83c5a06de..5f09cd2a0 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -1107,7 +1107,7 @@ MysteryGift_CheckAndSetDecorationAlreadyReceived: ld d, $0 ld b, CHECK_FLAG ld hl, sMysteryGiftDecorationsReceived - predef_id SmallFarFlagAction + lda_predef SmallFarFlagAction push hl push bc call Predef |