diff options
| author | mid-kid <esteve.varela@gmail.com> | 2019-11-17 19:47:42 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2019-11-18 18:21:57 +0100 |
| commit | 1c41b2e579315ca582157fb3c824bda8ce4ecbbe (patch) | |
| tree | 02d99983627bbf27fc74b4375a74274fd6025984 | |
| parent | 77803f571fed52bfce19b60ddafd98019c113e99 (diff) | |
Fix some mobile-related things
| -rw-r--r-- | mobile/mobile_40.asm | 10 | ||||
| -rw-r--r-- | sram.asm | 4 | ||||
| -rw-r--r-- | wram.asm | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 1d2856682..53cfae708 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1091,9 +1091,9 @@ Function1006dc: ld [de], a ret -Function1006fd: - ld a, $04 - ld hl, $a800 +MobileBattleResetTimer: + ld a, BANK(sMobileBattleTimer) + ld hl, sMobileBattleTimer call GetSRAMBank xor a ld [hli], a @@ -1274,7 +1274,7 @@ Function100826: .asm_100830 ld [hld], a ccf - ld a, [wBGMapBufferPtrs] + ld a, [wcd70] adc [hl] sub $3c jr nc, .asm_10083c @@ -7551,7 +7551,7 @@ Function10378c: ld a, c and a ret z - farcall Function1006fd + farcall MobileBattleResetTimer ret .failed_to_save @@ -218,7 +218,7 @@ sBTMonPrevPrevTrainer2:: db sBTMonPrevPrevTrainer3:: db -SECTION "Boxes 1-7", SRAM, BANK [2] +SECTION "Boxes 1-7", SRAM sBox1:: box sBox1 sBox2:: box sBox2 @@ -260,7 +260,7 @@ s4_a60e:: dw ; a60e ds $1f0 -sMobileBattleTimer:: ds 3 +sMobileBattleTimer:: ds 3 ; a800 SECTION "SRAM Mobile 2", SRAM @@ -1288,7 +1288,8 @@ wcd6b:: ds 1 wcd6c:: ds 1 wcd6d:: ds 1 wcd6e:: ds 1 -wcd6f:: ds 2 +wcd6f:: ds 1 +wcd70:: ds 1 wcd71:: ds 1 wcd72:: ds 1 wcd73:: ds 1 |