diff options
| -rw-r--r-- | data-de/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/scripts/maps/DewfordTown_Hall.inc | 8 | ||||
| -rw-r--r-- | data/specials.inc | 8 | ||||
| -rw-r--r-- | src/field/dewford_trend.c | 6 | ||||
| -rw-r--r-- | src/field/easy_chat.c | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 2ca180c26..7f3b89081 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1815,7 +1815,7 @@ DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 dodailyevents setvar VAR_SPECIAL_4, 0 - special sub_80FA5BC + special BufferTrendyPhraseString return DewfordTown_EventScript_1A010C:: @ 81A010C diff --git a/data/event_scripts.s b/data/event_scripts.s index 5ff370f99..898df7f3d 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1809,7 +1809,7 @@ DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 dodailyevents setvar VAR_SPECIAL_4, 0 - special sub_80FA5BC + special BufferTrendyPhraseString return DewfordTown_EventScript_1A010C:: @ 81A010C diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index e54ef8e50..530a4e04d 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -5,7 +5,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA5E4 + special TrendyPhraseIsOld compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 @@ -29,7 +29,7 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - special sub_80EB83C + special BufferRandomHobbyOrLifestyleString msgbox DewfordTown_Hall_Text_1755F9, 5 compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532F6 @@ -87,7 +87,7 @@ DewfordTown_Hall_EventScript_153353:: @ 8153353 DewfordTown_Hall_EventScript_153363:: @ 8153363 lockall call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA648 + special GetDewfordHallPaintingNameIndex switch RESULT case 0, DewfordTown_Hall_EventScript_1533CA case 4, DewfordTown_Hall_EventScript_1533CA @@ -133,7 +133,7 @@ DewfordTown_Hall_EventScript_1533FE:: @ 81533FE DewfordTown_Hall_EventScript_15340A:: @ 815340A call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA648 + special GetDewfordHallPaintingNameIndex switch RESULT case 0, DewfordTown_Hall_EventScript_153470 case 1, DewfordTown_Hall_EventScript_153470 diff --git a/data/specials.inc b/data/specials.inc index 71e08d91e..5c732309e 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -133,10 +133,10 @@ gSpecials:: def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged def_special TV_CopyNicknameToStringVar1AndEnsureTerminated def_special TV_CheckMonOTIDEqualsPlayerID - def_special sub_80FA5BC - def_special sub_80FA5E4 - def_special sub_80EB83C - def_special sub_80FA648 + def_special BufferTrendyPhraseString + def_special TrendyPhraseIsOld + def_special BufferRandomHobbyOrLifestyleString + def_special GetDewfordHallPaintingNameIndex def_special SwapRegisteredBike def_special CalculatePlayerPartyCount def_special sub_8095B6C diff --git a/src/field/dewford_trend.c b/src/field/dewford_trend.c index b67f3a2bd..9afb7a16d 100644 --- a/src/field/dewford_trend.c +++ b/src/field/dewford_trend.c @@ -202,14 +202,14 @@ void sub_80FA4E4(void *a, u32 b, u8 unused) *(dst++) = *(src++); } -void sub_80FA5BC(void) +void BufferTrendyPhraseString(void) { struct EasyChatPair *s = &gSaveBlock1.easyChatPairs[gSpecialVar_0x8004]; ConvertEasyChatWordsToString(gStringVar1, s->words, 2, 1); } -void sub_80FA5E4(void) +void TrendyPhraseIsOld(void) { u16 result = 0; @@ -222,7 +222,7 @@ void sub_80FA5E4(void) gSpecialVar_Result = result; } -void sub_80FA648(void) +void GetDewfordHallPaintingNameIndex(void) { gSpecialVar_Result = (gSaveBlock1.easyChatPairs[0].words[0] + gSaveBlock1.easyChatPairs[0].words[1]) & 7; } diff --git a/src/field/easy_chat.c b/src/field/easy_chat.c index 1dce5863e..94532506f 100644 --- a/src/field/easy_chat.c +++ b/src/field/easy_chat.c @@ -314,7 +314,7 @@ void sub_80EB7C4(void) ShowFieldAutoScrollMessage(gStringVar4); } -void sub_80EB83C(void) +void BufferRandomHobbyOrLifestyleString(void) { u16 group, local2; |