diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-12 14:18:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 14:18:22 -0500 |
| commit | 74fa8075ee4018ba9b7e610212cf7c7777c4edb4 (patch) | |
| tree | ff905ff37f845cdb34f1632d8fa0d1235c062b7f /data | |
| parent | 519558ddd32c04da00b88b4343d32ac04a8a73d1 (diff) | |
| parent | e300f2ece0bd3c5c0967ac635a48ccd8ef13cf50 (diff) | |
Merge pull request #210 from jiangzhengwenjz/party_menu
script_pokemon_util_80BF8FC
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/FuchsiaCity_House3/scripts.inc | 12 | ||||
| -rw-r--r-- | data/maps/TwoIsland_House/scripts.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index da4f19e60..dfbfd1365 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -16,19 +16,19 @@ EventScript_16D8B0:: @ 816D8B0 waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16D941 - special IsSelectedMonEgg + special Special_IsSelectedMonEgg compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16D937 - special ScrSpecial_CountPokemonMoves + special Special_GetNumMovesSelectedMonHas compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16D92A msgbox gUnknown_8199445 fadescreen 1 - special SelectMove + special Special_SelectMove fadescreen 0 compare_var_to_value VAR_0x8005, 4 goto_if eq, EventScript_16D8B0 - special ScrSpecial_GetPokemonNicknameAndMoveName + special Special_BufferMoveDeleterNicknameAndMove msgbox gUnknown_8199485, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16D919 @@ -36,7 +36,7 @@ EventScript_16D8B0:: @ 816D8B0 end EventScript_16D919:: @ 816D919 - special DeleteMonMove + special Special_MoveDeleterForgetMove playfanfare MUS_ME_WASURE waitfanfare msgbox gUnknown_81994B1 @@ -44,7 +44,7 @@ EventScript_16D919:: @ 816D919 end EventScript_16D92A:: @ 816D92A - special ScrSpecial_GetPokemonNicknameAndMoveName + special Special_BufferMoveDeleterNicknameAndMove msgbox gUnknown_8199465 release end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 40c68cb7e..3841620b0 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -53,11 +53,11 @@ EventScript_1716A5:: @ 81716A5 EventScript_1716BE:: @ 81716BE msgbox gUnknown_81A2CC3 - special SelectMoveTutorMon + special Special_SelectMoveTutorMon waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_17179E - special IsSelectedMonEgg + special Special_IsSelectedMonEgg compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_171790 compare_var_to_value VAR_0x8005, 0 diff --git a/data/specials.inc b/data/specials.inc index f7ca055ef..922d9677e 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -227,11 +227,11 @@ gSpecials:: @ 815FD60 def_special Special_GetElevatorFloor def_special nullsub_75 def_special nullsub_75 - def_special SelectMoveTutorMon - def_special SelectMove - def_special DeleteMonMove - def_special ScrSpecial_GetPokemonNicknameAndMoveName - def_special ScrSpecial_CountPokemonMoves + def_special Special_SelectMoveTutorMon + def_special Special_SelectMove + def_special Special_MoveDeleterForgetMove + def_special Special_BufferMoveDeleterNicknameAndMove + def_special Special_GetNumMovesSelectedMonHas def_special DisplayMoveTutorMenu def_special nullsub_75 def_special nullsub_75 @@ -336,7 +336,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special Special_GetSpeciesOfPartySlot_x8004 - def_special IsSelectedMonEgg + def_special Special_IsSelectedMonEgg def_special nullsub_75 def_special nullsub_75 def_special LoadPlayerBag |