diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-19 20:21:53 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-19 21:57:29 -0500 |
| commit | 4c12ad00d21b43d0946b2a0ba3ee471af9262673 (patch) | |
| tree | 3a133ce12022949fc3ea8a7147c0d3c72a97e0b6 /data | |
| parent | ea8b1011d30c3f70f1da79553d8ed887b12596f2 (diff) | |
| parent | a40f05490040350b8973728fdebe5a48360d4fac (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data')
| -rw-r--r-- | data/librfu_rodata.s | 17 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/data/librfu_rodata.s b/data/librfu_rodata.s deleted file mode 100644 index aa8f5170d..000000000 --- a/data/librfu_rodata.s +++ /dev/null @@ -1,17 +0,0 @@ - .section .rodata - -gUnknown_089A3220:: @ 89A3220 - .byte 2, 14, 0, 10, 9, 5, 7, 2 - .byte 0, 15, 1, 3, 3, 0, 31, 0 - .byte 3, 22, 18, 14, 13, 9, 11, 3 - .byte 15, 15, 1, 3, 3, 0, 0x7f, 0 - - .asciz "RFU_V1026" - - .align 2 -gUnknown_089A324C:: @ 89A324C - .asciz "RFU-MBOOT" - - .align 2 -gUnknown_089A3258:: @ 89A3258 - .asciz "NINTENDOSio32ID_030820" diff --git a/data/specials.inc b/data/specials.inc index b3149f3ed..dea813a76 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -28,7 +28,7 @@ gSpecials:: @ 81DBA64 def_special GetSecretBaseOwnerAndState def_special InitSecretBaseDecorationSprites def_special SetDecoration - def_special GetEventObjectLocalIdByFlag + def_special GetObjectEventLocalIdByFlag def_special GetSecretBaseTypeInFrontOfPlayer def_special SetSecretBaseOwnerGfxId def_special sub_8129708 |