Merge pull request #138 from TrainerX493/master

Label some names entries from text_offsets.asm
pret · Oct 28, 2023 · 7531184 · 7531184
2 parents 705df56 + cdfcb77
commit 7531184
Show file tree

Hide file tree

Showing 30 changed files with 1,267 additions and 1,266 deletions.
diff --git a/bugs_and_glitches.md b/bugs_and_glitches.md
@@ -531,7 +531,7 @@ HandleAICowardice:
 
 When playing the challenge cup, player name is used instead of rival name before the first fight, as seen here: https://www.youtube.com/watch?v=1igDbNxRfUw&t=17310s
 
-**Fix:** Edit `Text0533` in `text6.asm`: 
+**Fix:** Edit `Clerk12ChallengeCupContenderText` in `text6.asm`: 
 ```diff
 -	text "Presently, <RAMNAME> is still"
 +	text "Presently, <RAMTEXT> is still"

diff --git a/src/data/cards.asm b/src/data/cards.asm
@@ -8290,7 +8290,7 @@ PidgeotLv38Card:
 	db 38 ; level
 	db 4, 11 ; length
 	dw 87 * 10 ; weight
-	tx Pidgeot1Description ; description
+	tx PidgeotLv38Description ; description
 	db 0
 
 PidgeotLv40Card:
@@ -8341,7 +8341,7 @@ PidgeotLv40Card:
 	db 40 ; level
 	db 4, 11 ; length
 	dw 87 * 10 ; weight
-	tx Pidgeot2Description ; description
+	tx PidgeotLv40Description ; description
 	db 0
 
 RattataCard: