diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-03-01 22:31:28 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-03-01 22:31:28 -0500 |
| commit | f31da089bbd46f56d488b5657f08f8595490e51e (patch) | |
| tree | d6455d4a4c893c997d44241f3599c27039900f8e /misc | |
| parent | 599e6e8d16571235f2054aa38f39e66181da3796 (diff) | |
| parent | 0be6e6c910ea4ab7909d878aa12c4c7989d5ca13 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/mobile_12.asm | 4 | ||||
| -rwxr-xr-x | misc/mobile_5c.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/mobile_12.asm b/misc/mobile_12.asm index 48e740681..dd0f63135 100755 --- a/misc/mobile_12.asm +++ b/misc/mobile_12.asm @@ -1805,8 +1805,8 @@ Function48d94: ; 48d94 (12:4d94) ld [hDivisor], a ld b, 2 call Divide - ld a, [hDivisor] - ld c, $a + ld a, [hRemainder] + ld c, 10 call SimpleDivide sla b sla b diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index b8710a78a..8ecd35edf 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -934,7 +934,7 @@ GFX_172f1f: INCBIN "gfx/unknown/172f1f.2bpp" Tilemap_1733af: -IF DEF(CORRUPT_TILES) +IF DEF(CRYSTAL11) INCBIN "gfx/unknown/1733af_corrupt.tilemap" ELSE INCBIN "gfx/unknown/1733af.tilemap" |