diff options
| author | obskyr <powpowd@gmail.com> | 2018-07-03 04:50:33 +0200 |
|---|---|---|
| committer | obskyr <powpowd@gmail.com> | 2018-07-03 04:50:33 +0200 |
| commit | 382fd4b50e27cea7e0f97839363235ea2eac14fa (patch) | |
| tree | d9836c547ac68f14a4b1766453334812380d050b /constants/map_object_constants.asm | |
| parent | d26c5f6937518f891d7cb699e237e172588f4a26 (diff) | |
| parent | 2dfc7fc635b13291588ba8aae65fd0ece7211799 (diff) | |
Merge branch 'collisions-movements' of https://github.com/Pokeglitch/pokegold-spaceworld into master
And that's the last of the manual merges for now! Hooray!
Diffstat (limited to 'constants/map_object_constants.asm')
| -rw-r--r-- | constants/map_object_constants.asm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index c9bce93..81c52a3 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -70,3 +70,7 @@ MAPOBJECTTEMPLATE_SCRIPT_POINTER rb 1 ; 9 MAPOBJECTTEMPLATE_POINTER_HI rb 1 ; a MAPOBJECTTEMPLATE_EVENT_FLAG rw 1 ; b MAP_OBJECT_TEMPLATE_LENGTH SET _RS + +PLAYER_OBJECT_INDEX EQU 1 +COMPANION_OBJECT_INDEX EQU 2 +NUM_OBJECT_STRUCTS EQU 10 |