diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-03-16 09:40:27 +0100 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-03-16 09:40:27 +0100 |
| commit | 0c4df699ac1c4d2e6085e9e117cd4e1c5879f430 (patch) | |
| tree | 70f50d9f44ef31717adafe9f940e0edf51740388 | |
| parent | 4a15dea90f9b17c2efc29bf45dce6b65c50372d3 (diff) | |
decomp FUN_02024E64
| -rw-r--r-- | arm9/arm9.lsf | 1 | ||||
| -rw-r--r-- | arm9/asm/unk_02024E64.s | 7 | ||||
| -rw-r--r-- | arm9/global.inc | 1 | ||||
| -rw-r--r-- | arm9/src/unk_02024E64_c.c | 5 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index b8accee4..9378c57e 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -89,6 +89,7 @@ Static arm9 Object unk_02023AC4.o Object daycare.o Object pokedex.o + Object unk_02024E64_c.o Object unk_02024E64.o Object options.o Object unk_020250A4.o diff --git a/arm9/asm/unk_02024E64.s b/arm9/asm/unk_02024E64.s index 0234a504..3b57116b 100644 --- a/arm9/asm/unk_02024E64.s +++ b/arm9/asm/unk_02024E64.s @@ -3,13 +3,6 @@ .text - thumb_func_start FUN_02024E64 -FUN_02024E64: ; 0x02024E64 - ldr r0, _02024E68 ; =0x0000074C - bx lr - .balign 4 -_02024E68: .word 0x0000074C - thumb_func_start FUN_02024E6C FUN_02024E6C: ; 0x02024E6C push {r4, lr} diff --git a/arm9/global.inc b/arm9/global.inc index d816d92a..f76e8d5a 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -8519,3 +8519,4 @@ .extern CARDi_InitCommon .extern MonNotFaintedOrEgg .extern CountAlivePokemon +.extern FUN_02024E64
\ No newline at end of file diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c new file mode 100644 index 00000000..aca5698d --- /dev/null +++ b/arm9/src/unk_02024E64_c.c @@ -0,0 +1,5 @@ +#include "global.h" + +THUMB_FUNC u32 FUN_02024E64() { + return 0x0000074C; +} |