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

@@ -1,13 +1,13 @@
object_const_def ; object_event constants
object_const_def
const OAKSLAB_OAK
const OAKSLAB_SCIENTIST1
const OAKSLAB_SCIENTIST2
const OAKSLAB_SCIENTIST3
OaksLab_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
.DummyScene:
end
@@ -257,13 +257,13 @@ OaksLabPCText:
OaksLab_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 4, 11, PALLET_TOWN, 3
warp_event 5, 11, PALLET_TOWN, 3
db 0 ; coord events
def_coord_events
db 16 ; bg events
def_bg_events
bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf
bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf
bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf
@@ -281,7 +281,7 @@ OaksLab_MapEvents:
bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan
bg_event 0, 1, BGEVENT_READ, OaksLabPC
db 4 ; object events
def_object_events
object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1
object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1
object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1