diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-05 23:50:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 23:50:02 -0500 |
| commit | 5db3bdd6551fad07066b669db1e44a6151aaa0b4 (patch) | |
| tree | ab357b894c9457b3d1d38fd49300df34412168f8 /engine/overworld | |
| parent | Merge pull request #59 from Rangi42/master (diff) | |
| parent | Sync more with pokered (diff) | |
| download | pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.gz pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.xz pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.zip | |
Merge pull request #60 from Rangi42/master
Organize home and macro code
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/map_sprites.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/specific_script_flags.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index e31c0bd2..ba412ab2 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -304,7 +304,7 @@ GetSplitMapSpriteSetID: ld hl, MapSpriteSets add hl, de ld a, [hl] ; a = spriteSetID - cp a, $f0 ; does the map have 2 sprite sets? + cp $f0 ; does the map have 2 sprite sets? ret c ; Chooses the correct sprite set ID depending on the player's position within ; the map for maps with two sprite sets. diff --git a/engine/overworld/specific_script_flags.asm b/engine/overworld/specific_script_flags.asm index d6f333ac..b59aa9d0 100644 --- a/engine/overworld/specific_script_flags.asm +++ b/engine/overworld/specific_script_flags.asm @@ -8,7 +8,7 @@ SetMapSpecificScriptFlagsOnMapReload:: ld a, [hli] cp c jr z, .in_list - cp a, $ff + cp $ff jr nz, .search_loop ret |