implement Room Service

Mizo1994 · Dec 10, 2019 · 72a9594 · 72a9594
1 parent dc01b28
commit 72a9594
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
@@ -121,6 +121,7 @@ ITEMMENU_CLOSE   EQU 6
 	const HELD_METRONOME
 	const HELD_PROTECTIVE_PADS
 	const HELD_ROCKY_HELMET
+	const HELD_ROOM_SERVICE
 	const HELD_SAFETY_GOGGLES
 	const HELD_SHED_SHELL
 	const HELD_SHELL_BELL

diff --git a/data/items/attributes.asm b/data/items/attributes.asm
@@ -383,7 +383,7 @@ ItemAttributes:
 ; EJECT PACK
 	item_attribute 4000, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ROOM SERVICE
-	item_attribute 4000, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 4000, HELD_ROOM_SERVICE, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BLUNDRPOLICY
 	item_attribute 4000, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; THROAT SPRAY

diff --git a/data/text/battle.asm b/data/text/battle.asm
@@ -183,6 +183,17 @@ BrokeReflectText:
 	cont "Reflect!"
 	prompt
 
+BattleText_ItemLowered:
+	text "The @"
+	text_from_ram wStringBuffer1
+	text ""
+	line "lowered"
+	cont "<USER>'s"
+	cont "@"
+	text_from_ram wStringBuffer2
+	text "!"
+	prompt
+
 BattleText_ItemRaised:
 	text "The @"
 	text_from_ram wStringBuffer1

diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
@@ -2825,7 +2825,7 @@ BattleCommand_supereffectivetext: ; 351ad
 .print_msg
 	ld b, a
 	inc b
-	farcall GetStatName
+	call GetStatName
 	ld hl, BattleText_ItemSharplyRaised
 	jp StdBattleTextBox
 
@@ -8060,7 +8060,26 @@ BattleCommand_trickroom:
 	ld [hl], 5
 	call AnimateCurrentMove
 	ld hl, TrickRoomText
-	jp StdBattleTextBox
+	call StdBattleTextBox
+
+	call GetUserItemAfterUnnerve
+	ld a, b
+	cp HELD_ROOM_SERVICE
+	ret nz
+
+	ld b, SPEED
+	call LowerStat
+	ld a, [wFailedMessage]
+	and a
+	ret nz
+
+	call GetCurItemName
+	inc b
+	call GetStatName
+	farcall ItemRecoveryAnim
+	ld hl, BattleText_ItemLowered
+	call StdBattleTextBox
+	jp ConsumeUserItem
 
 .failed
 	call AnimateFailedMove