v1.04beta1 - added reminder text for when box is full

jojobear13 · Mar 1, 2019 · 7223a04 · 7223a04
1 parent 9c11c93
commit 7223a04
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -140,6 +140,7 @@ Think of it as what the Nintendo Virtual Console re-release of red & blue might
 -----------
 
 - Fixed mistakes and made adjustments to the game text
+  - When a pkmn is caught and fills the box, a reminder is printed that the box is full
   - Man in cinnabar won't mention raichu evolving
   - Koga correctly says soul badge increases speed
   - Lt. Surge correctly says thunder badge increases defense

diff --git a/engine/items/items.asm b/engine/items/items.asm
@@ -564,6 +564,11 @@ ItemUseBall:
 	ld hl, ItemUseBallText08
 .printTransferredToPCText
 	call PrintText
+;joenote - add reminder that box is now full
+	ld a, [wNumInBox] ; is box full?
+	cp MONS_PER_BOX
+	ld hl, BoxFullReminderTXT
+	call PrintText
 	jr .done
 
 .oldManCaughtMon
@@ -2398,6 +2403,11 @@ BoxFullCannotThrowBallText:
 	TX_FAR _BoxFullCannotThrowBallText
 	db "@"
 
+;joenote - add a reminder that the box is full
+BoxFullReminderTXT:
+	TX_FAR _BoxIsFullReminderText
+	db "@"
+	
 ItemUseText00:
 	TX_FAR _ItemUseText001
 	TX_LINE

diff --git a/ips_patches/shin_pokemon_blue_v104beta0.ips → ips_patches/shin_pokemon_blue_v104beta1.ips b/ips_patches/shin_pokemon_blue_v104beta0.ips → ips_patches/shin_pokemon_blue_v104beta1.ips
diff --git a/ips_patches/shin_pokemon_red_v104beta0.ips → ips_patches/shin_pokemon_red_v104beta1.ips b/ips_patches/shin_pokemon_red_v104beta0.ips → ips_patches/shin_pokemon_red_v104beta1.ips
diff --git a/text.asm b/text.asm
@@ -2757,6 +2757,16 @@ _BoxIsFullText::
 	line "a #MON CENTER!"
 	done
 
+_BoxIsFullReminderText::
+	text "The #MON BOX"
+	line "is now full."
+	cont "It won't hold"
+	cont "more #MON."
+
+	para "Change the BOX at"
+	line "a #MON CENTER!"
+	prompt
+
 INCLUDE "text/maps/pallet_town.asm"
 INCLUDE "text/maps/viridian_city.asm"
 INCLUDE "text/maps/pewter_city.asm"