diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-01-04 20:08:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-04 20:08:43 -0500 |
| commit | 94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (patch) | |
| tree | a3b0d23a7501a337fb150ffb9253b3d5a301c657 /mobile | |
| parent | 9aeb0ab522ad36796b2ace55cca17e7314a3bc9a (diff) | |
| parent | 739a60b33c54021c975f22d627e4b5e40206fe37 (diff) | |
Merge pull request #660 from mid-kid/master
Make the map setup commands match the actual function names better
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_40.asm | 10 | ||||
| -rw-r--r-- | mobile/mobile_45_sprite_engine.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_46.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 84f46f64e..1ae6ae625 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -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 diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index e2863efc6..fe9b68517 100644 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -691,7 +691,7 @@ Function1163c0: ldh [rSVBK], a farcall ReloadMapPart ld a, [wLinkMode] - cp $4 + cp LINK_MOBILE jr z, .asm_11642a ld a, $8 ld [wMusicFade], a diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 1c91e5620..d4ba2fa55 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -7324,7 +7324,7 @@ Function11b7e5: farcall Function17d1f1 ld a, $1 ld [wForceEvolution], a - ld a, $2 + ld a, LINK_TRADECENTER ld [wLinkMode], a farcall EvolvePokemon xor a diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 2350cd0c4..3fe6ce3b8 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -295,7 +295,7 @@ Function17d0f3: farcall Function17d1f1 ld a, $1 ld [wForceEvolution], a - ld a, $2 + ld a, LINK_TRADECENTER ld [wLinkMode], a farcall EvolvePokemon xor a |