Identify more WRAM labels, and start a <X>_DummyFunction label convention

This commit is contained in:
Rangi
2020-10-28 13:35:39 -04:00
parent 6d333bed5f
commit ea426a8879
42 changed files with 255 additions and 208 deletions

View File

@@ -32,8 +32,8 @@ GameTimer::
ret nz
; Is the timer paused?
ld hl, wGameTimerPause
bit GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
ld hl, wGameTimerPaused
bit GAME_TIMER_PAUSED_F, [hl]
ret z
; Is the timer already capped?

View File

@@ -10,8 +10,8 @@ Reset::
ldh [rIE], a
ei
ld hl, wcfbe
set 7, [hl]
ld hl, wJoypadDisable
set JOYPAD_DISABLE_SGB_TRANSFER_F, [hl]
ld c, 32
call DelayFrames
@@ -50,7 +50,7 @@ Init::
ldh [rOBP1], a
ldh [rTMA], a
ldh [rTAC], a
ld [wd000], a
ld [wUnusedInitializedToZero], a
ld a, %100 ; Start timer at 4096Hz
ldh [rTAC], a

View File

@@ -27,8 +27,8 @@ UpdateJoypad::
; hJoypadSum: pressed so far
; Any of these three bits can be used to disable input.
ld a, [wcfbe]
and %11010000
ld a, [wJoypadDisable]
and (1 << JOYPAD_DISABLE_MON_FAINT_F) | (1 << JOYPAD_DISABLE_SGB_TRANSFER_F) | (1 << 4)
ret nz
; If we're saving, input is disabled.

View File

@@ -56,9 +56,9 @@ GetName::
.done
ld a, e
ld [wUnusedD102], a
ld [wUnusedNamesPointer], a
ld a, d
ld [wUnusedD102 + 1], a
ld [wUnusedNamesPointer + 1], a
pop de
pop bc