diff --git a/README.md b/README.md
index 7ff1b282..e0ec4762 100644
--- a/README.md
+++ b/README.md
@@ -388,6 +388,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
 * Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FemC sprites and the Battle Tent.
 * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld, and generally being an amazing individual.
 * BGVC - Composed the original 4-channel version of the unused Koukan (trading) music.
+* Rainbow Metal Pigeon - Bug fix relating to Gym Leader rematches.
 * SatoMew - Technical advice.
 * wrulfy - Technical advice.
 * suloku - Technical advice regarding setting where you spawn after beating the Elite Four, Exp. All modernisation code
diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm
index 72cffd1d..68e4a4b4 100644
--- a/scripts/CeladonGym.asm
+++ b/scripts/CeladonGym.asm
@@ -118,6 +118,7 @@ ErikaText:
 	ld c, BANK(Music_MeetMaleTrainer)
 	ld a, MUSIC_MEET_MALE_TRAINER
 	call PlayMusic
+	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
 	ldh a, [hSpriteIndex]
diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm
index a84863ae..7513c2ed 100644
--- a/scripts/CeruleanGym.asm
+++ b/scripts/CeruleanGym.asm
@@ -107,6 +107,7 @@ MistyText:
 	ld c, BANK(Music_MeetMaleTrainer)
 	ld a, MUSIC_MEET_MALE_TRAINER
 	call PlayMusic
+	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
 	ldh a, [hSpriteIndex]
diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm
index d39dd394..c7172b6a 100644
--- a/scripts/CinnabarGym.asm
+++ b/scripts/CinnabarGym.asm
@@ -225,6 +225,7 @@ BlaineText:
 	ld c, BANK(Music_MeetMaleTrainer)
 	ld a, MUSIC_MEET_MALE_TRAINER
 	call PlayMusic
+	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
 	ldh a, [hSpriteIndex]
diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm
index 299afb37..27f57c5c 100644
--- a/scripts/FuchsiaGym.asm
+++ b/scripts/FuchsiaGym.asm
@@ -118,6 +118,7 @@ KogaText:
 	ld c, BANK(Music_MeetMaleTrainer)
 	ld a, MUSIC_MEET_MALE_TRAINER
 	call PlayMusic
+	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
 	ldh a, [hSpriteIndex]
diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm
index 80e8779c..952f465d 100644
--- a/scripts/PewterGym.asm
+++ b/scripts/PewterGym.asm
@@ -110,6 +110,7 @@ BrockText:
 	ld c, BANK(Music_MeetMaleTrainer)
 	ld a, MUSIC_MEET_MALE_TRAINER
 	call PlayMusic
+	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
 	ldh a, [hSpriteIndex]
diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm
index 12c9c5cd..476c18ba 100644
--- a/scripts/SaffronGym.asm
+++ b/scripts/SaffronGym.asm
@@ -119,6 +119,7 @@ SabrinaText:
 	ld c, BANK(Music_MeetMaleTrainer)
 	ld a, MUSIC_MEET_MALE_TRAINER
 	call PlayMusic
+	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
 	ldh a, [hSpriteIndex]
diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm
index c2d19c92..3a26be24 100644
--- a/scripts/VermilionGym.asm
+++ b/scripts/VermilionGym.asm
@@ -126,6 +126,7 @@ LTSurgeText:
 	ld c, BANK(Music_MeetMaleTrainer)
 	ld a, MUSIC_MEET_MALE_TRAINER
 	call PlayMusic
+	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
 	ldh a, [hSpriteIndex]
diff --git a/scripts/ViridianPreGym.asm b/scripts/ViridianPreGym.asm
index 736710d1..8281fc30 100644
--- a/scripts/ViridianPreGym.asm
+++ b/scripts/ViridianPreGym.asm
@@ -100,6 +100,7 @@ YujirouText:
 	ld c, BANK(Music_MeetMaleTrainer)
 	ld a, MUSIC_MEET_MALE_TRAINER
 	call PlayMusic
+	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
 	ldh a, [hSpriteIndex]