diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-22 18:03:00 -0500 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-22 18:03:00 -0500 |
commit | d08199c79d8168368aeac0381427d533e09f073d (patch) | |
tree | e97f322f3ec8a6f9e12e3360d358f3ed10ccb4d9 /engine/warp_connection.asm | |
parent | 630d789c70fcd2b87336caf4762be2012790d4a8 (diff) |
Color fns, some more address decoding in link/mobile
Diffstat (limited to 'engine/warp_connection.asm')
-rwxr-xr-x | engine/warp_connection.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index 1443de6d7..26ea2c2c9 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -289,7 +289,7 @@ Function1047a3: ; 1047a3 (41:47a3) ld [hli], a dec c jr nz, .column - ld bc, $20 - SCREEN_WIDTH + ld bc, BG_MAP_WIDTH - SCREEN_WIDTH add hl, bc pop bc dec b @@ -307,11 +307,11 @@ LoadGraphics: ; 1047cf ld [hTileAnimFrame], a callba RefreshSprites call LoadFontsExtra - callba Function106594 + callba LoadOverworldFont ret LoadMapPalettes: ; 1047eb - ld b, SCGB_09 + ld b, SCGB_MAPPALS jp GetSGBLayout ; 1047f0 @@ -329,7 +329,7 @@ RefreshMapSprites: ; 1047f0 call Function2e31 .skip ld a, [wPlayerSpriteSetupFlags] - and $1c + and %00011100 ld [wPlayerSpriteSetupFlags], a ret |