diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 13:35:39 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 14:34:38 -0400 |
| commit | ea426a88794b1d216a278b54d18cefafbf7d8771 (patch) | |
| tree | 732c7a81c528251b651b6441d0f4a974548beb2c /mobile | |
| parent | 6d333bed5fde0c2da0a6a9df2ccae83933400e42 (diff) | |
Identify more WRAM labels, and start a <X>_DummyFunction label convention
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_22.asm | 12 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 12 | ||||
| -rw-r--r-- | mobile/mobile_5b.asm | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index dfd23b8b0..75a6bd49e 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -20,18 +20,18 @@ OpenSRAMBank4: ret Function89168: - ld hl, wGameTimerPause - set GAMETIMERPAUSE_MOBILE_7_F, [hl] + ld hl, wGameTimerPaused + set GAME_TIMER_MOBILE_F, [hl] ret Function8916e: - ld hl, wGameTimerPause - res GAMETIMERPAUSE_MOBILE_7_F, [hl] + ld hl, wGameTimerPaused + res GAME_TIMER_MOBILE_F, [hl] ret Function89174: - ld hl, wGameTimerPause - bit GAMETIMERPAUSE_MOBILE_7_F, [hl] + ld hl, wGameTimerPaused + bit GAME_TIMER_MOBILE_F, [hl] ret Function8917a: diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 0e3bfe145..677216bc6 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -2660,8 +2660,8 @@ Function1011f1: call CloseSRAM ld hl, wdc41 res 4, [hl] - ld hl, wGameTimerPause - bit GAMETIMERPAUSE_MOBILE_7_F, [hl] + ld hl, wGameTimerPaused + bit GAME_TIMER_MOBILE_F, [hl] jr z, .skip ld hl, wdc41 set 4, [hl] @@ -4425,15 +4425,15 @@ Function101e98: call ClearSprites farcall Function8adb3 ret c - ld hl, wGameTimerPause - set GAMETIMERPAUSE_MOBILE_7_F, [hl] + ld hl, wGameTimerPaused + set GAME_TIMER_MOBILE_F, [hl] ld hl, wdc41 set 4, [hl] ret Function101ead: - ld hl, wGameTimerPause - bit GAMETIMERPAUSE_MOBILE_7_F, [hl] + ld hl, wGameTimerPaused + bit GAME_TIMER_MOBILE_F, [hl] jr nz, .asm_101ec8 ld hl, wdc41 bit 2, [hl] diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index 2002facb5..297891e4f 100644 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -7,11 +7,11 @@ Function16c000: ; unreferenced ldh a, [hSystemBooted] and a ret z - ; Set some flag, preserving the old state - ld a, [wcfbe] + ; Disable the joypad during mobile setup + ld a, [wJoypadDisable] push af - set 7, a - ld [wcfbe], a + set JOYPAD_DISABLE_SGB_TRANSFER_F, a + ld [wJoypadDisable], a ; Do stuff call MobileSystemSplashScreen_InitGFX ; Load GFX farcall SetRAMStateForMobile @@ -24,7 +24,7 @@ Function16c000: ; unreferenced ldh [hSystemBooted], a ; Restore the flag state pop af - ld [wcfbe], a + ld [wJoypadDisable], a ret .RunJumptable: |