diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 7a7d80250..8ee9316b2 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -68,6 +68,7 @@ Some fixes are mentioned as breaking compatibility with link battles. This can b
 - [Swimming NPCs aren't limited by their movement radius](#swimming-npcs-arent-limited-by-their-movement-radius)
 - [`CheckOwnMon` only checks the first five letters of OT names](#checkownmon-only-checks-the-first-five-letters-of-ot-names)
 - [Catching a Transformed Pokémon always catches a Ditto](#catching-a-transformed-pokémon-always-catches-a-ditto)
+- [If your party and current PC box are full during the Dude's catching tutorial, his Poké Ball can't be used and may crash the game](#if-your-party-and-current-pc-box-are-full-during-the-dudes-catching-tutorial-his-poké-ball-cant-be-used-and-may-crash-the-game)
 - [Using a Park Ball in normal battles has a corrupt animation](#using-a-park-ball-in-normal-battles-has-a-corrupt-animation)
 - [`HELD_CATCH_CHANCE` has no effect](#held_catch_chance-has-no-effect)
 - [Only the first three evolution entries can have Stone compatibility reported correctly](#only-the-first-three-evolution-entries-can-have-stone-compatibility-reported-correctly)
@@ -1881,6 +1882,33 @@ This bug can affect Mew or Pokémon other than Ditto that used Transform via Mir
 ```
 
 
+## If your party and current PC box are full during the Dude's catching tutorial, his Poké Ball can't be used and may crash the game
+([Video](https://www.youtube.com/watch?v=A8zaTOkjKS4&t=407))
+
+**Fix:** Edit `PokeBallEffect` in [engine/items/item_effects.asm](https://github.com/pret/pokecrystal/blob/master/engine/items/item_effects.asm):
+
+```diff
+     ld a, [wBattleMode]
+     dec a
+     jp nz, UseBallInTrainerBattle
+ 
++    ld a, [wBattleType]
++    cp BATTLETYPE_TUTORIAL
++    jr z, .room_in_party
++
+     ld a, [wPartyCount]
+     cp PARTY_LENGTH
+     jr nz, .room_in_party
+ 
+     ld a, BANK(sBoxCount)
+     call GetSRAMBank
+     ld a, [sBoxCount]
+     cp MONS_PER_BOX
+     call CloseSRAM
+     jp z, Ball_BoxIsFullMessage
+```
+
+
 ## Using a Park Ball in normal battles has a corrupt animation
 
 ([Video](https://www.youtube.com/watch?v=v1ErZdLCIyU))