Talk to Use Cut. Strength and Surf

home/overworld.asm

@@ -94,7 +94,9 @@ OverworldLoopLessDelay::
 	call IsSpriteOrSignInFrontOfPlayer
 	ldh a, [hSpriteIndexOrTextID]
 	and a
-	jp z, OverworldLoop
+	jr nz, .displayDialogue
+	predef TryFieldMove
+	jp OverworldLoop
 .displayDialogue
 	predef GetTileAndCoordsInFrontOfPlayer
 	call UpdateSprites

home/overworld_text.asm

@@ -15,7 +15,24 @@ GroundRoseText::
 
 BoulderText::
 	text_far _BoulderText
-	text_end
+	text_asm
+	ld a, [wObtainedBadges]
+	bit 3, a ; RAINBOW BADGE
+	jr z, .done 
+	ld d, STRENGTH
+	callfar HasPartyMove
+	ld a, [wWhichTrade]
+	and a 
+	jr nz, .done 
+	ld a, [wWhichPokemon]
+	push af 
+	call ManualTextScroll
+	pop af 
+	ld [wWhichPokemon], a 
+	call GetPartyMonName2 
+	predef PrintStrengthTxt
+.done 
+    jp TextScriptEnd 
 
 MartSignText::
 	text_far _MartSignText

home/pokemon.asm

@@ -83,16 +83,6 @@ DrawHPBar::
 LoadMonData::
 	jpfar LoadMonData_
 
-OverwritewMoves::
-; Write c to [wMoves + b]. Unused.
-	ld hl, wMoves
-	ld e, b
-	ld d, 0
-	add hl, de
-	ld a, c
-	ld [hl], a
-	ret
-
 LoadFlippedFrontSpriteByMonIndex::
 	ld a, 1
 	ld [wSpriteFlipped], a
@@ -360,15 +350,6 @@ PrintLevelCommon::
 	ld b, LEFT_ALIGN | 1 ; 1 byte
 	jp PrintNumber
 
-GetwMoves::
-; Unused. Returns the move at index a from wMoves in a
-	ld hl, wMoves
-	ld c, a
-	ld b, 0
-	add hl, bc
-	ld a, [hl]
-	ret
-
 ; copies the base stat data of a pokemon to wMonHeader
 ; INPUT:
 ; [wd0b5] = pokemon ID