diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 10:50:30 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 10:50:30 -0500 |
| commit | d3e81422d50f937b91df19e058c25ac7288f6063 (patch) | |
| tree | 6de026ed81054668b3885d780fd047fc69fca0ef /home/overworld.asm | |
| parent | abaf9fee7c73e708ef8c3e7a1ed710bfc9ec6f6e (diff) | |
Sync home and macro code with pokeyellow
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index 9d5e42ef..a9cfba24 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -2321,16 +2321,16 @@ LoadMapData:: ; copy current map view to VRAM hlcoord 0, 0 ld de, vBGMap0 - ld b, 18 + ld b, SCREEN_HEIGHT .vramCopyLoop - ld c, 20 + ld c, SCREEN_WIDTH .vramCopyInnerLoop ld a, [hli] ld [de], a inc e dec c jr nz, .vramCopyInnerLoop - ld a, 32 - 20 + ld a, BG_MAP_WIDTH - SCREEN_WIDTH add e ld e, a jr nc, .noCarry @@ -2366,15 +2366,15 @@ SwitchToMapRomBank:: ld c, a ld b, $00 ld a, BANK(MapHeaderBanks) - call BankswitchHome ; switch to ROM bank 3 + call BankswitchHome ld hl, MapHeaderBanks add hl, bc ld a, [hl] - ldh [hMapROMBank], a ; save map ROM bank + ldh [hMapROMBank], a call BankswitchBack ldh a, [hMapROMBank] ldh [hLoadedROMBank], a - ld [MBC1RomBank], a ; switch to map ROM bank + ld [MBC1RomBank], a pop bc pop hl ret @@ -2395,7 +2395,7 @@ ResetUsingStrengthOutOfBattleBit: ForceBikeOrSurf:: ld b, BANK(RedSprite) - ld hl, LoadPlayerSpriteGraphics + ld hl, LoadPlayerSpriteGraphics ; in bank 0 call Bankswitch jp PlayDefaultMusic ; update map/player state? |