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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const GOLDENRODGYM_WHITNEY
const GOLDENRODGYM_LASS1
const GOLDENRODGYM_LASS2
@@ -7,11 +7,11 @@
const GOLDENRODGYM_GYM_GUIDE
GoldenrodGym_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_NOTHING
scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
db 0 ; callbacks
def_callbacks
.DummyScene0:
end
@@ -380,18 +380,18 @@ GoldenrodGymGuideWinText:
GoldenrodGym_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 2, 17, GOLDENROD_CITY, 1
warp_event 3, 17, GOLDENROD_CITY, 1
db 1 ; coord events
def_coord_events
coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript
db 2 ; bg events
def_bg_events
bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue
bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue
db 6 ; object events
def_object_events
object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymWhitneyScript, -1
object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1