pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues 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/FastShipB1F.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const FASTSHIPB1F_SAILOR1
const FASTSHIPB1F_SAILOR2
const FASTSHIPB1F_SAILOR3
@@ -13,11 +13,11 @@
const FASTSHIPB1F_YOUNGSTER2
FastShipB1F_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_FINISHED
db 0 ; callbacks
def_callbacks
.DummyScene0:
end
@@ -449,18 +449,18 @@ SchoolboyRickyAfterBattleText:
FastShipB1F_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 5, 11, FAST_SHIP_1F, 11
warp_event 31, 13, FAST_SHIP_1F, 12
db 2 ; coord events
def_coord_events
coord_event 30, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksLeft
coord_event 31, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight
db 1 ; bg events
def_bg_events
bg_event 27, 9, BGEVENT_READ, FastShipB1FTrashcan
db 12 ; object events
def_object_events
object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP