summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-04-02 21:34:41 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-04-02 21:34:41 -0400
commit76b058ec5f01ebc114706b52f1fda066458c233b (patch)
tree3c13c703041fd55c2afcad6cf481a9c764a200f3
parentbaf1430f2449fa79727109c83d39bfbecbdd00c9 (diff)
through debug_sub_81612B8
-rw-r--r--asm/nakamura_debug_menu.s293
-rw-r--r--src/debug/nakamura_debug_menu.c92
2 files changed, 92 insertions, 293 deletions
diff --git a/asm/nakamura_debug_menu.s b/asm/nakamura_debug_menu.s
index 9e4e2975b..9818e2fdf 100644
--- a/asm/nakamura_debug_menu.s
+++ b/asm/nakamura_debug_menu.s
@@ -5,299 +5,6 @@
.text
- thumb_func_start debug_sub_81610BC
-debug_sub_81610BC:
- push {lr}
- ldr r0, ._511 @ gMain
- ldrh r1, [r0, #0x2e]
- mov r0, #0x20
- and r0, r0, r1
- cmp r0, #0
- beq ._509 @cond_branch
- mov r0, #0x1
- neg r0, r0
- b ._510
-._512:
- .align 2, 0
-._511:
- .word gMain
-._509:
- mov r0, #0x10
- and r0, r0, r1
- cmp r0, #0
- beq ._513 @cond_branch
- mov r0, #0x1
-._510:
- bl debug_sub_8161028
- ldr r0, ._515 @ _nakamuraData5
- ldrb r1, [r0]
- mov r0, #0x64
- mul r0, r0, r1
- ldr r1, ._515 + 4 @ gPlayerParty
- add r0, r0, r1
- bl debug_sub_8160E50
- mov r0, #0x0
- b ._518
-._516:
- .align 2, 0
-._515:
- .word _nakamuraData5
- .word gPlayerParty
-._513:
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- bne ._517 @cond_branch
- mov r0, #0x0
- b ._518
-._517:
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- bl CloseMenu
- mov r0, #0x1
-._518:
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_81610BC
-
- thumb_func_start DebugMenu_EffortValues
-DebugMenu_EffortValues:
- push {lr}
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- ldr r1, ._519 @ _nakamuraData5
- mov r0, #0x0
- strb r0, [r1]
- bl debug_sub_8160DC0
- ldr r0, ._519 + 4 @ gPlayerParty
- bl debug_sub_8160E50
- ldr r1, ._519 + 8 @ gMenuCallback
- ldr r0, ._519 + 12 @ debug_sub_81610BC
- str r0, [r1]
- mov r0, #0x0
- pop {r1}
- bx r1
-._520:
- .align 2, 0
-._519:
- .word _nakamuraData5
- .word gPlayerParty
- .word gMenuCallback
- .word debug_sub_81610BC+1
-
- thumb_func_end DebugMenu_EffortValues
-
- thumb_func_start debug_sub_8161160
-debug_sub_8161160:
- push {r4, r5, r6, r7, lr}
- mov r7, r8
- push {r7}
- mov r7, #0x0
- ldr r2, ._523 @ _nakamuraData6
- ldr r1, ._523 + 4 @ _nakamuraData8
- ldrh r0, [r2]
- ldrh r3, [r1]
- cmp r0, r3
- bhi ._521 @cond_branch
- add r6, r0, #0
- ldrh r5, [r1]
- b ._522
-._524:
- .align 2, 0
-._523:
- .word _nakamuraData6
- .word _nakamuraData8
-._521:
- ldrh r6, [r1]
- ldrh r5, [r2]
-._522:
- mov r4, #0x0
- ldr r0, ._529 @ _nakamuraDataA
- ldrh r0, [r0]
- cmp r4, r0
- bcs ._525 @cond_branch
- ldr r0, ._529 + 4 @ _nakamuraDataC
- mov r8, r0
-._528:
- bl Random
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- mov r2, r8
- ldrh r1, [r2]
- bl __umodsi3
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- cmp r0, r6
- bcc ._527 @cond_branch
- cmp r0, r5
- bhi ._527 @cond_branch
- add r0, r7, #1
- lsl r0, r0, #0x10
- lsr r7, r0, #0x10
-._527:
- add r4, r4, #0x1
- ldr r0, ._529 @ _nakamuraDataA
- ldrh r0, [r0]
- cmp r4, r0
- bcc ._528 @cond_branch
-._525:
- add r0, r7, #0
- pop {r3}
- mov r8, r3
- pop {r4, r5, r6, r7}
- pop {r1}
- bx r1
-._530:
- .align 2, 0
-._529:
- .word _nakamuraDataA
- .word _nakamuraDataC
-
- thumb_func_end debug_sub_8161160
-
- thumb_func_start debug_sub_81611D8
-debug_sub_81611D8:
- push {r4, lr}
- add sp, sp, #0xfffffff8
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0xf
- mov r3, #0xb
- bl Menu_DrawStdWindowFrame
- ldr r0, ._531 @ Str_843E642
- mov r1, #0x2
- mov r2, #0x1
- bl Menu_PrintText
- ldr r0, ._531 + 4 @ Str_843E647
- mov r1, #0x2
- mov r2, #0x3
- bl Menu_PrintText
- ldr r0, ._531 + 8 @ Str_843E65A
- mov r1, #0x2
- mov r2, #0x5
- bl Menu_PrintText
- ldr r0, ._531 + 12 @ Str_843E64C
- mov r1, #0x2
- mov r2, #0x7
- bl Menu_PrintText
- ldr r0, ._531 + 16 @ Str_843E651
- mov r1, #0x2
- mov r2, #0x9
- bl Menu_PrintText
- ldr r0, ._531 + 20 @ Str_843E655
- mov r1, #0xd
- mov r2, #0x9
- bl Menu_PrintText
- ldr r4, ._531 + 24 @ Str_843E658
- add r0, r4, #0
- mov r1, #0xc
- mov r2, #0x1
- bl Menu_PrintText
- add r0, r4, #0
- mov r1, #0xc
- mov r2, #0x3
- bl Menu_PrintText
- add r0, r4, #0
- mov r1, #0xc
- mov r2, #0x5
- bl Menu_PrintText
- add r0, r4, #0
- mov r1, #0xc
- mov r2, #0x7
- bl Menu_PrintText
- add r0, r4, #0
- mov r1, #0xc
- mov r2, #0x9
- bl Menu_PrintText
- mov r0, #0x0
- str r0, [sp]
- mov r0, #0xe
- str r0, [sp, #0x4]
- mov r0, #0x0
- mov r1, #0x1
- mov r2, #0x1
- mov r3, #0x4
- bl InitMenu
- add sp, sp, #0x8
- pop {r4}
- pop {r0}
- bx r0
-._532:
- .align 2, 0
-._531:
- .word Str_843E642
- .word Str_843E647
- .word Str_843E65A
- .word Str_843E64C
- .word Str_843E651
- .word Str_843E655
- .word Str_843E658
-
- thumb_func_end debug_sub_81611D8
-
- thumb_func_start debug_sub_8161290
-debug_sub_8161290:
- push {r4, lr}
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- ldr r4, ._533 @ gStringVar1
- add r0, r4, #0
- mov r2, #0x1
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r4, #0
- mov r1, #0x8
- mov r2, #0x9
- bl Menu_PrintText
- pop {r4}
- pop {r0}
- bx r0
-._534:
- .align 2, 0
-._533:
- .word gStringVar1
-
- thumb_func_end debug_sub_8161290
-
- thumb_func_start debug_sub_81612B8
-debug_sub_81612B8:
- push {r4, r5, lr}
- add r4, r2, #0
- lsl r4, r4, #0x18
- lsr r4, r4, #0x18
- lsl r1, r1, #0x18
- asr r1, r1, #0x18
- ldrh r2, [r0]
- add r1, r1, r2
- strh r1, [r0]
- ldr r5, ._535 @ gStringVar1
- ldrh r1, [r0]
- add r0, r5, #0
- mov r2, #0x1
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r5, #0
- mov r1, #0x8
- add r2, r4, #0
- bl Menu_PrintText
- pop {r4, r5}
- pop {r0}
- bx r0
-._536:
- .align 2, 0
-._535:
- .word gStringVar1
-
- thumb_func_end debug_sub_81612B8
-
thumb_func_start debug_sub_81612EC
debug_sub_81612EC:
push {r4, r5, lr}
diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c
index d2854e629..2c4ee5413 100644
--- a/src/debug/nakamura_debug_menu.c
+++ b/src/debug/nakamura_debug_menu.c
@@ -1992,8 +1992,100 @@ void debug_sub_8161028(s8 a0)
else if (GetMonData(gPlayerParty + _nakamuraData5, MON_DATA_SPECIES) == SPECIES_NONE)
_nakamuraData5 = 0;
}
+}
+
+bool8 debug_sub_81610BC(void)
+{
+ if (gMain.newKeys & DPAD_LEFT)
+ {
+ debug_sub_8161028(-1);
+ debug_sub_8160E50(gPlayerParty + _nakamuraData5);
+ return FALSE;
+ }
+
+ if (gMain.newKeys & DPAD_RIGHT)
+ {
+ debug_sub_8161028(+1);
+ debug_sub_8160E50(gPlayerParty + _nakamuraData5);
+ return FALSE;
+ }
+
+ if (gMain.newKeys & B_BUTTON)
+ {
+ Menu_EraseWindowRect(0, 0, 29, 19);
+ CloseMenu();
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+bool8 DebugMenu_EffortValues(void)
+{
+ Menu_EraseWindowRect(0, 0, 29, 19);
+ _nakamuraData5 = 0;
+ debug_sub_8160DC0();
+ debug_sub_8160E50(gPlayerParty + 0);
+ gMenuCallback = debug_sub_81610BC;
+ return FALSE;
+}
+
+u16 debug_sub_8161160(void)
+{
+ u16 r7 = 0;
+ u16 r6;
+ u16 r5;
+ u32 i;
+
+ if (_nakamuraData6 <= _nakamuraData8)
+ {
+ r6 = _nakamuraData6;
+ r5 = _nakamuraData8;
+ }
+ else
+ {
+ r6 = _nakamuraData8;
+ r5 = _nakamuraData6;
+ }
+
+ for (i = 0; i < _nakamuraDataA; i++)
+ {
+ u16 r0 = Random() % _nakamuraDataC;
+ if (r0 >= r6 && r0 <= r5)
+ r7++;
+ }
+
+ return r7;
+}
+void debug_sub_81611D8(void)
+{
+ Menu_DrawStdWindowFrame(0, 0, 15, 11);
+ Menu_PrintText(Str_843E642, 2, 1);
+ Menu_PrintText(Str_843E647, 2, 3);
+ Menu_PrintText(Str_843E65A, 2, 5);
+ Menu_PrintText(Str_843E64C, 2, 7);
+ Menu_PrintText(Str_843E651, 2, 9);
+ Menu_PrintText(Str_843E655, 13, 9);
+ Menu_PrintText(Str_843E658, 12, 1);
+ Menu_PrintText(Str_843E658, 12, 3);
+ Menu_PrintText(Str_843E658, 12, 5);
+ Menu_PrintText(Str_843E658, 12, 7);
+ Menu_PrintText(Str_843E658, 12, 9);
+ InitMenu(0, 1, 1, 4, 0, 14);
+}
+
+void debug_sub_8161290(u16 a0)
+{
+ ConvertIntToDecimalStringN(gStringVar1, a0, STR_CONV_MODE_RIGHT_ALIGN, 5);
+ Menu_PrintText(gStringVar1, 8, 9);
+}
+void debug_sub_81612B8(u16 * a0, s8 a1, u8 a2)
+{
+ *a0 += a1;
+ ConvertIntToDecimalStringN(gStringVar1, *a0, STR_CONV_MODE_RIGHT_ALIGN, 5);
+ Menu_PrintText(gStringVar1, 8, a2);
}
#endif // DEBUG