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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ELMSLAB_ELM
const ELMSLAB_ELMS_AIDE
const ELMSLAB_POKE_BALL1
@@ -7,7 +7,7 @@
const ELMSLAB_OFFICER
ElmsLab_MapScripts:
db 6 ; scene scripts
def_scene_scripts
scene_script .MeetElm ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_ELMSLAB_CANT_LEAVE
scene_script .DummyScene2 ; SCENE_ELMSLAB_NOTHING
@@ -15,7 +15,7 @@ ElmsLab_MapScripts:
scene_script .DummyScene4 ; SCENE_ELMSLAB_UNUSED
scene_script .DummyScene5 ; SCENE_ELMSLAB_AIDE_GIVES_POTION
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_OBJECTS, .MoveElmCallback
.MeetElm:
@@ -1371,11 +1371,11 @@ ElmsLabPCText:
ElmsLab_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 4, 11, NEW_BARK_TOWN, 1
warp_event 5, 11, NEW_BARK_TOWN, 1
db 8 ; coord events
def_coord_events
coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
coord_event 5, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
coord_event 4, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript
@@ -1385,7 +1385,7 @@ ElmsLab_MapEvents:
coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1
coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2
db 16 ; bg events
def_bg_events
bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine
bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf
bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf
@@ -1403,7 +1403,7 @@ ElmsLab_MapEvents:
bg_event 5, 0, BGEVENT_READ, ElmsLabWindow
bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC
db 6 ; object events
def_object_events
object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1
object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB