summaryrefslogtreecommitdiff
path: root/engine/overworld/scripting.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-10-28 13:35:39 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-10-28 14:34:38 -0400
commitea426a88794b1d216a278b54d18cefafbf7d8771 (patch)
tree732c7a81c528251b651b6441d0f4a974548beb2c /engine/overworld/scripting.asm
parent6d333bed5fde0c2da0a6a9df2ccae83933400e42 (diff)
Identify more WRAM labels, and start a <X>_DummyFunction label convention
Diffstat (limited to 'engine/overworld/scripting.asm')
-rw-r--r--engine/overworld/scripting.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 9ba79f5e0..8258ea830 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -458,11 +458,11 @@ Script_verbosegiveitem:
ld de, GiveItemScript
jp ScriptCall
-ret_96f76:
+GiveItemScript_DummyFunction:
ret
GiveItemScript:
- callasm ret_96f76
+ callasm GiveItemScript_DummyFunction
writetext .ReceivedItemText
iffalse .Full
waitsfx
@@ -2316,13 +2316,13 @@ Script_endall:
ret
Script_halloffame:
- ld hl, wGameTimerPause
- res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
+ ld hl, wGameTimerPaused
+ res GAME_TIMER_PAUSED_F, [hl]
farcall StubbedTrainerRankings_HallOfFame
farcall StubbedTrainerRankings_HallOfFame2
farcall HallOfFame
- ld hl, wGameTimerPause
- set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
+ ld hl, wGameTimerPaused
+ set GAME_TIMER_PAUSED_F, [hl]
jr ReturnFromCredits
Script_credits: