dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into script_pokemon_util

Browse Source
This commit is contained in:
PikalaxALT
2020-01-12 14:18:34 -05:00
parent bc4d3b892a 74fa8075ee
commit bcf07cb837
30 changed files with 399 additions and 1351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/FuchsiaCity_House3/scripts.inc
+6 -6
View File
@@ -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
data/maps/TwoIsland_House/scripts.inc
+2 -2
View File
@@ -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