diff options
author | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
---|---|---|
committer | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
commit | e668b6cf3a7760303edd181baa69901a94a7d653 (patch) | |
tree | b9de2e272aceb5ca4d24830a64ee4fd87e9fb40e /engine/spawn_points.asm | |
parent | 2edf131b056c6d2b1ec9eb48b97fba31b0f953c7 (diff) | |
parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/spawn_points.asm')
-rw-r--r-- | engine/spawn_points.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm index daebb6159..1a3d12441 100644 --- a/engine/spawn_points.asm +++ b/engine/spawn_points.asm @@ -2,10 +2,10 @@ INCLUDE "data/maps/spawn_points.asm" LoadSpawnPoint: ; 1531f - ; loads the spawn point in DefaultSpawnpoint + ; loads the spawn point in wDefaultSpawnpoint push hl push de - ld a, [DefaultSpawnpoint] + ld a, [wDefaultSpawnpoint] cp SPAWN_N_A jr z, .spawn_n_a ld l, a @@ -15,13 +15,13 @@ LoadSpawnPoint: ; 1531f ld de, SpawnPoints add hl, de ld a, [hli] - ld [MapGroup], a + ld [wMapGroup], a ld a, [hli] - ld [MapNumber], a + ld [wMapNumber], a ld a, [hli] - ld [XCoord], a + ld [wXCoord], a ld a, [hli] - ld [YCoord], a + ld [wYCoord], a .spawn_n_a pop de pop hl |