diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-21 12:21:47 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-21 12:21:47 -0400 |
| commit | 98af69691d8994b07c19ef4e86f3f903da6091ed (patch) | |
| tree | f7ad247f6acb3fe642f7579fe117fd67b3cdde24 /mobile | |
| parent | 9433b5a75294a76527bfcb661ee57a43202d7185 (diff) | |
Remove some more raw addresses
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_41.asm | 28 | ||||
| -rw-r--r-- | mobile/mobile_5e.asm | 8 |
2 files changed, 18 insertions, 18 deletions
diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 9ef8a1383..c38bd9fc2 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -247,9 +247,9 @@ StubbedTrainerRankings_StepCount: Unreferenced_StubbedTrainerRankings_BattleTowerWins: ret - ld a, $5 + ld a, BANK(s5_aa8d) call OpenSRAM - ld a, [$aa8d] + ld a, [s5_aa8d] and a call CloseSRAM ret nz @@ -790,16 +790,16 @@ Mobile_DummyReturnFalse: Stubbed_Function106314: ret - ld a, $4 + ld a, BANK(s4_b000) call OpenSRAM ld a, c cpl - ld [$b000], a + ld [s4_b000], a call CloseSRAM - ld a, $7 + ld a, BANK(s7_a800) call OpenSRAM ld a, c - ld [$a800], a + ld [s7_a800], a call CloseSRAM ret @@ -809,27 +809,27 @@ Mobile_AlwaysReturnNotCarry: Function106331: ; called by Mobile_DummyReturnFalse in Crystal-J - ; check ~[4:b000] == [7:a800] - ld a, $4 + ; check ~[s4_b000] == [s7_a800] + ld a, BANK(s4_b000) call OpenSRAM - ld a, [$b000] + ld a, [s4_b000] cpl ld b, a call CloseSRAM - ld a, $7 + ld a, BANK(s7_a800) call OpenSRAM - ld a, [$a800] + ld a, [s7_a800] ld c, a call CloseSRAM ld a, c cp b jr nz, .nope - ; check [7:a800] != 0 + ; check [s7_a800] != 0 and a jr z, .nope - ; check !([7:a800] & %01110000) + ; check !([s7_a800] & %01110000) and %10001111 cp c jr nz, .nope @@ -1023,7 +1023,7 @@ Function106464:: call Get2bpp ld de, $40b0 ld hl, vTiles2 tile $6b - ld b, $f ; XXX no graphics at 0f:40b0 + ld b, $0f ; XXX no graphics at 0f:40b0 call Get2bpp farcall LoadFrame ret diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index fc66b0521..55654d572 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -25,7 +25,7 @@ Function17a68f:: ld hl, $d088 bit 5, [hl] jr z, .asm_17a6a6 - ld de, wStringBuffer1 ; $d073 + ld de, wStringBuffer1 push de call Function17a721 pop de @@ -39,7 +39,7 @@ Function17a68f:: Function17a6a8: push de push bc - ld hl, wStringBuffer2 ; $d086 + ld hl, wStringBuffer2 ld bc, $a xor a call ByteFill @@ -531,7 +531,7 @@ String_17a9b2: db "@" Function17a9cb: - ld de, wVirtualOAM ; $c400 + ld de, wVirtualOAM ld hl, $d088 bit 6, [hl] jr nz, .bit_6_set @@ -773,7 +773,7 @@ Function17abcf: ldh [rSVBK], a ld hl, Palette_17ac55 - ld de, wBGPals1 ; $d000 + ld de, wBGPals1 ld bc, 6 palettes call CopyBytes |