diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-09 21:30:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 21:30:24 -0400 |
| commit | 40b537d45b4b8937038126f7e5d2d21ccee460c0 (patch) | |
| tree | 881a090b80b2c22985fc6d1231b03c6721a83462 /engine/overworld | |
| parent | e4b41fad4fd3787ca2e61adb5377ba8f68fca7ef (diff) | |
| parent | 53ff57ca663dc5bf9c3731022b0eb0dc73f2207f (diff) | |
Merge pull request #503 from Rangi42/master
Factor wMisc into meaningful parts; move most code out of home.asm
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/load_map_part.asm | 6 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 10 | ||||
| -rw-r--r-- | engine/overworld/variables.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/warp_connection.asm | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engine/overworld/load_map_part.asm b/engine/overworld/load_map_part.asm index 2184ebf7e..9eeef7259 100644 --- a/engine/overworld/load_map_part.asm +++ b/engine/overworld/load_map_part.asm @@ -1,9 +1,9 @@ _LoadMapPart:: ; 4d15b - ld hl, wMisc + ld hl, wSurroundingTiles ld a, [wMetatileStandingY] and a jr z, .top_row - ld bc, WMISC_WIDTH * 2 + ld bc, SURROUNDING_WIDTH * 2 add hl, bc .top_row @@ -25,7 +25,7 @@ _LoadMapPart:: ; 4d15b dec c jr nz, .loop2 ld a, l - add 4 + add METATILE_WIDTH ld l, a jr nc, .carry inc h diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index e2918a45b..9aaf98f39 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -1359,7 +1359,7 @@ Script_startbattle: call BufferScreen predef StartBattle ld a, [wBattleResult] - and $3f + and $ff ^ BATTLERESULT_BITMASK ld [wScriptVar], a ret @@ -1378,10 +1378,10 @@ Script_reloadmapafterbattle: ld hl, wBattleScriptFlags ld d, [hl] - ld [hl], $0 + ld [hl], 0 ld a, [wBattleResult] - and $3f - cp $1 + and $ff ^ BATTLERESULT_BITMASK + cp LOSE jr nz, .notblackedout ld b, BANK(Script_BattleWhiteout) ld hl, Script_BattleWhiteout @@ -1395,7 +1395,7 @@ Script_reloadmapafterbattle: .was_wild ld a, [wBattleResult] - bit 7, a + bit BATTLERESULT_BOX_FULL, a jr z, .done ld b, BANK(Script_SpecialBillCall) ld de, Script_SpecialBillCall diff --git a/engine/overworld/variables.asm b/engine/overworld/variables.asm index 89026fdba..3adf6df33 100644 --- a/engine/overworld/variables.asm +++ b/engine/overworld/variables.asm @@ -146,6 +146,6 @@ _GetVarAction:: ; 80648 (20:4648) .BattleResult: ; 80728 ld a, [wBattleResult] - and $3f + and $ff ^ BATTLERESULT_BITMASK jp .loadstringbuffer2 ; 80730 diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index 069b72234..2f5e488cc 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -392,7 +392,7 @@ CheckMovingOffEdgeOfMap:: ; 104820 (41:4820) GetCoordOfUpperLeftCorner:: ; 10486d - ld hl, wOverworldMap + ld hl, wOverworldMapBlocks ld a, [wXCoord] bit 0, a jr nz, .increment_then_halve1 |