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/MountMoon.asm
View File

@@ -1,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const MOUNTMOON_SILVER
MountMoon_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .RivalEncounter ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
def_callbacks
.RivalEncounter:
prioritysjump .RivalBattle
@@ -161,7 +161,7 @@ MountMoonSilverTextLoss:
MountMoon_MapEvents:
db 0, 0 ; filler
db 8 ; warp events
def_warp_events
warp_event 3, 3, ROUTE_3, 1
warp_event 15, 15, ROUTE_4, 1
warp_event 13, 3, MOUNT_MOON, 7
@@ -171,9 +171,9 @@ MountMoon_MapEvents:
warp_event 25, 3, MOUNT_MOON, 3
warp_event 25, 13, MOUNT_MOON, 4
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 1 ; object events
def_object_events
object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL