reworked disobedience, also new Tsubomitto sprite

turns out the last time we tried removing disobedience, pokemon wouldn't attack. also reworked the texts to remove references to it, as well as some SS Anne stuff

engine/battle/core.asm

@@ -3111,7 +3111,7 @@ ExecutePlayerMove:
 	ld hl, wPlayerBattleStatus1
 	bit CHARGING_UP, [hl] ; charging up for attack
 	jr nz, PlayerCanExecuteChargingMove
-	;call CheckForDisobedience
+	call CheckForDisobedience
 	jp z, ExecutePlayerMoveDone
 
 CheckIfPlayerNeedsToChargeUp:
@@ -4003,15 +4003,15 @@ CheckForDisobedience:
 	ld a, 101
 	jr nz, .next
 	bit BIT_MARSHBADGE, [hl]
-	ld a, 70
+	ld a, 101
 	jr nz, .next
 	bit BIT_RAINBOWBADGE, [hl]
-	ld a, 50
+	ld a, 101
 	jr nz, .next
 	bit BIT_CASCADEBADGE, [hl]
-	ld a, 30
+	ld a, 101
 	jr nz, .next
-	ld a, 10
+	ld a, 101
 .next
 	ld b, a
 	ld c, a

scripts/VermilionCity.asm

@@ -50,8 +50,8 @@ VermilionCityScript0:
 	ld a, $3
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	ld a, [wObtainedBadges] ; ship returns after obtaining the soul badge
+	ld a, [wObtainedBadges] ; ship returns after obtaining the marsh badge
-	bit 4, a
+	bit 5, a
 	jr nz, .default
 	CheckEvent EVENT_SS_ANNE_LEFT
 	jr nz, .shipHasDeparted

text/CeladonGym.asm

@@ -49,13 +49,10 @@ _ErikaPostBattleAdviceText::
 
 _ErikaRainbowBadgeInfoText::
 	text "The RAINBOWBADGE"
-	line "will make #MON"
+	line "allows your"
-	cont "up to L50 obey."
+	cont "#MON to use"
-
+	cont "STRENGTH outside"
-	para "It also allows"
+	cont "of battle."
-	line "#MON to use"
-	cont "STRENGTH in and"
-	cont "out of battle."
 
 	para "Please also take"
 	line "this with you."

text/CeruleanGym.asm

@@ -27,15 +27,8 @@ _TM11ExplanationText::
 
 _MistyCascadeBadgeInfoText::
 	text "The CASCADEBADGE"
-	line "makes all #MON"
+	line "allows you to"
-	cont "up to L30 obey!"
+	cont "use CUT any time!"
-
-	para "That includes"
-	line "even outsiders!"
-
-	para "There's more, you"
-	line "can now use CUT"
-	cont "any time!"
 
 	para "You can CUT down"
 	line "small bushes to"

text/SaffronGym.asm

@@ -38,20 +38,7 @@ _SabrinaPostBattleAdviceText::
 	done
 
 _KogaMarshBadgeInfoText::
-	text "The MARSHBADGE"
+	text "Wait, please take"	; removed all of this text since obedience is no longer a thing
-	line "makes #MON up"
-	cont "to L70 obey you!"
-
-	para "Stronger #MON"
-	line "will become wild,"
-	cont "ignoring your"
-	cont "orders in battle!"
-
-	para "Just don't raise"
-	line "your #MON too"
-	cont "much!"
-
-	para "Wait, please take"
 	line "this TM with you!"
 	done
 

text/VermilionCity.asm

@@ -17,8 +17,8 @@ _VermilionCityTextSSAnneDeparted::
 	text "So, S.S.ANNE has"
 	line "departed!"
 
-	para "She'll be back in"
+	para "She'll be back"
-	line "about a year."
+	line "soon."		; changed since the ship actually comes back
 	done
 
 _SSAnneWelcomeText4::
@@ -82,9 +82,6 @@ _VermilionCityText6::
 	text "S.S.ANNE is a"
 	line "famous luxury"
 	cont "cruise ship."
-
-	para "We visit VERMILION"
-	line "once a year."
 	done
 
 _VermilionCityText7::
@@ -131,14 +128,10 @@ _VermilionCityText15::
 	line "has returned!"
 	done
 
-_RoingusText::
+_RoingusText::		; new NPC made as an inside joke, with a slight reference to Mew
-	text "Hey! You've gotta"
+	text "I wanna discover"
-	line "hear this!"
+	line "a new species of"
-
+	cont "#MON someday!"
-	para "A #MON that"
-	line "I've never seen"
-	cont "before appeared"
-	cont "near the dock!"
 
 	para "If I'm the first"
 	line "to discover it, I"

text/ViridianGym.asm

@@ -41,10 +41,7 @@ _GiovanniPostBattleAdviceText::
 
 _GiovanniEarthBadgeInfoText::
 	text "The EARTHBADGE"
-	line "makes #MON of"
+	line "is evidence of"
-	cont "any level obey!"
-
-	para "It is evidence of"
 	line "your mastery as a"
 	cont "#MON trainer!"