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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ROUTE42_FISHER
const ROUTE42_POKEFAN_M
const ROUTE42_SUPER_NERD
@@ -10,11 +10,11 @@
const ROUTE42_SUICUNE
Route42_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; SCENE_ROUTE42_NOTHING
scene_script .DummyScene1 ; SCENE_ROUTE42_SUICUNE
db 0 ; callbacks
def_callbacks
.DummyScene0:
end
@@ -319,24 +319,24 @@ Route42Sign2Text:
Route42_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
def_warp_events
warp_event 0, 8, ROUTE_42_ECRUTEAK_GATE, 3
warp_event 0, 9, ROUTE_42_ECRUTEAK_GATE, 4
warp_event 10, 5, MOUNT_MORTAR_1F_OUTSIDE, 1
warp_event 28, 9, MOUNT_MORTAR_1F_OUTSIDE, 2
warp_event 46, 7, MOUNT_MORTAR_1F_OUTSIDE, 3
db 1 ; coord events
def_coord_events
coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript
db 5 ; bg events
def_bg_events
bg_event 4, 10, BGEVENT_READ, Route42Sign1
bg_event 7, 5, BGEVENT_READ, MtMortarSign1
bg_event 45, 9, BGEVENT_READ, MtMortarSign2
bg_event 54, 8, BGEVENT_READ, Route42Sign2
bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion
db 9 ; object events
def_object_events
object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1
object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1