Cycling Road Grass Fix

bytereplacement

@@ -37,7 +37,7 @@
 0809FE62 09
 0809FDD4 FF C9 9A 3B
 ##Really Tall Grass & Micro Grass Fix
-08059F34 00 21 00 06 00 0e 02 28 01 d0 d1 28 01 d1 01 20 00 e0 00 20 00 21 70 47 03 28 f5 e7
+08059F20 C0 46 00 06 00 0E 16 28 01 D0 00 20 00 E0 01 20 70 47 C0 46 C0 46 00 06 00 0E 02 28 01 D0 D1 28 01 D1 01 20 00 E0 00 20 70 47 C0 46 03 28 EB E7
 0805A0EC 0C 30 09 E0
 ##Snowflake Fix
 0807C23E 4B E0

special_inserts.asm

@@ -270,6 +270,35 @@ OverworldBasic:
 	bl 0xF67B8 @DoScheduledBgTilemapCopiesToVram
 	bl 0x6BA8 @BuildOamBuffer
 	pop {pc}
+
+.org 0x59F20, 0xFF
+VeryTallGrassFix:
+	mov r8, r8
+	lsl r0, #0x18
+	lsr r0, #0x18
+	cmp r0, #0x16
+	beq 0x59F2E
+	mov r0, #0x0
+	b 0x59F30
+	mov r0, #0x1
+	bx lr
+	mov r8, r8
+
+	mov r8, r8
+	lsl r0, #0x18
+	lsr r0, #0x18
+	cmp r0, #0x2
+	beq 0x59F42
+	cmp r0, #0xD1
+	bne 0x59F46
+	mov r0, #0x1
+	b 0x59F48
+	mov r0, #0x0
+	bx lr
+	mov r8, r8
+
+	cmp r0, #0x3
+	b 0x59F28
 */
 
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@

src/field_effects.c

@@ -441,7 +441,6 @@ static void FldEff_LavaBubbles(void)
 	}
 }
 
-#ifdef MB_UNDERGROUND_MINING
 static void SpriteCB_MiningScanRing(struct Sprite* sprite)
 {
 	if (sprite->affineAnimEnded)
@@ -452,6 +451,7 @@ static void SpriteCB_MiningScanRing(struct Sprite* sprite)
 	}
 }
 
+#ifdef MB_UNDERGROUND_MINING
 static u8 GetNumMiningSpots(void)
 {
 	u16 width = gMapHeader.mapLayout->width;

src/start_menu.c

@@ -266,7 +266,7 @@ bool8 StartCB_HandleInput(void)
 		PlaySE(SE_SELECT);
 		sStartMenuCursorPos = Menu_MoveCursor(-1);
 		#ifndef UNBOUND
-		if (!MenuHelpers_LinkSomething() && InUnionRoom() != TRUE && gSaveBlock2->optionsButtonMode == OPTIONS_BUTTON_MODE_HELP)
+		if (!MenuHelpers_LinkSomething() && InUnionRoom() != TRUE)
 		{
 			PrintTextOnHelpMessageWindow(sStartMenuDescPointers[sStartMenuOrder[sStartMenuCursorPos]], 2);
 		}
@@ -277,7 +277,7 @@ bool8 StartCB_HandleInput(void)
 		PlaySE(SE_SELECT);
 		sStartMenuCursorPos = Menu_MoveCursor(+1);
 		#ifndef UNBOUND
-		if (!MenuHelpers_LinkSomething() && InUnionRoom() != TRUE && gSaveBlock2->optionsButtonMode == OPTIONS_BUTTON_MODE_HELP)
+		if (!MenuHelpers_LinkSomething() && InUnionRoom() != TRUE)
 		{
 			PrintTextOnHelpMessageWindow(sStartMenuDescPointers[sStartMenuOrder[sStartMenuCursorPos]], 2);
 		}
@@ -347,7 +347,7 @@ static bool8 ReloadStartMenuItems(void)
 	{
 		sStartMenuCursorPos = Menu_InitCursor(GetStartMenuWindowId(), 2, 0, 0, 15, sNumStartMenuItems, sStartMenuCursorPos);
 		#ifndef UNBOUND
-		if (!MenuHelpers_LinkSomething() && InUnionRoom() != TRUE && gSaveBlock2->optionsButtonMode == OPTIONS_BUTTON_MODE_HELP)
+		if (!MenuHelpers_LinkSomething() && InUnionRoom() != TRUE)
 		{
 			DrawHelpMessageWindowWithText(sStartMenuDescPointers[sStartMenuOrder[sStartMenuCursorPos]]);
 		}

strings/frontier_trainer_text.string

@@ -672,7 +672,7 @@ Yeah! Let's do this again!\n[.]Oops. You're out of Pok\emon!
 Hiyah!\nThere's no holding anything back!
 
 #org @sFrontierText_BattleGirl_PlayerWin_3
-I[.]I concede! I think you're on a\ndifferent level[.]
+I[.] I concede! I think you're on a\ndifferent level[.]
 
 #org @sFrontierText_BattleGirl_PlayerLose_3
 Hiyah! I put you in your place!\nYou better appreciate it!
@@ -1355,16 +1355,16 @@ Even if you lose, never lose your\nlove of Pok\emon.
 Ha ha ha ha!\nLook who I ran into again!\p[PLAYER]!\pI've been looking forward to\nanother battle with you!\pNow, let's see what you can do to\nthe kingpin of Antisis City!
 
 #org @sFrontierText_BigMo_PlayerWin
-Ha ha ha ha!\pThey should start calling you\nBig [PLAYER_NAME]!
+Ha ha ha ha!\pThey should start calling you\nBig [PLAYER]!
 
 #org @sFrontierText_BigMo_PlayerLose
 Ha ha ha ha!\pLooks like I'm bigger an' better!
 
 #org @sFrontierText_Galavan_PreBattle
-Yo, wazzup, [PLAYER]?\pHowzit goin' these days?\pI'm sure ya had no problem makin'\nyour way to this point.\pWell, it's time to fret, 'cause I'm\nabout to end your streak!
+Yo, wazzup, [PLAYER]?\pHowzit goin' these days?\pI'm sure ya had no problem makin'\nyour way to this point.\pWell, it's time to fret, 'cause I'm\nabout to end your streak!\pHa ha ha!
 
 #org @sFrontierText_Galavan_PlayerWin
-Whoa, ya sure showed me how to\nbattle!
+Whoa, ya sure showed me how to\nbattle! Ha ha ha!
 
 #org @sFrontierText_Galavan_PlayerLose
 And you weren't even at any\ndisadvantage! Ha ha ha!