diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/mobile_45.asm | 73 | ||||
| -rw-r--r-- | misc/mobile_5f.asm | 12 |
2 files changed, 43 insertions, 42 deletions
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 95bf8e9fc..ff04cb52f 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -22852,9 +22852,9 @@ Function17024d: ; 17024d ld [ScriptVar], a and a jr nz, .asm_1702a9 - ld a, $1 + ld a, BANK(sbe46) call GetSRAMBank - ld a, [$be46] + ld a, [sbe46] ld [wcf64], a call CloseSRAM ld hl, StringBuffer3 @@ -23176,11 +23176,11 @@ Function1704a2: ; 1704a2 call CopyBytes pop af ld [rSVBK], a - ld a, $1 + ld a, BANK(s1_be45) call GetSRAMBank ld a, $2 - ld [$be45], a - ld hl, $be46 + ld [s1_be45], a + ld hl, sbe46 inc [hl] call CloseSRAM Function1704c9: @@ -23534,22 +23534,23 @@ Jumptable_170696: ; 170696 (5c:4696) dw Function170737 ; 0x1f +; Reset the save memory for BattleTower-Trainers (Counter and all 7 TrainerBytes) Function1706d6: ; 1706d6 (5c:46d6) - ld a, $1 + ld a, BANK(sBTTrainers) call GetSRAMBank ld a, $ff - ld hl, $be48 + ld hl, sBTTrainers ld bc, $7 call ByteFill xor a - ld [$be46], a + ld [sbe46], a call CloseSRAM ret Function1706ee: ; 1706ee (5c:46ee) - ld a, $1 + ld a, BANK(sbe50) call GetSRAMBank - ld a, [$be50] + ld a, [sbe50] call CloseSRAM ld [ScriptVar], a ld hl, NumItems @@ -23575,18 +23576,18 @@ Function1706ee: ; 1706ee (5c:46ee) ret Function17071b: ; 17071b (5c:471b) - ld a, $1 + ld a, BANK(s1_be45) call GetSRAMBank ld a, $3 - ld [$be45], a + ld [s1_be45], a call CloseSRAM ret Function170729: ; 170729 (5c:4729) - ld a, $1 + ld a, BANK(s1_be45) call GetSRAMBank ld a, $4 - ld [$be45], a + ld [s1_be45], a call CloseSRAM ret @@ -23606,10 +23607,10 @@ Function17073e: ; 17073e (5c:473e) cp $1e jr z, Function17073e push af - ld a, $1 + ld a, BANK(sbe50) call GetSRAMBank pop af - ld [$be50], a + ld [sbe50], a call CloseSRAM ret @@ -23618,17 +23619,17 @@ Function17075f: ; 17075f (5c:475f) ld a, [ScriptVar] and a ret z - ld a, $1 + ld a, BANK(sbe4f) call GetSRAMBank - ld a, [$be4f] + ld a, [sbe4f] and $2 ld [ScriptVar], a call CloseSRAM ret Function170778: ; 170778 (5c:4778) - ld hl, $be45 - ld a, $1 + ld hl, s1_be45 + ld a, BANK(s1_be45) call GetSRAMBank ld a, [hl] ld [ScriptVar], a @@ -23636,11 +23637,11 @@ Function170778: ; 170778 (5c:4778) ret Function170788: ; 170788 (5c:4788) - ld a, $1 + ld a, BANK(sbe4f) call GetSRAMBank - ld a, [$be4f] + ld a, [sbe4f] or $2 - ld [$be4f], a + ld [sbe4f], a call CloseSRAM ret @@ -23651,10 +23652,10 @@ Function170799: ; 170799 (5c:4799) Function17079d: ; 17079d (5c:479d) ld c, $0 asm_17079f: ; 17079f (5c:479f) - ld a, $1 + ld a, BANK(s1_be45) call GetSRAMBank ld a, c - ld [$be45], a + ld [s1_be45], a call CloseSRAM ret @@ -23763,27 +23764,27 @@ Function17081d: ; 17081d (5c:481d) ret Function170868: ; 170868 (5c:4868) - ld a, $1 + ld a, BANK(sbe47) call GetSRAMBank ld a, [rSVBK] ; $ff00+$70 push af ld a, $3 ld [rSVBK], a ; $ff00+$70 ld a, [wd000 + $800] - ld [$be47], a + ld [sbe47], a pop af ld [rSVBK], a ; $ff00+$70 call CloseSRAM ret Function170881: ; 170881 (5c:4881) - ld a, $1 + ld a, BANK(sbe47) call GetSRAMBank ld a, [rSVBK] ; $ff00+$70 push af ld a, $3 ld [rSVBK], a ; $ff00+$70 - ld a, [$be47] + ld a, [sbe47] ld [wd000 + $800], a pop af ld [rSVBK], a ; $ff00+$70 @@ -23815,9 +23816,9 @@ Function1708b1: ; 1708b1 (5c:48b1) ret Function1708b9: ; 1708b9 (5c:48b9) - ld a, $1 + ld a, BANK(s1_be3c) call GetSRAMBank - ld a, [$be3c] + ld a, [s1_be3c] ld [ScriptVar], a call CloseSRAM ret @@ -24121,20 +24122,20 @@ Function170abe: ; 170abe (5c:4abe) ld a, [ScriptVar] and a ret z - ld a, $1 + ld a, BANK(sbe4f) call GetSRAMBank - ld a, [$be4f] + ld a, [sbe4f] and $1 ld [ScriptVar], a call CloseSRAM ret Function170ad7: ; 170ad7 (5c:4ad7) - ld a, $1 + ld a, BANK(sbe4f) call GetSRAMBank - ld a, [$be4f] + ld a, [sbe4f] or $1 - ld [$be4f], a + ld [sbe4f], a call CloseSRAM ret diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 15224c404..c8a2d1092 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -2544,7 +2544,7 @@ endr ; 17e026 Function17e026: ; 17e026 - ld a, $1 + ld a, BANK(sBoxCount) call GetSRAMBank ld a, [sBoxCount] call CloseSRAM @@ -2559,7 +2559,7 @@ Function17e026: ; 17e026 callba Function4db83 pop hl pop bc - ld a, $1 + ld a, BANK(sBoxMonNicknames) call GetSRAMBank bit 1, b jr z, .asm_17e067 @@ -4304,9 +4304,9 @@ Function17f334: ; 17f334 ld a, [wcd55] bit 7, a jr nz, .asm_17f355 - ld a, $1 + ld a, BANK(sCrystalData) call GetSRAMBank - ld a, [$be3f] + ld a, [sCrystalData + 2] jr .asm_17f35d .asm_17f355 @@ -4348,9 +4348,9 @@ Function17f382: ; 17f382 ld a, [wcd55] bit 7, a jr nz, .asm_17f3a3 - ld a, $1 + ld a, BANK(sCrystalData) call GetSRAMBank - ld de, $be40 + ld de, sCrystalData + 3 jr .asm_17f3ab .asm_17f3a3 |