diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 13:35:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 14:39:52 -0400 |
| commit | b47bfbd813cc7981ff3b99baa7913933f28d67b9 (patch) | |
| tree | 0fea9afdc675ac7381e661f6fd344c55dcb32374 /engine/overworld | |
| parent | 9483cf47dd62d3c513dade49747e868f49f0e374 (diff) | |
Identify more WRAM labels, and start a <X>_DummyFunction label convention
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/events.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/overworld.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index fda0149e..ee2facbe 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -800,7 +800,7 @@ PlayerMovement: CheckMenuOW: xor a ldh [hMenuReturn], a - ldh [hUnusedFFA3], a + ldh [hUnusedByte], a ldh a, [hJoyPressed] bit SELECT_F, a diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm index 0d285d2a..40157524 100644 --- a/engine/overworld/overworld.asm +++ b/engine/overworld/overworld.asm @@ -119,7 +119,7 @@ AddOutdoorSprites: dec c jr nz, .loop - ld a, [wUnusedD05A] + ld a, [wUnusedAddOutdoorSpritesReturnValue] ld c, a ret 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: |