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

@@ -1,13 +1,13 @@
object_const_def ; object_event constants
object_const_def
const MRPOKEMONSHOUSE_GENTLEMAN
const MRPOKEMONSHOUSE_OAK
MrPokemonsHouse_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .MeetMrPokemon ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
def_callbacks
.MeetMrPokemon:
prioritysjump .MrPokemonEvent
@@ -373,19 +373,19 @@ MrPokemonsHouse_StrangeCoinsText:
MrPokemonsHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 2, 7, ROUTE_30, 2
warp_event 3, 7, ROUTE_30, 2
db 0 ; coord events
def_coord_events
db 5 ; bg events
def_bg_events
bg_event 0, 1, BGEVENT_READ, MrPokemonsHouse_ForeignMagazines
bg_event 1, 1, BGEVENT_READ, MrPokemonsHouse_ForeignMagazines
bg_event 6, 1, BGEVENT_READ, MrPokemonsHouse_BrokenComputer
bg_event 7, 1, BGEVENT_READ, MrPokemonsHouse_BrokenComputer
bg_event 6, 4, BGEVENT_READ, MrPokemonsHouse_StrangeCoins
db 2 ; object events
def_object_events
object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1
object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK