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

@@ -1,14 +1,14 @@
object_const_def ; object_event constants
object_const_def
const NEWBARKTOWN_TEACHER
const NEWBARKTOWN_FISHER
const NEWBARKTOWN_SILVER
NewBarkTown_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_FINISHED
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.DummyScene0:
@@ -282,23 +282,23 @@ NewBarkTownElmsHouseSignText:
NewBarkTown_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 6, 3, ELMS_LAB, 1
warp_event 13, 5, PLAYERS_HOUSE_1F, 1
warp_event 3, 11, PLAYERS_NEIGHBORS_HOUSE, 1
warp_event 11, 13, ELMS_HOUSE, 1
db 2 ; coord events
def_coord_events
coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1
coord_event 1, 9, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene2
db 4 ; bg events
def_bg_events
bg_event 8, 8, BGEVENT_READ, NewBarkTownSign
bg_event 11, 5, BGEVENT_READ, NewBarkTownPlayersHouseSign
bg_event 3, 3, BGEVENT_READ, NewBarkTownElmsLabSign
bg_event 9, 13, BGEVENT_READ, NewBarkTownElmsHouseSign
db 3 ; object events
def_object_events
object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN