Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use def_* macros for automatic map event counts

Browse Source 
Resolves #742
This commit is contained in:
Rangi
2020-07-24 09:49:26 -04:00
parent 89c47f2170
commit dcb24bc724
392 changed files with 2750 additions and 2695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maps/OlivineCafe.asm
View File

@@ -1,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const OLIVINECAFE_SAILOR1
const OLIVINECAFE_FISHING_GURU
const OLIVINECAFE_SAILOR2
OlivineCafe_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
OlivineCafeStrengthSailorScript:
faceplayer
@@ -79,15 +79,15 @@ OlivineCafeSailorText:
OlivineCafe_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 2, 7, OLIVINE_CITY, 7
warp_event 3, 7, OLIVINE_CITY, 7
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 3 ; object events
def_object_events
object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeStrengthSailorScript, -1
object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1