dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-scriptclean

Browse Source
This commit is contained in:
GriffinR
2019-11-13 19:25:41 -05:00
committed by GitHub
parent 7455bd9b9a ef8370566f
commit ff7e11c0b0
113 changed files with 3816 additions and 3895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+14 -14
View File
@@ -1,9 +1,9 @@
LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790
map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_OnFrame
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_OnTransition
.byte 0
LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
LilycoveCity_PokemonTrainerFanClub_OnFrame: @ 821C790
map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A
.2byte 0
@@ -11,13 +11,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
lockall
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT
msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer, MSGBOX_DEFAULT
applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD
applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT
msgbox LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT
applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -118,7 +118,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
return
LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
setvar VAR_0x8005, 8
setvar VAR_0x8005, NUM_TRAINER_CLUB_MEMBERS
setvar VAR_0x8004, 8
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
@@ -469,7 +469,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
setvar VAR_0x8004, 15
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1
compare VAR_RESULT, TRUE
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7
@@ -481,13 +481,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, MSGBOX_DEFAULT
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_OnlyFan
msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive, MSGBOX_DEFAULT
release
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, MSGBOX_DEFAULT
LilycoveCity_PokemonTrainerFanClub_EventScript_OnlyFan:: @ 821CD67
msgbox LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth, MSGBOX_DEFAULT
release
end
@@ -609,11 +609,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed:: @ 821CEED
LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2:: @ 821CEFF
end
LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00
LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer: @ 821CF00
.string "Oh, wow!\n"
.string "It's {PLAYER}!$"
LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12
LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan: @ 821CF12
.string "I've heard the news!\n"
.string "You're really strong, aren't you?\p"
.string "We always argue about who is the\n"
@@ -834,11 +834,11 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE
.string "{STR_VAR_1} is definitely stronger!\n"
.string "I'm positive!$"
LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72
LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive: @ 821DE72
.string "You…\p"
.string "Impressive!$"
LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83
LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth: @ 821DE83
.string "Your true worth, it is fine if only\n"
.string "I recognized it.\p"
.string "The others I doubt will understand\n"