diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-04-19 18:59:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 18:59:12 +0200 |
| commit | b9b637fb049e9c08b1b857b69aa74f6056ff9ac7 (patch) | |
| tree | 24d42113f705d7d9f555fee383e4534795b90e44 /include | |
| parent | dcb4eea28034cb3be345736dbc9bb223f3ace92a (diff) | |
| parent | a63d14b3b4821c69e7b6d31023906e5b32c9bb75 (diff) | |
Merge branch 'master' into unk_02031480
Diffstat (limited to 'include')
| -rw-r--r-- | include/unk_0202D858.h | 10 | ||||
| -rw-r--r-- | include/unk_0202F150.h | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/unk_0202D858.h b/include/unk_0202D858.h new file mode 100644 index 00000000..210821d0 --- /dev/null +++ b/include/unk_0202D858.h @@ -0,0 +1,10 @@ +#ifndef POKEDIAMOND_UNK_0202D858_H +#define POKEDIAMOND_UNK_0202D858_H + +#include "global.h" + +THUMB_FUNC u8 FUN_0202D858(u16 param0); +THUMB_FUNC u8 FUN_0202D884(u16 param0); +THUMB_FUNC u32 FUN_0202D8B0(int param0); + +#endif // POKEDIAMOND_UNK_0202D858_H diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h index 3996c1c8..77fb4f7d 100644 --- a/include/unk_0202F150.h +++ b/include/unk_0202F150.h @@ -6,6 +6,7 @@ #include "RTC_api.h" #include "heap.h" #include "main.h" +#include "unk_0202D858.h" struct UnkStruct0202F150_sub1 { @@ -163,8 +164,8 @@ THUMB_FUNC u32 FUN_020311DC(u32 param0); THUMB_FUNC u32 FUN_020311E8(); THUMB_FUNC u32 FUN_020311F0(); THUMB_FUNC int FUN_02031228(u16 param0); -THUMB_FUNC u32 FUN_02031248(u32 param0); -THUMB_FUNC u32 FUN_02031258(u32 param0); +THUMB_FUNC int FUN_02031248(u32 param0); +THUMB_FUNC int FUN_02031258(u32 param0); THUMB_FUNC void FUN_02031268(u8 param0); THUMB_FUNC u8 FUN_02031280(); THUMB_FUNC void FUN_0203129C(); |