diff options
| author | Tauwasser <Tauwasser@tauwasser.eu> | 2018-06-13 22:11:18 +0200 |
|---|---|---|
| committer | Tauwasser <Tauwasser@tauwasser.eu> | 2018-06-13 22:11:18 +0200 |
| commit | dc5c098655a38d058c78e738c456f443048b4fa4 (patch) | |
| tree | 17722acbe74db37b76e6b7e081a34fc203e8850c | |
| parent | c7acfb34523c0fa10b4f002bce229a15b91e580f (diff) | |
home: fix two disassembly errors
don't disassemble at 2am, kids
Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
| -rw-r--r-- | home/overworld.asm | 9 | ||||
| -rw-r--r-- | home/tileset.asm | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index bd0cc4c..afa73cc 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -44,6 +44,7 @@ CheckStartmenuSelectHook: Function2c4a: ; 2c4a (0:2c4a) ; copy of Function2ba8 +; calling Functiond4e6 instead of Functiond6e4 .loop call Function2c5a and a @@ -61,10 +62,10 @@ Function2c5a: ; 2c5a (0:2c5a) ld a, BANK(Function50b9) call Bankswitch call Function50b9 - call Function_18a0 - ld a, BANK(Functiond6e4) + call Function18a0 + ld a, BANK(Functiond4e6) call Bankswitch - call Functiond6e4 + call Functiond4e6 ld a, BANK(_UpdateSprites) call Bankswitch call _UpdateSprites @@ -124,7 +125,7 @@ ScheduleEastColumnRedraw: ; 2cd0 (0:2cd0) and ($FF ^ (BG_MAP_WIDTH - 1)) ; mask upper address bits ld b, a ld a, c - add SCREEN_WIDTH + add SCREEN_WIDTH - 2 and BG_MAP_WIDTH - 1 ; mask lower address bits or b ldh [hRedrawRowOrColumnDest], a diff --git a/home/tileset.asm b/home/tileset.asm index 30ac0e2..aabf249 100644 --- a/home/tileset.asm +++ b/home/tileset.asm @@ -10,7 +10,7 @@ LoadTilesetGFX:: ; 2d26 cp ROUTE jr z, .exterior ld a, [wMapTileset] - cp TILESET_SS_ANNE_DOCK + cp TILESET_FOREST jr z, .exterior ld a, [wTilesetTilesAddress] |