accurate ai and end text

danielah05 · Jun 3, 2022 · 24ee26f · 24ee26f · danielah05 · Jun 3, 2022
1 parent a897309
commit 24ee26f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
@@ -908,10 +908,12 @@ _LinkBattleLostText::
 	text "!"
 	prompt
 
-_BuriedAliveBattleLostText::
+_BuriedAliveBattleLostText1::
 	text "Finally..."
+	prompt
 
-	para "Raw meat..."
+_BuriedAliveBattleLostText2::
+	text "Raw meat..."
 	prompt
 
 _GraveGameOverText::

diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm
@@ -51,5 +51,5 @@ TrainerAIPointers:
 	dbw 3, GenericAI
 	dbw 2, AgathaAI ; agatha
 	dbw 1, LanceAI ; lance
-	dbw 3, GenericAI ; buried alive
+	dbw 2, CooltrainerMAI ; buried alive in the footage uses xattack twice, just like the cooltrainerm ai
 	assert_table_length NUM_TRAINERS
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
@@ -1156,7 +1156,11 @@ HandlePlayerBlackOut:
 	;call ScrollTrainerPicAfterBattle
 	;ld c, 40
 	;call DelayFrames
-	ld hl, BuriedAliveBattleLostText ; replace this
+	ld hl, BuriedAliveBattleLostText1 ; text 1
+	call PrintText
+	ld a, SFX_STOP_ALL_MUSIC ; kill music just like in the video when text 2 appears
+	call PlaySound
+	ld hl, BuriedAliveBattleLostText2 ; text 2
 	call PrintText
 	jp GameOverScript
 	ld a, [wCurMap]
@@ -1261,8 +1265,12 @@ LinkBattleLostText:
 	text_far _LinkBattleLostText
 	text_end
 
-BuriedAliveBattleLostText:
-	text_far _BuriedAliveBattleLostText
+BuriedAliveBattleLostText1:
+	text_far _BuriedAliveBattleLostText1
+	text_end
+
+BuriedAliveBattleLostText2:
+	text_far _BuriedAliveBattleLostText2
 	text_end