From 875adc18fd8bc9d6e223d0113631df6326882674 Mon Sep 17 00:00:00 2001
From: Thorn Avery <ta@p7.co.nz>
Date: Mon, 25 Sep 2023 12:37:59 +1000
Subject: [PATCH] fix strength cry

---
 engine/menus/start_sub_menus.asm | 12 ++++++++++++
 home/overworld_text.asm          | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index e21441db..2effad05 100644
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -177,6 +177,18 @@ StartMenu_Pokemon::
 .strength
 	bit BIT_RAINBOWBADGE, a
 	jp z, .newBadgeRequired
+	ld a, [wWhichPokemon]
+	ld hl, wPartySpecies
+	; bumping hl by a, need to make sure carry happens
+	ld c, a
+	ld a, l
+	add a, c
+	ld l, a
+	jr nc, .strengthNoCarry
+	inc h
+.strengthNoCarry
+	ld a, [hl]
+	ld [wcf91], a
 	predef PrintStrengthTxt
 	call GBPalWhiteOutWithDelay3
 	jp .goBackToMap
diff --git a/home/overworld_text.asm b/home/overworld_text.asm
index f37a9fce..cc422294 100644
--- a/home/overworld_text.asm
+++ b/home/overworld_text.asm
@@ -30,6 +30,17 @@ BoulderText::
 	pop af 
 	ld [wWhichPokemon], a 
 	call GetPartyMonName2 
+	ld a, [wWhichPokemon]
+	ld hl, wPartySpecies
+	ld c, a
+	ld a, l
+	add a, c
+	ld l, a
+	jr nc, .noCarry
+	inc h
+.noCarry
+	ld a, [hl]
+	ld [wcf91], a
 	predef PrintStrengthTxt
 .done 
     jp TextScriptEnd