summaryrefslogtreecommitdiff
path: root/engine/spawn_points.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/spawn_points.asm')
-rw-r--r--engine/spawn_points.asm51
1 files changed, 5 insertions, 46 deletions
diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm
index e8f1177f2..daebb6159 100644
--- a/engine/spawn_points.asm
+++ b/engine/spawn_points.asm
@@ -1,58 +1,17 @@
-
-SpawnPoints: ; 0x152ab
-
-spawn: MACRO
-; map, y, x
- map \1
- db \2, \3
-ENDM
-
- spawn KRISS_HOUSE_2F, 3, 3
- spawn VIRIDIAN_POKECENTER_1F, 5, 3
-
- spawn PALLET_TOWN, 5, 6
- spawn VIRIDIAN_CITY, 23, 26
- spawn PEWTER_CITY, 13, 26
- spawn CERULEAN_CITY, 19, 22
- spawn ROUTE_10_NORTH, 11, 2
- spawn VERMILION_CITY, 9, 6
- spawn LAVENDER_TOWN, 5, 6
- spawn SAFFRON_CITY, 9, 30
- spawn CELADON_CITY, 29, 10
- spawn FUCHSIA_CITY, 19, 28
- spawn CINNABAR_ISLAND, 11, 12
- spawn ROUTE_23, 9, 6
-
- spawn NEW_BARK_TOWN, 13, 6
- spawn CHERRYGROVE_CITY, 29, 4
- spawn VIOLET_CITY, 31, 26
- spawn ROUTE_32, 11, 74
- spawn AZALEA_TOWN, 15, 10
- spawn CIANWOOD_CITY, 23, 44
- spawn GOLDENROD_CITY, 15, 28
- spawn OLIVINE_CITY, 13, 22
- spawn ECRUTEAK_CITY, 23, 28
- spawn MAHOGANY_TOWN, 15, 14
- spawn LAKE_OF_RAGE, 21, 29
- spawn BLACKTHORN_CITY, 21, 30
- spawn SILVER_CAVE_OUTSIDE, 23, 20
- spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
- spawn N_A, -1, -1
-
+INCLUDE "data/maps/spawn_points.asm"
LoadSpawnPoint: ; 1531f
- ; loads the spawn point in wd001
+ ; loads the spawn point in DefaultSpawnpoint
push hl
push de
- ld a, [wd001]
+ ld a, [DefaultSpawnpoint]
cp SPAWN_N_A
jr z, .spawn_n_a
ld l, a
ld h, 0
-rept 2 ; multiply hl by 4
- add hl,hl
-endr
+ add hl, hl
+ add hl, hl
ld de, SpawnPoints
add hl, de
ld a, [hli]