diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /engine/overworld/map_sprites.asm | |
| parent | b8954732a3eaa3a784a6e3eaaa68977a9ccd9816 (diff) | |
| parent | 33456b8fb28ef547a54d04d22baa2313b72fdb1d (diff) | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to 'engine/overworld/map_sprites.asm')
| -rwxr-xr-x | engine/overworld/map_sprites.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index 1a877b4a..3e2c3912 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -7,7 +7,7 @@ ; $C1X* and $C2X* are used to denote wSpriteStateData1-wSpriteStateData1 + $ff and wSpriteStateData2 + $00-wSpriteStateData2 + $ff sprite slot ; fields, respectively, within loops. The X is the loop index. ; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y* -; denote fields of the sprite slots interated over in the inner loop. +; denote fields of the sprite slots iterated over in the inner loop. _InitMapSprites: call InitOutsideMapSprites ret c ; return if the map is an outside map (already handled by above call) @@ -308,10 +308,10 @@ GetSplitMapSpriteSetID: ret c ; Chooses the correct sprite set ID depending on the player's position within ; the map for maps with two sprite sets. - cp a, $f8 + cp $f8 jr z, .route20 ld hl, SplitMapSpriteSets - and a, $0f + and $0f dec a add a add a @@ -321,7 +321,7 @@ GetSplitMapSpriteSetID: inc h .noCarry ld a, [hli] ; determines whether the map is split East/West or North/South - cp a, $01 + cp $01 ld a, [hli] ; position of dividing line ld b, a jr z, .eastWestDivide @@ -344,15 +344,15 @@ GetSplitMapSpriteSetID: .route20 ld hl, wXCoord ld a, [hl] - cp a, $2b + cp $2b ld a, $01 ret c ld a, [hl] - cp a, $3e + cp $3e ld a, $0a ret nc ld a, [hl] - cp a, $37 + cp $37 ld b, $08 jr nc, .next ld b, $0d |