diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/pc.inc | 2 | ||||
| -rw-r--r-- | data/scripts/pokedex_rating.inc | 58 |
2 files changed, 30 insertions, 30 deletions
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index 6e266bdfc..6dc544270 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -90,7 +90,7 @@ EventScript_AccessProfOaksPC:: @ 81A6A7A compare VAR_RESULT, NO goto_if_eq EventScript_ExitOaksPC setflag FLAG_OAKS_RATING_IS_VIA_PC - call ProfOak_EventScript_RatePokedex + call PokedexRating_EventScript_Rate clearflag FLAG_OAKS_RATING_IS_VIA_PC goto EventScript_ExitOaksPC end diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 4a3d39042..8d313d200 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -1,40 +1,40 @@ -ProfOak_EventScript_RatePokedexInPerson:: @ 81A737B +PokedexRating_EventScript_RateInPerson:: @ 81A737B goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - call_if_set FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_DexCompleteIntro - call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_NormalIntro - call ProfOak_EventScript_RatePokedex + call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro + call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro + call PokedexRating_EventScript_Rate return -ProfOak_EventScript_DexCompleteIntro:: @ 81A73A4 - msgbox Text_LoveSeeingYourPokedex +PokedexRating_EventScript_DexCompleteIntro:: @ 81A73A4 + msgbox PokedexRating_Text_LoveSeeingYourPokedex return -ProfOak_EventScript_NormalIntro:: @ 81A73AD - msgbox Text_HowIsPokedexComingAlong +PokedexRating_EventScript_NormalIntro:: @ 81A73AD + msgbox PokedexRating_Text_HowIsPokedexComingAlong return -ProfOak_EventScript_ShowRatingMsg:: @ 81A73B6 +PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6 copyvar VAR_0x8004, VAR_0x8009 special Special_GetProfOaksRatingMessage waitmessage compare VAR_RESULT, FALSE - call_if_eq ProfOak_EventScript_RatingFanfare + call_if_eq PokedexRating_EventScript_NormalFanfare compare VAR_RESULT, TRUE - call_if_eq ProfOak_EventScript_DexCompleteFanfare + call_if_eq PokedexRating_EventScript_DexCompleteFanfare waitfanfare waitbuttonpress return -ProfOak_EventScript_RatingFanfare:: @ 81A73D8 +PokedexRating_EventScript_NormalFanfare:: @ 81A73D8 playfanfare MUS_FAN2 return -ProfOak_EventScript_DexCompleteFanfare:: @ 81A73DC +PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC playfanfare MUS_FANFA5 return -ProfOak_EventScript_RatePokedex:: @ 81A73E0 +PokedexRating_EventScript_Rate:: @ 81A73E0 setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable special Special_SetSomeVariable @@ -45,40 +45,40 @@ ProfOak_EventScript_RatePokedex:: @ 81A73E0 copyvar VAR_0x800A, VAR_RESULT getnumberstring 0, VAR_0x8008 @ Num Kanto Seen getnumberstring 1, VAR_0x8009 @ Num Kanto Caught - msgbox Text_YouveSeenXAndOwnedYMons - call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, ProfOak_EventScript_SetTextColor - call ProfOak_EventScript_ShowRatingMsg + msgbox PokedexRating_Text_SeenXOwnedY + call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, PokedexRating_EventScript_SetTextColor + call PokedexRating_EventScript_ShowRatingMsg compare VAR_0x800A, FALSE - goto_if_eq ProfOak_EventScript_EndRatePokedex @ National Dex not enabled + goto_if_eq PokedexRating_EventScript_EndRating @ National Dex not enabled setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 @ Num National Seen getnumberstring 1, VAR_0x8009 @ Num National Caught - msgbox Text_AndNationalDexSeenXOwnedY + msgbox PokedexRating_Text_NationalDexSeenXOwnedY specialvar VAR_RESULT, HasAllMons compare VAR_RESULT, FALSE - goto_if_eq ProfOak_EventScript_DexIncomplete + goto_if_eq PokedexRating_EventScript_DexIncomplete compare VAR_RESULT, TRUE - goto_if_eq ProfOak_EventScript_DexComplete + goto_if_eq PokedexRating_EventScript_DexComplete end -ProfOak_EventScript_SetTextColor:: @ 81A746D +PokedexRating_EventScript_SetTextColor:: @ 81A746D textcolor 0 return -ProfOak_EventScript_DexIncomplete:: @ 81A7470 - msgbox Text_LookForwardToFilledNationalDex - goto ProfOak_EventScript_EndRatePokedex +PokedexRating_EventScript_DexIncomplete:: @ 81A7470 + msgbox PokedexRating_Text_LookForwardToFilledNationalDex + goto PokedexRating_EventScript_EndRating end -ProfOak_EventScript_DexComplete:: @ 81A747E +PokedexRating_EventScript_DexComplete:: @ 81A747E setflag FLAG_OAK_SAW_DEX_COMPLETION - msgbox Text_YouveCompletedDex - goto ProfOak_EventScript_EndRatePokedex + msgbox PokedexRating_Text_YouveCompletedDex + goto PokedexRating_EventScript_EndRating end -ProfOak_EventScript_EndRatePokedex:: @ 81A748F +PokedexRating_EventScript_EndRating:: @ 81A748F special HelpSystem_RestoreSomeVariable return |