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

@@ -1,14 +1,14 @@
object_const_def ; object_event constants
object_const_def
const LANCESROOM_LANCE
const LANCESROOM_MARY
const LANCESROOM_OAK
LancesRoom_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .LockDoor ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_LANCESROOM_APPROACH_LANCE
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_TILES, .LancesRoomDoors
.LockDoor:
@@ -338,19 +338,19 @@ LancesRoomMaryNoInterviewText:
LancesRoom_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 4, 23, KARENS_ROOM, 3
warp_event 5, 23, KARENS_ROOM, 4
warp_event 4, 1, HALL_OF_FAME, 1
warp_event 5, 1, HALL_OF_FAME, 2
db 2 ; coord events
def_coord_events
coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft
coord_event 5, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight
db 0 ; bg events
def_bg_events
db 3 ; object events
def_object_events
object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LancesRoomLanceScript, -1
object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY