Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Relabel some map_object struct fields (#1029)

Browse Source
This commit is contained in:
vulcandth
2023-01-03 21:16:08 -06:00
committed by GitHub
parent 2d40e99d11
commit c01409be5a
7 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
macros/ram.asm
View File

@@ -330,18 +330,20 @@ MACRO object_struct
ENDM
MACRO map_object
\1ObjectStructID:: db
\1ObjectSprite:: db
\1ObjectYCoord:: db
\1ObjectXCoord:: db
\1ObjectMovement:: db
\1ObjectRadius:: db
\1ObjectHour:: db
\1ObjectTimeOfDay:: db
\1ObjectColor:: db
\1ObjectRange:: db
\1ObjectScript:: dw
\1ObjectEventFlag:: dw
\1ObjectStructID:: db
\1ObjectSprite:: db
\1ObjectYCoord:: db
\1ObjectXCoord:: db
\1ObjectMovement:: db
\1ObjectRadius:: db
\1ObjectHour1:: db
\1ObjectHour2::
\1ObjectTimeOfDay:: db
\1ObjectPalette::
\1ObjectType:: db
\1ObjectSightRange:: db
\1ObjectScript:: dw
\1ObjectEventFlag:: dw
ds 2
ENDM

2
macros/scripts/maps.asm
View File

@@ -114,7 +114,7 @@ MACRO object_event
; * if h1 == h2, the object_event will always appear
; * if h1 == -1, h2 is treated as a time-of-day value:
; a combo of MORN, DAY, and/or NITE, or -1 to always appear
;\9: color: a PAL_NPC_* constant, or 0 for sprite default
;\9: palette: a PAL_NPC_* constant, or 0 for sprite default
;\<10>: function: a OBJECTTYPE_* constant
;\<11>: sight range: applies to OBJECTTYPE_TRAINER
;\<12>: script pointer