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

@@ -1,11 +1,11 @@
object_const_def ; object_event constants
object_const_def
const ROUTE6SAFFRONGATE_OFFICER
Route6SaffronGate_MapScripts:
db 1 ; scene scripts
def_scene_scripts
scene_script .DummyScene
db 0 ; callbacks
def_callbacks
.DummyScene:
end
@@ -58,15 +58,15 @@ Route6SaffronGuardMagnetTrainText:
Route6SaffronGate_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 4, 0, SAFFRON_CITY, 12
warp_event 5, 0, SAFFRON_CITY, 13
warp_event 4, 7, ROUTE_6, 2
warp_event 5, 7, ROUTE_6, 2
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 1 ; object events
def_object_events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1