diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 19:11:48 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 19:11:48 -0500 |
| commit | aa9a45c16fbaee2fffc94e4741e0a1f203b244bc (patch) | |
| tree | 9bdd507453e9b51ff52216d9f04bda62ac799cfb /asm/script_pokemon_util_80F87D8.s | |
| parent | ed245b677addbb7f5c748193301507de7fed6ec4 (diff) | |
Rebrand 'map object' and 'field object' to 'event object'
Diffstat (limited to 'asm/script_pokemon_util_80F87D8.s')
| -rw-r--r-- | asm/script_pokemon_util_80F87D8.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index b241e3778..18a0cec88 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -505,10 +505,10 @@ _080F8BBA: ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 - ldr r2, =gMapObjects + ldr r2, =gEventObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -534,12 +534,12 @@ _080F8BBA: cmp r0, 0 bne _080F8C2C lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette33 + ldr r0, =gEventObjectPalette33 b _080F8C42 .pool _080F8C2C: lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette34 + ldr r0, =gEventObjectPalette34 b _080F8C42 .pool _080F8C38: @@ -547,7 +547,7 @@ _080F8C38: cmp r0, 0 bne _080F8C50 lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette8 + ldr r0, =gEventObjectPalette8 _080F8C42: movs r2, 0x20 bl LoadPalette @@ -555,7 +555,7 @@ _080F8C42: .pool _080F8C50: lsrs r1, r4, 16 - ldr r0, =gFieldObjectPalette17 + ldr r0, =gEventObjectPalette17 movs r2, 0x20 bl LoadPalette _080F8C5A: |