diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/berry.c | 2 | ||||
| -rw-r--r-- | src/debug/unk_debug_menu_3.c | 58 |
2 files changed, 45 insertions, 15 deletions
diff --git a/src/berry.c b/src/berry.c index 9313c458b..16b5b2b22 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1085,7 +1085,7 @@ extern u8 gUnknown_Debug_839B6CE[]; static const u8 gUnknown_Debug_083F7F84[] = _("そとから きた きのみ"); static const u8 gUnknown_Debug_083F7F90[] = _("ただいま かいはつちゅう"); -void debug_sub_80C2C18(u8 *name, u8 holdEffect, u8 holdEffectParam) +void debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam) { s32 i; diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c index 4b40927b9..7e63abbd3 100644 --- a/src/debug/unk_debug_menu_3.c +++ b/src/debug/unk_debug_menu_3.c @@ -1,14 +1,15 @@ -#if DEBUG - #include "global.h" #include "debug.h" #include "constants/items.h" #include "mystery_event_script.h" +#include "berry.h" + +#if DEBUG extern const u8 gUnknown_Debug_845DAE1[]; extern const u8 gUnknown_Debug_845DAE1End[]; -size_t debug_sub_813C404(void * dest) +size_t debug_sub_813C404(u8 * dest) { size_t size = gUnknown_Debug_845DAE1End - gUnknown_Debug_845DAE1; memcpy(dest, gUnknown_Debug_845DAE1, size); @@ -19,7 +20,7 @@ size_t debug_sub_813C404(void * dest) extern const u8 gUnknown_Debug_845E3E0[]; extern const u8 gUnknown_Debug_845E3E0End[]; -size_t debug_sub_813C430(void * dest) +size_t debug_sub_813C430(u8 * dest) { size_t size = gUnknown_Debug_845E3E0End - gUnknown_Debug_845E3E0; memcpy(dest, gUnknown_Debug_845E3E0, size); @@ -30,7 +31,7 @@ size_t debug_sub_813C430(void * dest) extern const u8 gUnknown_Debug_845E422[]; extern const u8 gUnknown_Debug_845E422End[]; -size_t debug_sub_813C45C(void * dest) +size_t debug_sub_813C45C(u8 * dest) { size_t size = gUnknown_Debug_845E422End - gUnknown_Debug_845E422; memcpy(dest, gUnknown_Debug_845E422, size); @@ -41,7 +42,7 @@ size_t debug_sub_813C45C(void * dest) extern const u8 gUnknown_Debug_845E402[]; extern const u8 gUnknown_Debug_845E402End[]; -size_t debug_sub_813C488(void * dest) +size_t debug_sub_813C488(u8 * dest) { size_t size = gUnknown_Debug_845E402End - gUnknown_Debug_845E402; memcpy(dest, gUnknown_Debug_845E402, size); @@ -52,7 +53,7 @@ size_t debug_sub_813C488(void * dest) extern const u8 gUnknown_Debug_845E606[]; extern const u8 gUnknown_Debug_845E606End[]; -size_t debug_sub_813C4B4(void * dest) +size_t debug_sub_813C4B4(u8 * dest) { size_t size = gUnknown_Debug_845E606End - gUnknown_Debug_845E606; memcpy(dest, gUnknown_Debug_845E606, size); @@ -62,7 +63,7 @@ size_t debug_sub_813C4B4(void * dest) extern const u8 gUnknown_Debug_845E619[]; extern const u8 gUnknown_Debug_845E619End[]; -size_t debug_sub_813C4D4(void * dest) +size_t debug_sub_813C4D4(u8 * dest) { size_t size = gUnknown_Debug_845E619End - gUnknown_Debug_845E619; memcpy(dest, gUnknown_Debug_845E619, size); @@ -73,7 +74,7 @@ size_t debug_sub_813C4D4(void * dest) extern const u8 gUnknown_Debug_845E712[]; extern const u8 gUnknown_Debug_845E712End[]; -size_t debug_sub_813C500(void * dest) +size_t debug_sub_813C500(u8 * dest) { size_t size = gUnknown_Debug_845E712End - gUnknown_Debug_845E712; memcpy(dest, gUnknown_Debug_845E712, size); @@ -85,7 +86,7 @@ extern const u8 gUnknown_Debug_845E797[]; extern const u8 gUnknown_Debug_845E797End[]; extern const u8 gUnknown_Debug_845E7B5[]; -size_t debug_sub_813C52C(void * dest, u16 itemId) +size_t debug_sub_813C52C(u8 * dest, u16 itemId) { u8 * ptr; size_t size = gUnknown_Debug_845E797End - gUnknown_Debug_845E797; @@ -98,24 +99,53 @@ size_t debug_sub_813C52C(void * dest, u16 itemId) return size; } -size_t debug_sub_813C580(void * dest) +size_t debug_sub_813C580(u8 * dest) { return debug_sub_813C52C(dest, ITEM_POTION); } -size_t debug_sub_813C58C(void * dest) +size_t debug_sub_813C58C(u8 * dest) { return debug_sub_813C52C(dest, ITEM_POKE_BALL); } -size_t debug_sub_813C598(void * dest) +size_t debug_sub_813C598(u8 * dest) { return debug_sub_813C52C(dest, ITEM_CHERI_BERRY); } -size_t debug_sub_813C5A4(void * dest) +size_t debug_sub_813C5A4(u8 * dest) { return debug_sub_813C52C(dest, ITEM_TM01_FOCUS_PUNCH); } +extern const u8 gUnknown_Debug_845DDB2[]; +extern const u8 gUnknown_Debug_845DDB2End[]; +extern const u8 gUnknown_Debug_845DDD6[]; + +extern const u8 Str_842E23C[]; //static const u8 Str_842E23C[] = _("ガイブ"); + +size_t debug_sub_813C5B4(u8 * dest) +{ + u8 * saveBerry = (u8 *)&gSaveBlock1.enigmaBerry; + u8 * berry = (u8 *)(dest - gUnknown_Debug_845DDB2 + gUnknown_Debug_845DDD6); + size_t size = gUnknown_Debug_845DDB2End - gUnknown_Debug_845DDB2; + int i; + + debug_sub_80C2C18(Str_842E23C, 0, 0); + + for (i = 0; i < 0x1000; i++) + dest[i] = 0; + + for (i = 0; i < size; i++) + dest[i] = gUnknown_Debug_845DDB2[i]; + + for (i = 0; i < sizeof(struct EnigmaBerry); i++) + berry[i] = saveBerry[i]; + + ClearEnigmaBerries(); + unref_sub_81261B4(dest, gUnknown_Debug_845DDB2); + return size; +} + #endif // DEBUG |