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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN
const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN
const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
@@ -12,9 +12,9 @@
const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2
FastShipCabins_SE_SSE_CaptainsCabin_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
.DummyScene: ; unreferenced
end
@@ -463,7 +463,7 @@ SSAquaHasArrivedVermilionText:
FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
def_warp_events
warp_event 2, 7, FAST_SHIP_1F, 8
warp_event 3, 7, FAST_SHIP_1F, 8
warp_event 2, 19, FAST_SHIP_1F, 9
@@ -471,12 +471,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
warp_event 2, 33, FAST_SHIP_1F, 10
warp_event 3, 33, FAST_SHIP_1F, 10
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan
db 11 ; object events
def_object_events
object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1