diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-08-03 13:01:18 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-08-03 13:01:18 -0700 |
| commit | eafe4ed7d6f7f33ff1c2762e55494fdfa7a7abf3 (patch) | |
| tree | ce1a307008e143e84f6867c17fd7cf14a3c86a44 | |
| parent | 6e6f69b23d0905453b41ce58fe1d8edd72984023 (diff) | |
Field object priorities incbin.
| -rw-r--r-- | asm/rom4.s | 10 | ||||
| -rw-r--r-- | data/data2.s | 19 |
2 files changed, 16 insertions, 13 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index 90f529a97..7c9bca10a 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -38106,8 +38106,8 @@ _08063D06: pop {r0} bx r0 .align 2, 0 -_08063D0C: .4byte gUnknown_08376070 -_08063D10: .4byte gUnknown_08376060 +_08063D0C: .4byte gFieldObjectPriorities_08376070 +_08063D10: .4byte gFieldObjectPriorities_08376060 thumb_func_end FieldObjectUpdateZCoordAndPriority thumb_func_start InitObjectPriorityByZCoord @@ -38147,8 +38147,8 @@ InitObjectPriorityByZCoord: @ 8063D14 pop {r0} bx r0 .align 2, 0 -_08063D58: .4byte gUnknown_08376070 -_08063D5C: .4byte gUnknown_08376060 +_08063D58: .4byte gFieldObjectPriorities_08376070 +_08063D5C: .4byte gFieldObjectPriorities_08376060 thumb_func_end InitObjectPriorityByZCoord thumb_func_start ZCoordToPriority @@ -38160,7 +38160,7 @@ ZCoordToPriority: @ 8063D60 ldrb r0, [r0] bx lr .align 2, 0 -_08063D6C: .4byte gUnknown_08376060 +_08063D6C: .4byte gFieldObjectPriorities_08376060 thumb_func_end ZCoordToPriority thumb_func_start FieldObjectUpdateZCoord diff --git a/data/data2.s b/data/data2.s index f55c561ac..8ea42bc82 100644 --- a/data/data2.s +++ b/data/data2.s @@ -7015,14 +7015,17 @@ gUnknown_08376050:: @ 8376050 .incbin "baserom.gba", 0x00376050, 0x10 .align 2 -gUnknown_08376060:: @ 8376060 - .4byte 0x02020202 @ are these even pointers? - .4byte 0x02010201 - .4byte 0x02010201 - .4byte 0x02000001 - -gUnknown_08376070:: @ 8376070 - .incbin "baserom.gba", 0x00376070, 0x10 +@ Each byte corresponds to a sprite priority for a field object. +@ This is directly the inverse of gFieldObjectPriorities_08376070. +gFieldObjectPriorities_08376060:: @ 8376060 + .byte 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2 + +@ Each byte corresponds to a sprite priority for a field object. +@ This is the inverse of gFieldObjectPriorities_08376060. +@ 1 = Above player sprite +@ 2 = Below player sprite +gFieldObjectPriorities_08376070:: @ 8376070 + .byte 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1 .align 2 gUnknown_08376080:: @ 8376080 |