Merge pull request #660 from mid-kid/master

Make the map setup commands match the actual function names better
This commit is contained in:
Rangi
2020-01-04 20:08:43 -05:00
committed by GitHub
24 changed files with 233 additions and 225 deletions

View File

@@ -1089,9 +1089,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
@@ -1272,7 +1272,7 @@ Function100826:
.asm_100830
ld [hld], a
ccf
ld a, [wBGMapBufferPtrs]
ld a, [wcd70]
adc [hl]
sub $3c
jr nc, .asm_10083c
@@ -7543,7 +7543,7 @@ Function10378c:
ld a, c
and a
ret z
farcall Function1006fd
farcall MobileBattleResetTimer
ret
.failed_to_save