diff options
| -rw-r--r-- | arm9/asm/scrcmd_25.s | 30 | ||||
| -rw-r--r-- | arm9/asm/unk_02038C78.s | 8 | ||||
| -rw-r--r-- | arm9/global.inc | 8 | ||||
| -rw-r--r-- | arm9/src/scrcmd_25.c | 27 | ||||
| -rw-r--r-- | include/scrcmd.h | 6 |
5 files changed, 41 insertions, 38 deletions
diff --git a/arm9/asm/scrcmd_25.s b/arm9/asm/scrcmd_25.s deleted file mode 100644 index ab6d4787..00000000 --- a/arm9/asm/scrcmd_25.s +++ /dev/null @@ -1,30 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - thumb_func_start FUN_02046010 -FUN_02046010: ; 0x02046010 - push {r3, lr} - bl ErrorHandling - mov r0, #0x0 - pop {r3, pc} - .balign 4 - - thumb_func_start FUN_0204601C -FUN_0204601C: ; 0x0204601C - push {r3, lr} - bl ErrorHandling - mov r0, #0x0 - pop {r3, pc} - .balign 4 - - thumb_func_start FUN_02046028 -FUN_02046028: ; 0x02046028 - mov r0, #0x0 - bx lr - - thumb_func_start FUN_0204602C -FUN_0204602C: ; 0x0204602C - mov r0, #0x0 - bx lr diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 9ef2c97d..c876dcc6 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -724,10 +724,10 @@ gScriptCmdTable: ; 0x020F355C .word FUN_0203EB48 .word FUN_0203EB88 .word FUN_02042D1C - .word FUN_02046010 - .word FUN_0204601C - .word FUN_02046028 - .word FUN_0204602C + .word ScrCmd_Unk02EF + .word ScrCmd_Unk02F0 + .word ScrCmd_Unk02F1 + .word ScrCmd_Unk02F2 .word FUN_0203C5BC .word FUN_0203C614 .word FUN_0203C680 diff --git a/arm9/global.inc b/arm9/global.inc index 250c218c..cac00e2d 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -3416,10 +3416,10 @@ .extern FUN_02045F84 .extern FUN_02045F88 .extern FUN_02045FCC -.extern FUN_02046010 -.extern FUN_0204601C -.extern FUN_02046028 -.extern FUN_0204602C +.extern ScrCmd_Unk02EF +.extern ScrCmd_Unk02F0 +.extern ScrCmd_Unk02F1 +.extern ScrCmd_Unk02F2 .extern FUN_02046030 .extern SavArray_Flags_sizeof .extern SavArray_Flags_init diff --git a/arm9/src/scrcmd_25.c b/arm9/src/scrcmd_25.c new file mode 100644 index 00000000..e3638675 --- /dev/null +++ b/arm9/src/scrcmd_25.c @@ -0,0 +1,27 @@ +#include "scrcmd.h" + +THUMB_FUNC BOOL ScrCmd_Unk02EF(struct ScriptContext * ctx) +{ +#pragma unused(ctx) + GF_ASSERT(FALSE); + return FALSE; +} + +THUMB_FUNC BOOL ScrCmd_Unk02F0(struct ScriptContext * ctx) +{ +#pragma unused(ctx) + GF_ASSERT(FALSE); + return FALSE; +} + +THUMB_FUNC BOOL ScrCmd_Unk02F1(struct ScriptContext * ctx) +{ +#pragma unused(ctx) + return FALSE; +} + +THUMB_FUNC BOOL ScrCmd_Unk02F2(struct ScriptContext * ctx) +{ +#pragma unused(ctx) + return FALSE; +} diff --git a/include/scrcmd.h b/include/scrcmd.h index 2e412760..35d1a45d 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -95,4 +95,10 @@ BOOL ScrCmd_Unk01F5(struct ScriptContext* ctx); BOOL ScrCmd_Unk01F2(struct ScriptContext* ctx); BOOL ScrCmd_Unk01F3(struct ScriptContext* ctx); +//scrcmd_25.c +BOOL ScrCmd_Unk02EF(struct ScriptContext* ctx); +BOOL ScrCmd_Unk02F0(struct ScriptContext* ctx); +BOOL ScrCmd_Unk02F1(struct ScriptContext* ctx); +BOOL ScrCmd_Unk02F2(struct ScriptContext* ctx); + #endif //POKEDIAMOND_SCRCMD_H |