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

@@ -1,13 +1,13 @@
object_const_def ; object_event constants
object_const_def
const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER
const BATTLETOWEROUTSIDE_BEAUTY
const BATTLETOWEROUTSIDE_SAILOR
const BATTLETOWEROUTSIDE_LASS
BattleTowerOutside_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 2 ; callbacks
def_callbacks
callback MAPCALLBACK_TILES, .Callback1
callback MAPCALLBACK_OBJECTS, .Callback2
@@ -134,18 +134,18 @@ BattleTowerOutsideText_DoorsOpen:
BattleTowerOutside_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3
warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4
warp_event 8, 9, BATTLE_TOWER_1F, 1
warp_event 9, 9, BATTLE_TOWER_1F, 2
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 10, 10, BGEVENT_READ, BattleTowerOutsideSign
db 4 ; object events
def_object_events
object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
object_event 13, 11, SPRITE_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -1
object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR