Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-02 06:48:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
GriffinR
2026-02-14 12:08:49 -05:00
committed by GitHub
parent 91b4d8ff9f 3a385ea005
commit 1f33c6fd8f
1247 changed files with 3803 additions and 3579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data/scripts/cable_club.inc vendored
View File

@@ -88,7 +88,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88
OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2
special CloseLink
setvar VAR_CABLE_CLUB_STATE, 0
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
waitmovement 0
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9
@@ -105,14 +105,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
waitmovement 0
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354
waitmovement 0
return
OldaleTown_PokemonCenter_2F_EventScript_1A3E0C:: @ 81A3E0C
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
waitmovement 0
return
@@ -130,7 +130,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30
setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4361
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4361
waitmovement 0
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmovement 0
@@ -139,7 +139,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30
playse SE_PIN
message OldaleTown_PokemonCenter_2F_Text_1A4E79
waitmessage
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
waitmovement 0
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354
waitmovement 0
@@ -226,13 +226,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
waitmovement 0
opendoor 5, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat LOCALID_PLAYER, MAP_PETALBURG_CITY
closedoor 5, 1
waitdooranim
release
@@ -390,13 +390,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
waitmovement 0
opendoor 8, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat LOCALID_PLAYER, MAP_PETALBURG_CITY
closedoor 8, 1
waitdooranim
release
@@ -487,13 +487,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
waitmovement 0
opendoor 11, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
applymovement LOCALID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat LOCALID_PLAYER, MAP_PETALBURG_CITY
closedoor 11, 1
waitdooranim
release

4
data/scripts/cave_hole.inc vendored
View File

@@ -9,7 +9,7 @@ CaveHole_FixCrackedGround:: @ 81C6BBF
EventScript_FallDownHole:: @ 81C6BC5
lockall
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
applymovement LOCALID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_FALL
delay 60
@@ -20,7 +20,7 @@ EventScript_FallDownHole:: @ 81C6BC5
EventScript_FallDownHoleMtPyre:: @ 81C6BDE
lockall
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
applymovement LOCALID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_FALL
delay 60

4
data/scripts/elite_four.inc vendored
View File

@@ -1,5 +1,5 @@
PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 81A0693
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
applymovement LOCALID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_DOOR
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
@@ -18,7 +18,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 81A0693
return
PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 81A0710
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
applymovement LOCALID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRUCK_DOOR
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1

4
data/scripts/gabby_and_ty.inc vendored
View File

@@ -201,7 +201,7 @@ Route120_EventScript_1AE582:: @ 81AE582
Route111_EventScript_1AE5A2:: @ 81AE5A2
special GabbyAndTyBeforeInterview
special GabbyAndTySetScriptVarsToObjectEventLocalIds
special GetGabbyAndTyLocalIds
compare VAR_FACING, 2
call_if_eq Route111_EventScript_1AE5E0
compare VAR_FACING, 1
@@ -234,7 +234,7 @@ Route111_EventScript_1AE60F:: @ 81AE60F
Route118_EventScript_1AE60F:: @ 81AE60F
Route120_EventScript_1AE60F:: @ 81AE60F
special GabbyAndTyBeforeInterview
special GabbyAndTySetScriptVarsToObjectEventLocalIds
special GetGabbyAndTyLocalIds
compare VAR_FACING, 2
call_if_eq Route111_EventScript_1AE5E0
compare VAR_FACING, 1

2
data/scripts/magma_chimney.inc vendored
View File

@@ -69,7 +69,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
call_if_eq MtChimney_EventScript_1B2D7D
compare VAR_FACING, 2
call_if_eq MtChimney_EventScript_1B2D88
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
.ifdef SAPPHIRE
msgbox MtChimney_Text_1B3608, MSGBOX_DEFAULT

34
data/scripts/players_house.inc vendored
View File

@@ -14,19 +14,19 @@ PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 81B6956
msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 81B699F
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 81B69AA
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -38,7 +38,7 @@ PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 81B69B7
msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC
applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC
waitmovement 0
releaseall
end
@@ -80,7 +80,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
@@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
@@ -155,17 +155,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 81B6ABF
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
waitmovement 0
playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2
applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
@@ -180,17 +180,17 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
applymovement LOCALID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
waitmovement 0
playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CDA
applymovement LOCALID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CDA
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_1B6BBE
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
@@ -214,7 +214,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D
LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT
fadedefaultbgm
@@ -430,24 +430,24 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE:: @ 81B6DEE
return
LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9:: @ 81B6DF9
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B:: @ 81B6E0B
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E43
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D:: @ 81B6E1D
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E49
applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E49
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E54
applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E54
waitmovement 0
return

2
data/scripts/secret_base.inc vendored
View File

@@ -128,7 +128,7 @@ EventScript_1A2DB8:
end
SecretBase_EventScript_FirstEntrance:: @ 81A2DDE
applymovement OBJ_EVENT_ID_PLAYER, SecretBase_RedCave1_Movement_1A2E11
applymovement LOCALID_PLAYER, SecretBase_RedCave1_Movement_1A2E11
waitmovement 0
setvar VAR_INIT_SECRET_BASE, 1
msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO