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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const RADIOTOWER2F_SUPER_NERD
const RADIOTOWER2F_TEACHER
const RADIOTOWER2F_ROCKET1
@@ -12,9 +12,9 @@
const RADIOTOWER2F_RECEPTIONIST
RadioTower2F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
RadioTower2FUnusedDummyScene:
; unused
@@ -712,13 +712,13 @@ RadioTower2FPokemonRadioSignText:
RadioTower2F_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 0, 0, RADIO_TOWER_3F, 1
warp_event 15, 0, RADIO_TOWER_1F, 3
db 0 ; coord events
def_coord_events
db 6 ; bg events
def_bg_events
bg_event 3, 0, BGEVENT_READ, RadioTower2FSalesSign
bg_event 5, 0, BGEVENT_READ, RadioTower2FOaksPKMNTalkSign
bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf
@@ -726,7 +726,7 @@ RadioTower2F_MapEvents:
bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf
bg_event 13, 0, BGEVENT_READ, RadioTower2FPokemonRadioSign
db 11 ; object events
def_object_events
object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower2FTeacherScript, -1
object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER