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

Merge master into sync-script

Browse Source
This commit is contained in:
GriffinR
2020-01-12 15:39:21 -05:00
parent aa84a1d3a1 15ff7eb2f8
commit f276383293
84 changed files with 16393 additions and 35195 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_0x8004, 6
goto_if_ge EventScript_16D941
special IsSelectedMonEgg
special Special_IsSelectedMonEgg
compare VAR_RESULT, 1
goto_if_eq EventScript_16D937
special ScrSpecial_CountPokemonMoves
special Special_GetNumMovesSelectedMonHas
compare VAR_RESULT, 1
goto_if_eq EventScript_16D92A
msgbox gUnknown_8199445
fadescreen FADE_TO_BLACK
special SelectMove
special Special_SelectMove
fadescreen FADE_FROM_BLACK
compare VAR_0x8005, 4
goto_if_eq EventScript_16D8B0
special ScrSpecial_GetPokemonNicknameAndMoveName
special Special_BufferMoveDeleterNicknameAndMove
msgbox gUnknown_8199485, MSGBOX_YESNO
compare VAR_RESULT, YES
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
@@ -48,11 +48,11 @@ EventScript_1716A5:: @ 81716A5
EventScript_1716BE:: @ 81716BE
msgbox gUnknown_81A2CC3
special SelectMoveTutorMon
special Special_SelectMoveTutorMon
waitstate
compare VAR_0x8004, 6
goto_if_ge EventScript_17179E
special IsSelectedMonEgg
special Special_IsSelectedMonEgg
compare VAR_RESULT, 1
goto_if_eq EventScript_171790
compare VAR_0x8005, 0