Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-09-27 12:27:00 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeruby into porymap-6

Browse Source
This commit is contained in:
GriffinR
2025-05-14 12:04:46 -04:00
parent bc5aeaa64e 9ed27e20f9
commit 1439b0e84f
721 changed files with 10636 additions and 10660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/scripts/new_game.inc vendored
View File

@@ -109,11 +109,11 @@ EventScript_ResetAllMapFlags:: @ 819FA81
setflag FLAG_UNKNOWN_2F4
setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1
setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
setflag FLAG_UNKNOWN_30E
setflag FLAG_UNKNOWN_30F

77
data/scripts/players_house.inc vendored
View File

@@ -3,41 +3,39 @@ LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950
setvar VAR_LITTLEROOT_INTRO_STATE, 5
return
LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956
LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956
msgbox LittlerootTown_BrendansHouse_1F_Text_172429, MSGBOX_DEFAULT
PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 81B6956
msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT
applymovement VAR_0x8004, Common_Movement_FacePlayer
waitmovement 0
compare VAR_0x8005, 0
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B699F
call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale
compare VAR_0x8005, 1
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B69AA
msgbox LittlerootTown_BrendansHouse_1F_Text_172453, MSGBOX_DEFAULT
call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale
msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B69B5
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
LittlerootTown_BrendansHouse_1F_EventScript_1B699F:: @ 81B699F
PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 81B699F
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA
PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 81B69AA
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5
PlayersHouse_1F_Movement_PlayerWalkIn:: @ 81B69B5
walk_up
step_end
LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7
LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7
msgbox LittlerootTown_BrendansHouse_1F_Text_172531, MSGBOX_DEFAULT
PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 81B69B7
msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC
@@ -60,7 +58,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF
LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB
LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB
goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_1B6A91
msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, MSGBOX_DEFAULT
msgbox PlayersHouse_2F_Text_ClockIsStopped, MSGBOX_DEFAULT
call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B
delay 30
setvar VAR_LITTLEROOT_INTRO_STATE, 6
@@ -84,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9
waitmovement 0
@@ -97,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4
waitmovement 0
@@ -153,14 +151,14 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8
releaseall
end
LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 81B6ABF
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D
applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
waitmovement 0
playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB
waitmovement 0
@@ -169,8 +167,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
call LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, MSGBOX_DEFAULT
msgbox LittlerootTown_BrendansHouse_1F_Text_172644, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_1, 1
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1
@@ -185,7 +183,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
applymovement LOCALID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
waitmovement 0
playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE
waitmovement 0
@@ -194,8 +192,8 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
call LittlerootTown_MaysHouse_1F_EventScript_1B6BBE
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, MSGBOX_DEFAULT
msgbox LittlerootTown_MaysHouse_1F_Text_172644, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_1, 1
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5
@@ -210,7 +208,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D
waitmovement 0
applymovement VAR_0x8005, Common_Movement_Delay48
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_OhComeQuickly, MSGBOX_DEFAULT
closemessage
return
@@ -218,7 +216,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_172841, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT
fadedefaultbgm
special TurnOffTVScreen
setflag FLAG_SYS_TV_HOME
@@ -261,33 +259,33 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80
compare VAR_LITTLEROOT_INTRO_STATE, 7
goto_if_ge LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C
msgbox LittlerootTown_BrendansHouse_1F_Text_172429, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT
release
end
LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33
msgbox LittlerootTown_BrendansHouse_1F_Text_172BBC, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_DadShouldStayLonger, MSGBOX_DEFAULT
release
end
LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D
goto_if_set FLAG_RECEIVED_AMULET_COIN, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
msgbox LittlerootTown_BrendansHouse_1F_Text_172782, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT
giveitem ITEM_AMULET_COIN
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_AMULET_COIN
release
end
LittlerootTown_BrendansHouse_1F_EventScript_1B6C72:: @ 81B6C72
msgbox LittlerootTown_BrendansHouse_1F_Text_172717, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_YouShouldRestABit, MSGBOX_DEFAULT
goto LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A
end
LittlerootTown_BrendansHouse_1F_EventScript_1B6C80:: @ 81B6C80
msgbox LittlerootTown_BrendansHouse_1F_Text_1726D2, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_SeeYouHoney, MSGBOX_DEFAULT
release
end
@@ -295,12 +293,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A:: @ 81B6C8A
closemessage
call Common_EventScript_OutOfCenterPartyHeal
incrementgamestat GAME_STAT_RESTED_AT_HOME
msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_TakeCareHoney, MSGBOX_DEFAULT
release
end
LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C:: @ 81B6C9C
msgbox LittlerootTown_BrendansHouse_1F_Text_1726E7, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_DidYouMeetProfBirch, MSGBOX_DEFAULT
release
end
@@ -310,7 +308,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CA6:: @ 81B6CA6
faceplayer
waitse
playmoncry SPECIES_MACHOKE, 0
msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_Machoke1, MSGBOX_DEFAULT
waitmoncry
release
end
@@ -321,7 +319,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9
faceplayer
waitse
playmoncry SPECIES_MACHOKE, 0
msgbox LittlerootTown_BrendansHouse_1F_Text_172831, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_Machoke2, MSGBOX_DEFAULT
waitmoncry
release
end
@@ -354,8 +352,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6CDC:: @ 81B6CDC
walk_up
step_end
LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 81B6CDE
lockall
checkplayergender
compare VAR_RESULT, 0
@@ -378,15 +375,15 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD
compare VAR_0x8008, 1
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8
msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT
giveitem ITEM_SS_TICKET
msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, 0
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3
compare VAR_0x8008, 1
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE
msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_BetterGetBackToGym, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, 0
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9

25
data/scripts/pokeblocks.inc vendored
View File

@@ -1,4 +1,4 @@
FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604
FallarborTown_ContestLobby_EventScript_BerryBlender2:: @ 81B7604
setvar VAR_0x8008, 4
setvar VAR_0x8009, 1
applymovement VAR_0x8008, FallarborTown_ContestLobby_Movement_1B7821
@@ -6,7 +6,7 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604
goto FallarborTown_ContestLobby_EventScript_1B7681
end
SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E
SlateportCity_ContestLobby_EventScript_BerryBlender1:: @ 81B761E
setvar VAR_0x8008, 2
setvar VAR_0x8009, 2
applymovement 6, Common_Movement_FaceOriginalDirection
@@ -120,30 +120,27 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780
releaseall
end
FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A
FallarborTown_ContestLobby_EventScript_BerryBlenderMan:: @ 81B778A
setvar VAR_0x8008, 4
goto FallarborTown_ContestLobby_EventScript_1B77B6
goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC
end
SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795
SlateportCity_ContestLobby_EventScript_MasterM:: @ 81B7795
setvar VAR_0x8008, 2
goto SlateportCity_ContestLobby_EventScript_1B77B6
goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC
end
VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0
setvar VAR_0x8008, 2
goto VerdanturfTown_ContestLobby_EventScript_1B77B6
goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC
end
LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB
setvar VAR_0x8008, 3
goto LilycoveCity_ContestLobby_EventScript_1B77B6
goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC
end
FallarborTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6
LilycoveCity_ContestLobby_EventScript_1B77B6:: @ 81B77B6
SlateportCity_ContestLobby_EventScript_1B77B6:: @ 81B77B6
VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6
VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC:: @ 81B77B6
lock
faceplayer
msgbox FallarborTown_ContestLobby_Text_1B742F, MSGBOX_DEFAULT
@@ -185,11 +182,11 @@ VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821
walk_in_place_fastest_right
step_end
FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823
FallarborTown_ContestLobby_EventScript_BerryBlender1:: @ 81B7823
goto FallarborTown_ContestLobby_EventScript_1B783B
end
SlateportCity_ContestLobby_EventScript_1B7829:: @ 81B7829
SlateportCity_ContestLobby_EventScript_BerryBlender0:: @ 81B7829
goto SlateportCity_ContestLobby_EventScript_1B783B
end

2
data/scripts/tv.inc vendored
View File

@@ -36,7 +36,7 @@ EventScript_1A6EF1:
end
EventScript_1A6F01:
msgbox UnknownString_817288C, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_TheresAMovieOnTV, MSGBOX_DEFAULT
releaseall
end