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

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+20 -20
View File
@@ -2,40 +2,40 @@
.equ LOCALID_BIKER, 2
.equ LOCALID_LOSTELLE, 3
TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0
TwoIsland_JoyfulGameCorner_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_JoyfulGameCorner_OnFrame
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
.byte 0
TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5
TwoIsland_JoyfulGameCorner_OnTransition::
call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos
end
TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos:: @ 81713EF
TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos::
setobjectxyperm LOCALID_DADDY, 6, 2
setobjectmovementtype LOCALID_DADDY, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND
setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
return
TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404
TwoIsland_JoyfulGameCorner_OnWarp::
map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, EventScript_CheckTurnAttendant
.2byte 0
TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth:: @ 8171416
TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B
TwoIsland_JoyfulGameCorner_OnFrame::
map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene
map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
.2byte 0
TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: @ 8171435
TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene::
lockall
textcolor 0
msgbox TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle
@@ -49,7 +49,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: @ 8171435
releaseall
end
TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F
TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
lockall
textcolor 0
applymovement LOCALID_DADDY, Movement_171520
@@ -96,7 +96,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F
releaseall
end
Movement_171520:: @ 8171520
Movement_171520::
walk_left
walk_right
walk_right
@@ -105,19 +105,19 @@ Movement_171520:: @ 8171520
delay_16
step_end
Movement_171527:: @ 8171527
Movement_171527::
walk_down
walk_down
walk_down
walk_in_place_fastest_left
step_end
Movement_17152C:: @ 817152C
Movement_17152C::
walk_left
walk_in_place_fastest_right
step_end
TwoIsland_JoyfulGameCorner_Movement_BikerLookAround:: @ 817152F
TwoIsland_JoyfulGameCorner_Movement_BikerLookAround::
walk_in_place_fastest_left
delay_8
walk_in_place_fastest_right
@@ -125,7 +125,7 @@ TwoIsland_JoyfulGameCorner_Movement_BikerLookAround:: @ 817152F
walk_in_place_fastest_up
step_end
TwoIsland_JoyfulGameCorner_EventScript_InfoMan:: @ 8171535
TwoIsland_JoyfulGameCorner_EventScript_InfoMan::
lock
faceplayer
compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
@@ -135,13 +135,13 @@ TwoIsland_JoyfulGameCorner_EventScript_InfoMan:: @ 8171535
release
end
TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon:: @ 8171555
TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon::
msgbox TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon
release
end
@ Only referred to as Lostelles Daddy in text
TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy:: @ 817155F
TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy::
lock
faceplayer
compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
@@ -153,7 +153,7 @@ TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy:: @ 817155F
release
end
TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A
TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite::
goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone
msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsForMe
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
@@ -168,7 +168,7 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A
goto TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone
end
TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone:: @ 81715C4
TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone::
checkitemspace ITEM_MOON_STONE, 1
compare VAR_RESULT, FALSE
goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone
@@ -178,18 +178,18 @@ TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone:: @ 81715C4
release
end
TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning:: @ 81715F5
TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning::
msgbox TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning
release
end
TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone:: @ 81715FF
TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone::
setflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE
msgbox TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag
release
end
TwoIsland_JoyfulGameCorner_EventScript_Lostelle:: @ 817160C
TwoIsland_JoyfulGameCorner_EventScript_Lostelle::
lock
faceplayer
msgbox TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool
data/maps/TwoIsland_JoyfulGameCorner/text.inc
+18 -18
View File
@@ -1,10 +1,10 @@
TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo:: @ 81A2408
TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo::
.string "Now, where's LOSTELLE gotten to\n"
.string "today?\p"
.string "She always brings me lunch every\n"
.string "day right about now…$"
TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle:: @ 81A2465
TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle::
.string "Hm? You, there!\n"
.string "Are you a friend of LOSTELLE's?\p"
.string "Have you seen LOSTELLE around?\n"
@@ -17,7 +17,7 @@ TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle:: @ 81A2465
.string "Please, help me find her!\n"
.string "Please go search THREE ISLAND!$"
TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland:: @ 81A259A
TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland::
.string "Hah? What is this GAME CORNER?\n"
.string "How much sadder can this get?\p"
.string "Those clowns…\p"
@@ -26,24 +26,24 @@ TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland:: @ 81A259A
.string "Hey, you! Is this the only THREE\n"
.string "ISLAND around here?$"
TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt:: @ 81A2658
TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt::
.string "Try waking up before you crawl out\n"
.string "of bed, you punk.\p"
.string "This is TWO ISLAND!\p"
.string "Move it! Get your filthy motorbike\n"
.string "out of my place!$"
TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing:: @ 81A26D5
TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing::
.string "Huh…\n"
.string "Oh, oh, gotcha.\p"
.string "Tch…\n"
.string "These islands are confusing…$"
TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor:: @ 81A270C
TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor::
.string "Would you look at that?\n"
.string "That punk scuffed up my floor.$"
TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland:: @ 81A2743
TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland::
.string "Hey, but listen! I'm begging you,\n"
.string "you have to go to THREE ISLAND.\p"
.string "If anything were to happen to my\n"
@@ -55,26 +55,26 @@ TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland:: @ 81A2743
.string "That's why I have to get you to do\n"
.string "me this big favor.$"
TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday:: @ 81A285C
TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday::
.string "I'm sorry.\n"
.string "We're not running any games today.$"
TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon:: @ 81A288A
TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon::
.string "We'll get the games going soon\n"
.string "for you!$"
TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle:: @ 81A28B2
TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle::
.string "So you rescued LOSTELLE?\n"
.string "How can I thank you?\p"
.string "LOSTELLE, darling, forgive me!\p"
.string "Daddy didn't know you were scared\n"
.string "and in trouble!$"
TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy:: @ 81A2931
TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy::
.string "LOSTELLE: It's okay, Daddy.\n"
.string "I got to be friends with {PLAYER}!$"
TwoIsland_JoyfulGameCorner_Text_ThisIsForMe:: @ 81A296A
TwoIsland_JoyfulGameCorner_Text_ThisIsForMe::
.string "Oh, what's that?\n"
.string "You're saying that this is for me?\p"
.string "How did you know that I love rare\n"
@@ -82,31 +82,31 @@ TwoIsland_JoyfulGameCorner_Text_ThisIsForMe:: @ 81A296A
.string "You sure know how to make a guy\n"
.string "happy.$"
TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy:: @ 81A29F7
TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy::
.string "{PLAYER} handed the METEORITE\n"
.string "to LOSTELLE's daddy.$"
TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill:: @ 81A2A24
TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill::
.string "Oh, I see, this is from BILL!\n"
.string "You have to thank him for me!\p"
.string "You know, you've been fantastic.\n"
.string "I want you to have this.$"
TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy:: @ 81A2A9A
TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy::
.string "{PLAYER} received a MOON STONE\n"
.string "from LOSTELLE's daddy.$"
TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag:: @ 81A2ACA
TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag::
.string "Your BAG's not going to fit another\n"
.string "thing…$"
TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning:: @ 81A2AF5
TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning::
.string "All right, I'll get the GAME CORNER\n"
.string "running right away.\p"
.string "You have to come visit with a\n"
.string "friend.$"
TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool:: @ 81A2B53
TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool::
.string "Listen, listen!\p"
.string "Please show me you being cool\n"
.string "again!$"