decompile AdjustFriendship

2 files changed, 62 insertions, 206 deletions

diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s
index 124bc8186..36407abee 100644
--- a/asm/pokemon_3.s
+++ b/asm/pokemon_3.s
@@ -6,212 +6,6 @@
 
 	.text
 
-	thumb_func_start AdjustFriendship
-AdjustFriendship: @ 803FCD4
-	push {r4-r7,lr}
-	sub sp, 0x4
-	adds r7, r0, 0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 16
-	lsrs r6, r0, 16
-	adds r0, r7, 0
-	movs r1, 0xC
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0xAF
-	bne _0803FD34
-	ldr r0, _0803FD14 @ =gMain
-	ldr r1, _0803FD18 @ =0x0000043d
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0803FD20
-	ldr r0, _0803FD1C @ =gEnigmaBerries
-	ldrb r4, [r0, 0x7]
-	b _0803FD3C
-	.align 2, 0
-_0803FD14: .4byte gMain
-_0803FD18: .4byte 0x0000043d
-_0803FD1C: .4byte gEnigmaBerries
-_0803FD20:
-	ldr r0, _0803FD2C @ =gSaveBlock1
-	ldr r1, _0803FD30 @ =0x00003688
-	adds r0, r1
-	ldrb r4, [r0]
-	b _0803FD3C
-	.align 2, 0
-_0803FD2C: .4byte gSaveBlock1
-_0803FD30: .4byte 0x00003688
-_0803FD34:
-	bl ItemId_GetHoldEffect
-	lsls r0, 24
-	lsrs r4, r0, 24
-_0803FD3C:
-	cmp r6, 0
-	bne _0803FD42
-	b _0803FE56
-_0803FD42:
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r6, r0
-	bne _0803FD4C
-	b _0803FE56
-_0803FD4C:
-	movs r6, 0
-	adds r0, r7, 0
-	movs r1, 0x20
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	mov r1, sp
-	strh r0, [r1]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x63
-	ble _0803FD6A
-	movs r6, 0x1
-_0803FD6A:
-	cmp r0, 0xC7
-	ble _0803FD74
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-_0803FD74:
-	cmp r5, 0x5
-	bne _0803FD84
-	bl Random
-	movs r1, 0x1
-	ands r1, r0
-	cmp r1, 0
-	bne _0803FE56
-_0803FD84:
-	cmp r5, 0x3
-	bne _0803FDB4
-	ldr r0, _0803FE60 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _0803FE56
-	ldr r2, _0803FE64 @ =gTrainers
-	ldr r0, _0803FE68 @ =gTrainerBattleOpponent
-	ldrh r1, [r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	ldrb r1, [r0, 0x1]
-	adds r0, r1, 0
-	subs r0, 0x18
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bls _0803FDB4
-	cmp r1, 0x20
-	bne _0803FE56
-_0803FDB4:
-	ldr r1, _0803FE6C @ =gUnknown_082082FE
-	lsls r0, r5, 1
-	adds r0, r5
-	adds r0, r6, r0
-	adds r0, r1
-	ldrb r2, [r0]
-	movs r1, 0
-	ldrsb r1, [r0, r1]
-	cmp r1, 0
-	ble _0803FDDA
-	cmp r4, 0x1B
-	bne _0803FDDA
-	movs r0, 0x96
-	muls r0, r1
-	movs r1, 0x64
-	bl __divsi3
-	lsls r0, 24
-	lsrs r2, r0, 24
-_0803FDDA:
-	lsls r2, 24
-	asrs r2, 24
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	adds r0, r2
-	mov r1, sp
-	strh r0, [r1]
-	cmp r2, 0
-	ble _0803FE2C
-	adds r0, r7, 0
-	movs r1, 0x26
-	movs r2, 0
-	bl GetMonData
-	cmp r0, 0xB
-	bne _0803FE08
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	adds r0, 0x1
-	mov r1, sp
-	strh r0, [r1]
-_0803FE08:
-	adds r0, r7, 0
-	movs r1, 0x23
-	movs r2, 0
-	bl GetMonData
-	adds r4, r0, 0
-	bl sav1_map_get_name
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r4, r0
-	bne _0803FE2C
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	adds r0, 0x1
-	mov r1, sp
-	strh r0, [r1]
-_0803FE2C:
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bge _0803FE3C
-	movs r1, 0
-	mov r0, sp
-	strh r1, [r0]
-_0803FE3C:
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0xFF
-	ble _0803FE4C
-	movs r1, 0xFF
-	mov r0, sp
-	strh r1, [r0]
-_0803FE4C:
-	adds r0, r7, 0
-	movs r1, 0x20
-	mov r2, sp
-	bl SetMonData
-_0803FE56:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0803FE60: .4byte gBattleTypeFlags
-_0803FE64: .4byte gTrainers
-_0803FE68: .4byte gTrainerBattleOpponent
-_0803FE6C: .4byte gUnknown_082082FE
-	thumb_func_end AdjustFriendship
-
 	thumb_func_start MonGainEVs
 MonGainEVs: @ 803FE70
 	push {r4-r7,lr}
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 61e56d56f..ca756b81b 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -2,12 +2,14 @@
 #include "asm.h"
 #include "battle.h"
 #include "event_data.h"
+#include "hold_effects.h"
 #include "item.h"
 #include "items.h"
 #include "link.h"
 #include "main.h"
 #include "pokemon.h"
 #include "rng.h"
+#include "rom4.h"
 #include "rtc.h"
 #include "species.h"
 #include "sprite.h"
@@ -75,6 +77,9 @@ extern void *gUnknown_081FAF4C[];
 extern u8 gSpeciesNames[][11];
 extern struct Trainer gTrainers[];
 extern s8 gNatureStatTable[][5];
+extern s8 gUnknown_082082FE[][3];
+extern u16 gTrainerBattleOpponent;
+extern u16 gBattleTypeFlags;
 
 extern u8 gUnknown_082082F8[];
 extern u8 gUnknown_083FFDB3[];
@@ -664,3 +669,60 @@ u16 nature_stat_mod(u8 nature, u16 n, u8 statIndex)
 
     return n;
 }
+
+void AdjustFriendship(struct Pokemon *mon, u8 event)
+{
+    u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0);
+    u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, 0);
+    u8 holdEffect;
+
+    if (heldItem == ITEM_ENIGMA_BERRY)
+    {
+        if (gMain.inBattle)
+        {
+            holdEffect = gEnigmaBerries[0].holdEffect;
+        }
+        else
+        {
+            holdEffect = gSaveBlock1.enigmaBerry.holdEffect;
+        }
+    }
+    else
+    {
+        holdEffect = ItemId_GetHoldEffect(heldItem);
+    }
+
+    if (species && species != SPECIES_EGG)
+    {
+        u8 friendshipLevel = 0;
+        s16 friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, 0);
+        if (friendship > 99)
+            friendshipLevel++;
+        if (friendship > 199)
+            friendshipLevel++;
+        if ((event != 5 || !(Random() & 1))
+         && (event != 3
+          || ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+           && (gTrainers[gTrainerBattleOpponent].trainerClass == 24
+            || gTrainers[gTrainerBattleOpponent].trainerClass == 25
+            || gTrainers[gTrainerBattleOpponent].trainerClass == 32))))
+        {
+            s8 mod = gUnknown_082082FE[event][friendshipLevel];
+            if (mod > 0 && holdEffect == HOLD_EFFECT_HAPPINESS_UP)
+                mod = (150 * mod) / 100;
+            friendship += mod;
+            if (mod > 0)
+            {
+                if (GetMonData(mon, MON_DATA_POKEBALL, 0) == ITEM_LUXURY_BALL)
+                    friendship++;
+                if (GetMonData(mon, MON_DATA_MET_LOCATION, 0) == sav1_map_get_name())
+                    friendship++;
+            }
+            if (friendship < 0)
+                friendship = 0;
+            if (friendship > 255)
+                friendship = 255;
+            SetMonData(mon, MON_DATA_FRIENDSHIP, (u8 *)&friendship);
+        }
+    }
+}