diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-08-22 17:34:42 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-08-22 17:34:42 -0500 |
| commit | bfc4b338cbd3e78062c71ff6f72f821631277c1b (patch) | |
| tree | 0b233c9bebd8ab6ba9612907b4a20b1e2d8a9c5e /data | |
| parent | e81986cd20dbe0d8a98da646d964310a066f1af5 (diff) | |
rename some mauville man stuff
Diffstat (limited to 'data')
| -rw-r--r-- | data/mauville_old_man.s | 23 | ||||
| -rw-r--r-- | data/scripts/giddy.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 4 insertions, 23 deletions
diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index 5c4bd47b9..f96963d2d 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -3,27 +3,8 @@ .section .rodata - .align 1 -gUnknown_083E537C:: @ 83E537C -.ifdef ENGLISH - ec_word SISTER - ec_word EATS - ec_word SWEETS - ec_word VORACIOUS - ec_word AND - ec_word DROOLING -.else - ec_word SISTER - ec_word MUST_BE - ec_word SWEETS - ec_word VORACIOUS - ec_word DROOLING - ec_word THICK -.endif - - .align 2 -gUnknown_083E5388:: @ 83E5388 +gGiddyAdjectives:: @ 83E5388 .4byte OtherText_SoPretty .4byte OtherText_SoDarling .4byte OtherText_SoRelaxed @@ -34,7 +15,7 @@ gUnknown_083E5388:: @ 83E5388 .4byte OtherText_SoMagical .align 2 -gUnknown_083E53A8:: @ 83E53A8 +gGiddyQuestions:: @ 83E53A8 .4byte OtherText_WantVacationNicePlace .4byte OtherText_BoughtCrayonsIsNice .4byte OtherText_IfWeCouldFloat diff --git a/data/scripts/giddy.inc b/data/scripts/giddy.inc index 263589fe9..bc7b1b8f1 100644 --- a/data/scripts/giddy.inc +++ b/data/scripts/giddy.inc @@ -30,7 +30,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 end MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E - special sub_80F7CF4 + special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 waittext yesnobox 20, 8 diff --git a/data/specials.inc b/data/specials.inc index 0eb6b742d..e588a29d3 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -112,7 +112,7 @@ gSpecials:: def_special sub_80F7C90 def_special sub_80F7C54 def_special sub_80F83D0 - def_special sub_80F7CF4 + def_special ScrSpecial_GenerateGiddyLine def_special sub_80F7CC8 def_special sub_80F889C def_special sub_80F8888 |