diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_835B488.s | 37 | ||||
| -rw-r--r-- | data/event_scripts.s | 1 |
2 files changed, 33 insertions, 5 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s index 2c8a853a8..e0212c964 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -1,3 +1,6 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + .section .rodata .align 2 @@ -1046,14 +1049,38 @@ gUnknown_83EEAC4:: @ 83EEAC4 .incbin "baserom.gba", 0x3EEAC4, 0xA4 gUnknown_83EEB68:: @ 83EEB68 - .incbin "baserom.gba", 0x3EEB68, 0x88 + .incbin "baserom.gba", 0x3EEB68, 0x90 -gUnknown_83EEBF0:: @ 83EEBF0 - .incbin "baserom.gba", 0x3EEBF0, 0x8 + .macro spawn_point map_id, x, y + map \map_id + .2byte \x, \y + .align 2 + .endm -gUnknown_83EEBF8:: @ 83EEBF8 - .incbin "baserom.gba", 0x3EEBF8, 0xA0 + .align 2 +sSpawnPoints:: @ 83EEBF8 + spawn_point MAP_PALLET_TOWN, 0x06, 0x08 + spawn_point MAP_VIRIDIAN_CITY, 0x1a, 0x1b + spawn_point MAP_PEWTER_CITY, 0x11, 0x1a + spawn_point MAP_CERULEAN_CITY, 0x16, 0x14 + spawn_point MAP_LAVENDER_TOWN, 0x06, 0x06 + spawn_point MAP_VERMILION_CITY, 0x0f, 0x07 + spawn_point MAP_CELADON_CITY, 0x30, 0x0c + spawn_point MAP_FUCHSIA_CITY, 0x19, 0x20 + spawn_point MAP_CINNABAR_ISLAND, 0x0e, 0x0c + spawn_point MAP_INDIGO_PLATEAU_EXTERIOR, 0x0b, 0x07 + spawn_point MAP_SAFFRON_CITY_DUPLICATE, 0x18, 0x27 + spawn_point MAP_ROUTE4, 0x0c, 0x06 + spawn_point MAP_ROUTE10, 0x0d, 0x15 + spawn_point MAP_ONE_ISLAND, 0x0e, 0x06 + spawn_point MAP_TWO_ISLAND, 0x15, 0x08 + spawn_point MAP_THREE_ISLAND, 0x0e, 0x1c + spawn_point MAP_FOUR_ISLAND, 0x12, 0x15 + spawn_point MAP_FIVE_ISLAND, 0x12, 0x07 + spawn_point MAP_SEVEN_ISLAND, 0x0c, 0x04 + spawn_point MAP_SIX_ISLAND, 0x0b, 0x0c + .align 2 gUnknown_83EEC98:: @ 83EEC98 .incbin "baserom.gba", 0x3EEC98, 0x50 diff --git a/data/event_scripts.s b/data/event_scripts.s index cff61440b..7f03adfc2 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -9,6 +9,7 @@ #include "constants/trainer_classes.h" #include "constants/vars.h" #include "constants/battle.h" +#include "constants/spawn_points.h" .include "asm/macros.inc" .include "asm/macros/event.inc" @ .include "constants/constants.inc" |