diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/scripts/maps/DewfordTown_Hall.inc | 6 | ||||
| -rw-r--r-- | data/specials.inc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 1343a4fa9..25b0c7b52 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1890,7 +1890,7 @@ DewfordTown_EventScript_271E8B:: @ 8271E8B DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B dodailyevents setvar VAR_0x8004, 0 - special sub_8122998 + special BufferTrendyPhraseString return DewfordTown_EventScript_271E95:: @ 8271E95 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 3f9518722..4d4c3732d 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -5,7 +5,7 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - special sub_81229C8 + special TrendyPhraseIsOld compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD4EF msgbox DewfordTown_Hall_Text_1FD818, 4 @@ -87,7 +87,7 @@ DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 lockall call DewfordTown_Hall_EventScript_271E8B - special sub_8122A30 + special GetDewfordHallPaintingNameIndex switch VAR_RESULT case 0, DewfordTown_Hall_EventScript_1FD607 case 4, DewfordTown_Hall_EventScript_1FD607 @@ -133,7 +133,7 @@ DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 call DewfordTown_Hall_EventScript_271E8B - special sub_8122A30 + special GetDewfordHallPaintingNameIndex switch VAR_RESULT case 0, DewfordTown_Hall_EventScript_1FD6AD case 1, DewfordTown_Hall_EventScript_1FD6AD diff --git a/data/specials.inc b/data/specials.inc index ab1a441ff..394e4a10e 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -137,10 +137,10 @@ gSpecials:: @ 81DBA64 def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged def_special TV_CopyNicknameToStringVar1AndEnsureTerminated def_special TV_CheckMonOTIDEqualsPlayerID - def_special sub_8122998 - def_special sub_81229C8 + def_special BufferTrendyPhraseString + def_special TrendyPhraseIsOld def_special sub_811EF6C - def_special sub_8122A30 + def_special GetDewfordHallPaintingNameIndex def_special sub_80D6EDC def_special CalculatePlayerPartyCount def_special CountPartyNonEggMons |