From c2b92e63f9a42c3868bb4aa18b08cc2d59b2dfb8 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 8 Aug 2020 11:26:50 -0400
Subject: [PATCH] w00p

---
 .../code_80850_len_3060/add_item.s            | 42 -------------------
 papermario/include/common_structs.h           |  2 +-
 papermario/src/code_80850_len_3060.c          | 34 +++++++--------
 3 files changed, 15 insertions(+), 63 deletions(-)
 delete mode 100644 papermario/asm/nonmatchings/code_80850_len_3060/add_item.s

diff --git a/papermario/asm/nonmatchings/code_80850_len_3060/add_item.s b/papermario/asm/nonmatchings/code_80850_len_3060/add_item.s
deleted file mode 100644
index 7c010d4f4d..0000000000
--- a/papermario/asm/nonmatchings/code_80850_len_3060/add_item.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.include "include/macro.inc"
-
-glabel add_item
-/* 080A24 800E7574 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 080A28 800E7578 AFB10014 */  sw    $s1, 0x14($sp)
-/* 080A2C 800E757C 0080882D */  daddu $s1, $a0, $zero
-/* 080A30 800E7580 AFBF0018 */  sw    $ra, 0x18($sp)
-/* 080A34 800E7584 0C039DB3 */  jal   sort_items
-/* 080A38 800E7588 AFB00010 */   sw    $s0, 0x10($sp)
-/* 080A3C 800E758C 0000182D */  daddu $v1, $zero, $zero
-/* 080A40 800E7590 3C108011 */  lui   $s0, 0x8011
-/* 080A44 800E7594 2610F290 */  addiu $s0, $s0, -0xd70
-/* 080A48 800E7598 0200202D */  daddu $a0, $s0, $zero
-.L800E759C:
-/* 080A4C 800E759C 848201B4 */  lh    $v0, 0x1b4($a0)
-/* 080A50 800E75A0 10400006 */  beqz  $v0, .L800E75BC
-/* 080A54 800E75A4 2402000A */   addiu $v0, $zero, 0xa
-/* 080A58 800E75A8 24630001 */  addiu $v1, $v1, 1
-/* 080A5C 800E75AC 2862000A */  slti  $v0, $v1, 0xa
-/* 080A60 800E75B0 1440FFFA */  bnez  $v0, .L800E759C
-/* 080A64 800E75B4 24840002 */   addiu $a0, $a0, 2
-/* 080A68 800E75B8 2402000A */  addiu $v0, $zero, 0xa
-.L800E75BC:
-/* 080A6C 800E75BC 10620005 */  beq   $v1, $v0, .L800E75D4
-/* 080A70 800E75C0 00031040 */   sll   $v0, $v1, 1
-/* 080A74 800E75C4 02021021 */  addu  $v0, $s0, $v0
-/* 080A78 800E75C8 A45101B4 */  sh    $s1, 0x1b4($v0)
-/* 080A7C 800E75CC 08039D76 */  j     .L800E75D8
-/* 080A80 800E75D0 0060102D */   daddu $v0, $v1, $zero
-
-.L800E75D4:
-/* 080A84 800E75D4 2402FFFF */  addiu $v0, $zero, -1
-.L800E75D8:
-/* 080A88 800E75D8 8FBF0018 */  lw    $ra, 0x18($sp)
-/* 080A8C 800E75DC 8FB10014 */  lw    $s1, 0x14($sp)
-/* 080A90 800E75E0 8FB00010 */  lw    $s0, 0x10($sp)
-/* 080A94 800E75E4 03E00008 */  jr    $ra
-/* 080A98 800E75E8 27BD0020 */   addiu $sp, $sp, 0x20
-
diff --git a/papermario/include/common_structs.h b/papermario/include/common_structs.h
index 22a3a678d6..26d8a9c9db 100644
--- a/papermario/include/common_structs.h
+++ b/papermario/include/common_structs.h
@@ -97,7 +97,7 @@ typedef struct {
     /* 0x2AA */ s16 unk_2AA;
     /* 0x2AC */ s32 unk_2AC;
     /* 0x2B0 */ s32 unk_2B0;
-    /* 0x2B4 */ s32 totalCoinsEarned;
+    /* 0x2B4 */ u32 totalCoinsEarned;
     /* 0x2B8 */ s16 idleFrameCounter; /* frames with no inputs, overflows ever ~36 minutes of idling */
     /* 0x2BA */ char unk_2BA[0x2];
     /* 0x2BC */ s32 frameCounter; /* increases by 2 per frame */
diff --git a/papermario/src/code_80850_len_3060.c b/papermario/src/code_80850_len_3060.c
index 7bd51d164d..365ca52246 100644
--- a/papermario/src/code_80850_len_3060.c
+++ b/papermario/src/code_80850_len_3060.c
@@ -6,9 +6,7 @@ player_data* get_player_data(void) {
     return &gPlayerData;
 }
 
-INCLUDE_ASM(code_80850_len_3060, add_item);
-//Mostly matches. Just regalloc left.
-/*s32 add_item(s16 item) {
+s32 add_item(s32 itemID) {
     player_data* playerData = &gPlayerData;
     s32 i;
 
@@ -24,9 +22,9 @@ INCLUDE_ASM(code_80850_len_3060, add_item);
         return -1;
     }
     
-    playerData->invItems[i] = item;
+    playerData->invItems[i] = itemID;
     return i;
-}*/
+}
 
 INCLUDE_ASM(code_80850_len_3060, get_item_count);
 
@@ -137,11 +135,10 @@ s32 is_partner_ability_active(void) {
 
 s16 add_coins(s32 amt) {
     player_data *playerData = &gPlayerData;
-    s16 temp_v0;
+    s16 newCoins = playerData->coins + amt;
 
-    temp_v0 = playerData->coins + amt;
-    playerData->coins = temp_v0;
-    if (temp_v0 >= 1000) {
+    playerData->coins = newCoins;
+    if (newCoins > 999) {
         playerData->coins = 999;
     }
     if (playerData->coins < 0) {
@@ -149,9 +146,8 @@ s16 add_coins(s32 amt) {
     }
 
     if (amt > 0) {
-        u32 temp_v0_2 = playerData->totalCoinsEarned + amt;
-        playerData->totalCoinsEarned = temp_v0_2;
-        if (temp_v0_2 > 99999) {
+        playerData->totalCoinsEarned += amt;
+        if (playerData->totalCoinsEarned > 99999) {
             playerData->totalCoinsEarned = 99999;
         }
     }
@@ -161,19 +157,17 @@ s16 add_coins(s32 amt) {
 s8 add_star_points(s32 amt) {
     player_data *playerData = &gPlayerData;
     player_data *playerData2 = &gPlayerData;
-    s8 temp_v0;
-
-    temp_v0 = playerData->starPoints + amt;
+    s8 newSP = playerData->starPoints + amt;
 
     //TODO: probably a macro!
-    playerData2->starPoints = temp_v0;
-    if (temp_v0 >= 0x65) {
-       playerData2->starPoints = 0x64;
+    playerData2->starPoints = newSP;
+    if (newSP > 100) {
+       playerData2->starPoints = 100;
     }
 
     //TODO: probably a macro!
-    temp_v0 = playerData2->starPoints;
-    if (temp_v0 < 0) {
+    newSP = playerData2->starPoints;
+    if (newSP < 0) {
        playerData2->starPoints = 0;
     }
     return gPlayerData.starPoints;