diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /engine/overworld/spawn_points.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/overworld/spawn_points.asm')
| -rw-r--r-- | engine/overworld/spawn_points.asm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm index 1a3d12441..6b4476f2b 100644 --- a/engine/overworld/spawn_points.asm +++ b/engine/overworld/spawn_points.asm @@ -1,7 +1,6 @@ INCLUDE "data/maps/spawn_points.asm" - -LoadSpawnPoint: ; 1531f +LoadSpawnPoint: ; loads the spawn point in wDefaultSpawnpoint push hl push de @@ -26,10 +25,8 @@ LoadSpawnPoint: ; 1531f pop de pop hl ret -; 15344 - -IsSpawnPoint: ; 15344 +IsSpawnPoint: ; Checks if the map loaded in de is a spawn point. Returns carry if it's a spawn point. ld hl, SpawnPoints ld c, 0 @@ -59,4 +56,3 @@ IsSpawnPoint: ; 15344 .yes scf ret -; 15363 |