diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2023-11-30 11:08:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 11:08:55 -0800 |
| commit | 4aa26b0ea51534ce65a6725751be8860c26671e7 (patch) | |
| tree | 9cc83f68e8be410bae3d769d9026965f54700060 | |
| parent | 5d90474ae818740f2aecb568ff489ec324174487 (diff) | |
| parent | 09e6ceb59331b8c3b796547406296ce0ca19e6f4 (diff) | |
Merge pull request #636 from ThothWhatsThis/patch-1
Update kinstoneMenu.c
| -rw-r--r-- | src/menu/kinstoneMenu.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/menu/kinstoneMenu.c b/src/menu/kinstoneMenu.c index 53cf6655..e9f5b7d0 100644 --- a/src/menu/kinstoneMenu.c +++ b/src/menu/kinstoneMenu.c @@ -433,19 +433,33 @@ void KinstoneMenu_080A4080(void) { } } -NONMATCH("asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc", void KinstoneMenu_080A414C(void)) { +void KinstoneMenu_080A414C(void) { s32 uVar1; s32 iVar2; s32 uVar3; + s32 tmp1; + s32 tmp2; + s32 tmp3; + s32 tmp4; + const s16* ptr; + OAMCommand* OamCmd; + u16 tmp5; s32 i; gOamCmd._4 = 0; gOamCmd._6 = 0; - uVar1 = gKinstoneMenu.unk10.HALF.LO / 0xb21; - for (i = -3, uVar1 = -uVar1 - 0x45; i < 4; uVar1 += 0x17, i++) { - gOamCmd.y = ((gSineTable[uVar1 & 0xff] * 0x44) / 0x100) + 0x4f; - gOamCmd.x = ((gSineTable[(uVar1 + 0x40) & 0xff] * 0x42) / 0x100) - 0x10; + tmp3 = (s32)(gKinstoneMenu.unk10.HALF_U.LO); + tmp2 = 0xb21; + tmp5 = (tmp3 / tmp2); + i = -3; + tmp1 = 0xff; + OamCmd = &gOamCmd; + ptr = gSineTable; + uVar1 = -tmp5 - 0x45; + while (i < 4) { + OamCmd->y = ((ptr[uVar1 & tmp1] * 0x44) / 0x100) + 0x4f; + OamCmd->x = ((ptr[((uVar1 & tmp1) + 0x40) & tmp1] * 0x42) / 0x100) - 0x10; iVar2 = gKinstoneMenu.unk10.WORD / 0x10000 + i; if (iVar2 >= 0) { uVar3 = gSave.kinstoneAmounts[iVar2]; @@ -459,13 +473,14 @@ NONMATCH("asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc", void K break; } } - if (0 < uVar3) { + if (uVar3 > 0) { sub_080A42E0(gSave.kinstoneTypes[iVar2], uVar3); } } + uVar1 += 0x17; + i++; } } -END_NONMATCH void KinstoneMenu_080A422C(void) { static const s8 gUnk_08128120[] = { |