diff options
| -rw-r--r-- | data/battle_anim_80FE840.s | 20 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/battle_anim_utility_funcs.c | 9 |
3 files changed, 5 insertions, 25 deletions
diff --git a/data/battle_anim_80FE840.s b/data/battle_anim_80FE840.s deleted file mode 100644 index 47f512038..000000000 --- a/data/battle_anim_80FE840.s +++ /dev/null @@ -1,20 +0,0 @@ -#include "constants/battle_anim.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata -@ .align 2, 0 - - - .align 2 - -gUnknown_08597418:: @ 8597418 - .2byte 0x7fff - -gUnknown_0859741A:: @ 859741A - .byte 0x08, 0x0a, 0x0c, 0x0e - -gUnknown_0859741E:: @ 859741E - .byte 0x08, 0x0a, 0x0c, 0x0e - - diff --git a/ld_script.txt b/ld_script.txt index 4fc58e204..0e861c558 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -495,7 +495,6 @@ SECTIONS { src/ground.o(.rodata); src/normal.o(.rodata); src/battle_anim_utility_funcs.o(.rodata); - data/battle_anim_80FE840.o(.rodata); src/battle_intro.o(.rodata); src/bike.o(.rodata); data/easy_chat.o(.rodata); diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 1f88c9f62..d9c574e73 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -2,8 +2,9 @@ #include "battle_anim.h" #include "constants/rgb.h" -//asm(".align 2"); -//const u16 gUnknown_08597418 = _RGB(31, 31, 31); +const u16 gUnknown_08597418 = RGB(31, 31, 31); -//gUnknown_08597418:: @ 8597418 -// .2byte 0x7fff +// no clue what these are... +// possibly some register offsets +const u8 gUnknown_0859741A[] = {0x08, 0x0a, 0x0c, 0x0e}; +const u8 gUnknown_0859741E[] = {0x08, 0x0a, 0x0c, 0x0e}; |