diff options
| author | GriffinR <25753467+GriffinRichards@users.noreply.github.com> | 2019-08-04 12:00:42 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-08-21 17:06:55 -0500 |
| commit | 009caa21c860bcf704c1c156ba54dbeb99728f8b (patch) | |
| tree | 80d29f2cf77171a4fd1d32e1f808db796bc65464 /data | |
| parent | 5d96a0cc97431d4935042fa58e0ff06f4db8a43d (diff) | |
some contest lady funcs
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 10 | ||||
| -rw-r--r-- | data/specials.inc | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 1952fae93..50eb0dac0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4701,7 +4701,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A88B0:: @ 82A88B0 LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA fadescreen 1 - special sub_818E92C + special OpenPokeblockCaseForContestLady waitstate compare VAR_RESULT, 65535 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 @@ -4719,8 +4719,8 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 LilycoveCity_PokemonCenter_1F_EventScript_2A88F6:: @ 82A88F6 msgbox LilycoveCity_PokemonCenter_1F_Text_2A9571, MSGBOX_DEFAULT - special sub_818E940 - special sub_818E960 + special ContestLadyGivenPokeblock + special GetContestLadyMonSpecies goto LilycoveCity_PokemonCenter_1F_EventScript_2A890A end @@ -4810,9 +4810,9 @@ LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2 step_end LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7 - specialvar VAR_RESULT, sub_818E990 + specialvar VAR_RESULT, GetContestLadyCategory special sub_818E914 - special sub_818E960 + special GetContestLadyMonSpecies compare VAR_RESULT, 0 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A compare VAR_RESULT, 1 diff --git a/data/specials.inc b/data/specials.inc index bf2d6621e..5c2eaa760 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -409,10 +409,10 @@ gSpecials:: @ 81DBA64 def_special sub_818E8E0 def_special sub_818E8B4 def_special sub_818E914 - def_special sub_818E92C - def_special sub_818E940 - def_special sub_818E960 - def_special sub_818E990 + def_special OpenPokeblockCaseForContestLady + def_special ContestLadyGivenPokeblock + def_special GetContestLadyMonSpecies + def_special GetContestLadyCategory def_special PutLilycoveContestLadyShowOnTheAir def_special sub_813B880 def_special CallApprenticeFunction |