diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-06 22:45:07 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-06 22:45:07 -0400 |
| commit | 8acc8d6e30392a30a8353923219db71527f3a9bb (patch) | |
| tree | e0249b97485ddae4fdc0a410c5ad5add6f711d3e /mobile | |
| parent | aa51dbc61245d5b4949c1872b3d3e915a981ded3 (diff) | |
| parent | 59c4d824e65409f6de211d6e0fd354ca4ef6c61e (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_40.asm | 4 | ||||
| -rw-r--r-- | mobile/mobile_42.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 79324161a..c64e348de 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -2320,7 +2320,7 @@ Function100eb4: ; 100eb4 and a call Function100eca -asm_100eb8 +asm_100eb8: ld hl, wcd68 inc [hl] ld a, [hl] @@ -2332,7 +2332,7 @@ asm_100eb8 Function100ec4: ; 100ec4 ret -Function100ec5 +Function100ec5: ld hl, wcd67 inc [hl] ret diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index eeedffb5a..566b00755 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1293,7 +1293,7 @@ MobileTradeAnim_DisplayReceivedMon: call MobileTradeAnim_MonDisplay_UpdateBGMap ret -MobileTradeAnim_DisplayEggData +MobileTradeAnim_DisplayEggData: call WaitTop call MobileTradeAnim_ClearTilemap ld a, HIGH(vBGMap1) |