Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add requirements to the fields of the object_event macro 

With these changes, the compiler will yell at you if you screw up the number of fields for your event objects while manually editing a map's events.inc. Making these fields required will prevent event corruption of all map events that are included after the map with the messed up fields.
This commit is contained in:
Deokishisu 2018-12-19 12:20:38 -05:00 committed by GitHub
parent b2ac3b6d6f
commit 8edbad78e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
asm/macros/map.inc
View File

@ -14,8 +14,7 @@
.4byte \address .4byte \address
.endm .endm
.macro object_event index, gfx, replacement, x, y, elevation, movement_type, x_radius, y_radius, trainer_type, sight_radius_tree_etc, script, event_flag .macro object_event index:req, gfx:req, replacement:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
.byte \index, \gfx, \replacement, 0
.2byte \x .2byte \x
.2byte \y .2byte \y
.byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0 .byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0