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

@@ -1,13 +1,13 @@
object_const_def ; object_event constants
object_const_def
const ROUTE34ILEXFORESTGATE_TEACHER1
const ROUTE34ILEXFORESTGATE_BUTTERFREE
const ROUTE34ILEXFORESTGATE_LASS
const ROUTE34ILEXFORESTGATE_TEACHER2
Route34IlexForestGate_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_OBJECTS, .IsForestRestless
.IsForestRestless:
@@ -136,18 +136,18 @@ Route34IlexForestGateLassText:
Route34IlexForestGate_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 4, 0, ROUTE_34, 1
warp_event 5, 0, ROUTE_34, 2
warp_event 4, 7, ILEX_FOREST, 1
warp_event 5, 7, ILEX_FOREST, 1
db 1 ; coord events
def_coord_events
coord_event 4, 7, SCENE_DEFAULT, Route34IlexForestGateCelebiEvent
db 0 ; bg events
def_bg_events
db 4 ; object events
def_object_events
object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateTeacherScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateButterfreeScript, -1
object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS