Sync Pokédex rating text with pokeyellow

engine/events/pokedex_rating.asm

@@ -26,7 +26,7 @@ DisplayDexRating:
 	CheckAndResetEventA EVENT_HALL_OF_FAME_DEX_RATING
 	jr nz, .hallOfFame
 	push hl
-	ld hl, PokedexRatingText_441cc
+	ld hl, DexCompletionText
 	call PrintText
 	pop hl
 	call PrintText
@@ -51,88 +51,88 @@ DisplayDexRating:
 	ld [de], a
 	ret
 
-PokedexRatingText_441cc:
+DexCompletionText:
-	text_far _OaksLabText_441cc
+	text_far _DexCompletionText
 	text_end
 
 DexRatingsTable:
-	dbw 10, PokedexRatingText01
+	dbw 10, DexRatingText_Own0To9
-	dbw 20, PokedexRatingText02
+	dbw 20, DexRatingText_Own10To19
-	dbw 30, PokedexRatingText03
+	dbw 30, DexRatingText_Own20To29
-	dbw 40, PokedexRatingText04
+	dbw 40, DexRatingText_Own30To39
-	dbw 50, PokedexRatingText05
+	dbw 50, DexRatingText_Own40To49
-	dbw 60, PokedexRatingText06
+	dbw 60, DexRatingText_Own50To59
-	dbw 70, PokedexRatingText07
+	dbw 70, DexRatingText_Own60To69
-	dbw 80, PokedexRatingText08
+	dbw 80, DexRatingText_Own70To79
-	dbw 90, PokedexRatingText09
+	dbw 90, DexRatingText_Own80To89
-	dbw 100, PokedexRatingText10
+	dbw 100, DexRatingText_Own90To99
-	dbw 110, PokedexRatingText11
+	dbw 110, DexRatingText_Own100To109
-	dbw 120, PokedexRatingText12
+	dbw 120, DexRatingText_Own110To119
-	dbw 130, PokedexRatingText13
+	dbw 130, DexRatingText_Own120To129
-	dbw 140, PokedexRatingText14
+	dbw 140, DexRatingText_Own130To139
-	dbw 150, PokedexRatingText15
+	dbw 150, DexRatingText_Own140To149
-	dbw NUM_POKEMON + 1, PokedexRatingText16
+	dbw NUM_POKEMON + 1, DexRatingText_Own150To151
 
-PokedexRatingText01:
+DexRatingText_Own0To9:
-	text_far _PokedexRatingText01
+	text_far _DexRatingText_Own0To9
 	text_end
 
-PokedexRatingText02:
+DexRatingText_Own10To19:
-	text_far _PokedexRatingText02
+	text_far _DexRatingText_Own10To19
 	text_end
 
-PokedexRatingText03:
+DexRatingText_Own20To29:
-	text_far _PokedexRatingText03
+	text_far _DexRatingText_Own20To29
 	text_end
 
-PokedexRatingText04:
+DexRatingText_Own30To39:
-	text_far _PokedexRatingText04
+	text_far _DexRatingText_Own30To39
 	text_end
 
-PokedexRatingText05:
+DexRatingText_Own40To49:
-	text_far _PokedexRatingText05
+	text_far _DexRatingText_Own40To49
 	text_end
 
-PokedexRatingText06:
+DexRatingText_Own50To59:
-	text_far _PokedexRatingText06
+	text_far _DexRatingText_Own50To59
 	text_end
 
-PokedexRatingText07:
+DexRatingText_Own60To69:
-	text_far _PokedexRatingText07
+	text_far _DexRatingText_Own60To69
 	text_end
 
-PokedexRatingText08:
+DexRatingText_Own70To79:
-	text_far _PokedexRatingText08
+	text_far _DexRatingText_Own70To79
 	text_end
 
-PokedexRatingText09:
+DexRatingText_Own80To89:
-	text_far _PokedexRatingText09
+	text_far _DexRatingText_Own80To89
 	text_end
 
-PokedexRatingText10:
+DexRatingText_Own90To99:
-	text_far _PokedexRatingText10
+	text_far _DexRatingText_Own90To99
 	text_end
 
-PokedexRatingText11:
+DexRatingText_Own100To109:
-	text_far _PokedexRatingText11
+	text_far _DexRatingText_Own100To109
 	text_end
 
-PokedexRatingText12:
+DexRatingText_Own110To119:
-	text_far _PokedexRatingText12
+	text_far _DexRatingText_Own110To119
 	text_end
 
-PokedexRatingText13:
+DexRatingText_Own120To129:
-	text_far _PokedexRatingText13
+	text_far _DexRatingText_Own120To129
 	text_end
 
-PokedexRatingText14:
+DexRatingText_Own130To139:
-	text_far _PokedexRatingText14
+	text_far _DexRatingText_Own130To139
 	text_end
 
-PokedexRatingText15:
+DexRatingText_Own140To149:
-	text_far _PokedexRatingText15
+	text_far _DexRatingText_Own140To149
 	text_end
 
-PokedexRatingText16:
+DexRatingText_Own150To151:
-	text_far _PokedexRatingText16
+	text_far _DexRatingText_Own150To151
 	text_end

text.asm

@@ -146,6 +146,7 @@ INCLUDE "data/text/text_3.asm"
 INCLUDE "text/RedsHouse1F.asm"
 INCLUDE "text/BluesHouse.asm"
 INCLUDE "text/OaksLab.asm"
+INCLUDE "text/pokedex_ratings.asm"
 INCLUDE "text/ViridianPokecenter.asm"
 INCLUDE "text/ViridianMart.asm"
 INCLUDE "text/ViridianSchoolHouse.asm"

text/OaksLab.asm

@@ -362,121 +362,3 @@ _OaksLabText_1d405::
 	text "I study #MON as"
 	line "PROF.OAK's AIDE."
 	done
-
-_OaksLabText_441cc::
-	text "#DEX comp-"
-	line "letion is:"
-
-	para "@"
-	text_decimal hDexRatingNumMonsSeen, 1, 3
-	text " #MON seen"
-	line "@"
-	text_decimal hDexRatingNumMonsOwned, 1, 3
-	text " #MON owned"
-
-	para "PROF.OAK's"
-	line "Rating:"
-	prompt
-
-_PokedexRatingText01::
-	text "You still have"
-	line "lots to do."
-	cont "Look for #MON"
-	cont "in grassy areas!"
-	done
-
-_PokedexRatingText02::
-	text "You're on the"
-	line "right track! "
-	cont "Get a FLASH HM"
-	cont "from my AIDE!"
-	done
-
-_PokedexRatingText03::
-	text "You still need"
-	line "more #MON!"
-	cont "Try to catch"
-	cont "other species!"
-	done
-
-_PokedexRatingText04::
-	text "Good, you're"
-	line "trying hard!"
-	cont "Get an ITEMFINDER"
-	cont "from my AIDE!"
-	done
-
-_PokedexRatingText05::
-	text "Looking good!"
-	line "Go find my AIDE"
-	cont "when you get 50!"
-	done
-
-_PokedexRatingText06::
-	text "You finally got at"
-	line "least 50 species!"
-	cont "Be sure to get"
-	cont "EXP.ALL from my"
-	cont "AIDE!"
-	done
-
-_PokedexRatingText07::
-	text "Ho! This is geting"
-	line "even better!"
-	done
-
-_PokedexRatingText08::
-	text "Very good!"
-	line "Go fish for some"
-	cont "marine #MON!"
-	done
-
-_PokedexRatingText09::
-	text "Wonderful!"
-	line "Do you like to"
-	cont "collect things?"
-	done
-
-_PokedexRatingText10::
-	text "I'm impressed!"
-	line "It must have been"
-	cont "difficult to do!"
-	done
-
-_PokedexRatingText11::
-	text "You finally got at"
-	line "least 100 species!"
-	cont "I can't believe"
-	cont "how good you are!"
-	done
-
-_PokedexRatingText12::
-	text "You even have the"
-	line "evolved forms of"
-	cont "#MON! Super!"
-	done
-
-_PokedexRatingText13::
-	text "Excellent! Trade"
-	line "with friends to"
-	cont "get some more!"
-	done
-
-_PokedexRatingText14::
-	text "Outstanding!"
-	line "You've become a"
-	cont "real pro at this!"
-	done
-
-_PokedexRatingText15::
-	text "I have nothing"
-	line "left to say!"
-	cont "You're the"
-	cont "authority now!"
-	done
-
-_PokedexRatingText16::
-	text "Your #DEX is"
-	line "entirely complete!"
-	cont "Congratulations!"
-	done

text/pokedex_ratings.asm

@@ -0,0 +1,117 @@
+_DexCompletionText::
+	text "#DEX comp-"
+	line "letion is:"
+
+	para "@"
+	text_decimal hDexRatingNumMonsSeen, 1, 3
+	text " #MON seen"
+	line "@"
+	text_decimal hDexRatingNumMonsOwned, 1, 3
+	text " #MON owned"
+
+	para "PROF.OAK's"
+	line "Rating:"
+	prompt
+
+_DexRatingText_Own0To9::
+	text "You still have"
+	line "lots to do."
+	cont "Look for #MON"
+	cont "in grassy areas!"
+	done
+
+_DexRatingText_Own10To19::
+	text "You're on the"
+	line "right track! "
+	cont "Get a FLASH HM"
+	cont "from my AIDE!"
+	done
+
+_DexRatingText_Own20To29::
+	text "You still need"
+	line "more #MON!"
+	cont "Try to catch"
+	cont "other species!"
+	done
+
+_DexRatingText_Own30To39::
+	text "Good, you're"
+	line "trying hard!"
+	cont "Get an ITEMFINDER"
+	cont "from my AIDE!"
+	done
+
+_DexRatingText_Own40To49::
+	text "Looking good!"
+	line "Go find my AIDE"
+	cont "when you get 50!"
+	done
+
+_DexRatingText_Own50To59::
+	text "You finally got at"
+	line "least 50 species!"
+	cont "Be sure to get"
+	cont "EXP.ALL from my"
+	cont "AIDE!"
+	done
+
+_DexRatingText_Own60To69::
+	text "Ho! This is geting"
+	line "even better!"
+	done
+
+_DexRatingText_Own70To79::
+	text "Very good!"
+	line "Go fish for some"
+	cont "marine #MON!"
+	done
+
+_DexRatingText_Own80To89::
+	text "Wonderful!"
+	line "Do you like to"
+	cont "collect things?"
+	done
+
+_DexRatingText_Own90To99::
+	text "I'm impressed!"
+	line "It must have been"
+	cont "difficult to do!"
+	done
+
+_DexRatingText_Own100To109::
+	text "You finally got at"
+	line "least 100 species!"
+	cont "I can't believe"
+	cont "how good you are!"
+	done
+
+_DexRatingText_Own110To119::
+	text "You even have the"
+	line "evolved forms of"
+	cont "#MON! Super!"
+	done
+
+_DexRatingText_Own120To129::
+	text "Excellent! Trade"
+	line "with friends to"
+	cont "get some more!"
+	done
+
+_DexRatingText_Own130To139::
+	text "Outstanding!"
+	line "You've become a"
+	cont "real pro at this!"
+	done
+
+_DexRatingText_Own140To149::
+	text "I have nothing"
+	line "left to say!"
+	cont "You're the"
+	cont "authority now!"
+	done
+
+_DexRatingText_Own150To151::
+	text "Your #DEX is"
+	line "entirely complete!"
+	cont "Congratulations!"
+	done