summaryrefslogtreecommitdiff
path: root/engine/overworld/scripting.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-10-28 13:35:26 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-10-28 14:39:52 -0400
commitb47bfbd813cc7981ff3b99baa7913933f28d67b9 (patch)
tree0fea9afdc675ac7381e661f6fd344c55dcb32374 /engine/overworld/scripting.asm
parent9483cf47dd62d3c513dade49747e868f49f0e374 (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 a97f7621..105f53e2 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -432,11 +432,11 @@ Script_verbosegiveitem:
ld de, GiveItemScript
jp ScriptCall
-ret_96e71:
+GiveItemScript_DummyFunction:
ret
GiveItemScript:
- callasm ret_96e71
+ callasm GiveItemScript_DummyFunction
writetext .ReceivedItemText
iffalse .Full
waitsfx
@@ -2206,11 +2206,11 @@ Script_endall:
ret
Script_halloffame:
- ld hl, wGameTimerPause
- res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
+ ld hl, wGameTimerPaused
+ res GAME_TIMER_PAUSED_F, [hl]
farcall HallOfFame
- ld hl, wGameTimerPause
- set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
+ ld hl, wGameTimerPaused
+ set GAME_TIMER_PAUSED_F, [hl]
jr ReturnFromCredits
Script_credits: