Skip to content

Commit

Permalink
Merge pull request pret#866 from SnorlaxMonster/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@GriffinRichards
GriffinRichards committed Jan 18, 2024
1 parent 6d244a6 commit 56a86e4
Show file tree
Hide file tree
Showing 11 changed files with 506 additions and 495 deletions.
91 changes: 46 additions & 45 deletions pokeruby.sym
View file
Expand Up @@ -17057,15 +17057,15 @@
0815e985 g 00000000 AbandonedShip_Rooms_1F_MapScripts
0815e986 g 00000000 AbandonedShip_Rooms_1F_EventScript_15E986
0815e98f g 00000000 AbandonedShip_Corridors_B1F_MapScripts
0815e99a g 00000000 AbandonedShip_Corridors_B1F_OnResume
0815e9a3 g 00000000 AbandonedShip_Corridors_B1F_OnLoad
0815e9b6 g 00000000 AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom
0815e9c0 g 00000000 AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom
0815e9ca g 00000000 AbandonedShip_Corridors_B1F_EventScript_TuberM
0815e9d3 g 00000000 AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor
0815ea0a g 00000000 AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked
0815ea14 g 00000000 AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked
0815ea1e g 00000000 AbandonedShip_Corridors_B1F_EventScript_Duncan
0815e99a g 00000000 AbandonedShip_Corridors_B1F_MapScript1_15E99A
0815e9a3 g 00000000 AbandonedShip_Corridors_B1F_MapScript1_15E9A3
0815e9b6 g 00000000 AbandonedShip_Corridors_B1F_EventScript_15E9B6
0815e9c0 g 00000000 AbandonedShip_Corridors_B1F_EventScript_15E9C0
0815e9ca g 00000000 AbandonedShip_Corridors_B1F_EventScript_15E9CA
0815e9d3 g 00000000 AbandonedShip_Corridors_B1F_EventScript_15E9D3
0815ea0a g 00000000 AbandonedShip_Corridors_B1F_EventScript_15EA0A
0815ea14 g 00000000 AbandonedShip_Corridors_B1F_EventScript_15EA14
0815ea1e g 00000000 AbandonedShip_Corridors_B1F_EventScript_15EA1E
0815ea35 g 00000000 AbandonedShip_Rooms_B1F_MapScripts
0815ea3b g 00000000 AbandonedShip_Rooms_B1F_MapScript1_15EA3B
0815ea44 g 00000000 AbandonedShip_Rooms_B1F_EventScript_15EA44
Expand All @@ -17086,25 +17086,25 @@
0815eb37 g 00000000 AbandonedShip_Underwater2_MapScripts
0815eb3d g 00000000 AbandonedShip_Underwater2_MapScript1_15EB3D
0815eb46 g 00000000 AbandonedShip_HiddenFloorCorridors_MapScripts
0815eb51 g 00000000 AbandonedShip_HiddenFloorCorridors_OnResume
0815eb5a g 00000000 AbandonedShip_HiddenFloorCorridors_OnLoad
0815eba3 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1
0815ebad g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2
0815ebb7 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4
0815ebc1 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6
0815ebcb g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1
0815ebd5 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2
0815ebdf g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4
0815ebe9 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6
0815ebf3 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door
0815ec2a g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door
0815ec61 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door
0815ec98 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door
0815eccf g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked
0815ecd9 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked
0815ece3 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked
0815eced g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked
0815ecf7 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
0815eb51 g 00000000 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51
0815eb5a g 00000000 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A
0815eba3 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3
0815ebad g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD
0815ebb7 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7
0815ebc1 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1
0815ebcb g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB
0815ebd5 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5
0815ebdf g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF
0815ebe9 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9
0815ebf3 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3
0815ec2a g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A
0815ec61 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EC61
0815ec98 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98
0815eccf g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF
0815ecd9 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9
0815ece3 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3
0815eced g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15ECED
0815ecf7 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
0815ed01 g 00000000 AbandonedShip_HiddenFloorRooms_MapScripts
0815ed07 g 00000000 AbandonedShip_HiddenFloorRooms_MapScript2_15ED07
0815ed11 g 00000000 AbandonedShip_HiddenFloorRooms_EventScript_15ED11
Expand Down Expand Up @@ -20065,13 +20065,14 @@
08198493 g 00000000 AbandonedShip_Corridors_1F_Text_198493
081984d8 g 00000000 AbandonedShip_Corridors_1F_Text_1984D8
0819850a g 00000000 AbandonedShip_Rooms_1F_Text_19850A
0819856f g 00000000 AbandonedShip_Corridors_B1F_Text_DuncanIntro
081985c5 g 00000000 AbandonedShip_Corridors_B1F_Text_DuncanDefeat
081985d7 g 00000000 AbandonedShip_Corridors_B1F_Text_DuncanPostBattle
0819864a g 00000000 AbandonedShip_Corridors_B1F_Text_YayItsAShip
0819865c g 00000000 AbandonedShip_Corridors_B1F_Text_DoorIsLocked
08198692 g 00000000 AbandonedShip_Corridors_B1F_Text_InsertedStorageKey
081986ec g 00000000 AbandonedShip_Text_TheDoorIsOpen
0819856f g 00000000 AbandonedShip_Corridors_B1F_Text_19856F
081985c5 g 00000000 AbandonedShip_Corridors_B1F_Text_1985C5
081985d7 g 00000000 AbandonedShip_Corridors_B1F_Text_1985D7
0819864a g 00000000 AbandonedShip_Corridors_B1F_Text_19864A
0819865c g 00000000 AbandonedShip_Corridors_B1F_Text_19865C
08198692 g 00000000 AbandonedShip_Corridors_B1F_Text_198692
081986ec g 00000000 AbandonedShip_Corridors_B1F_Text_1986EC
081986ec g 00000000 AbandonedShip_HiddenFloorCorridors_Text_1986EC
081986fe g 00000000 AbandonedShip_Rooms_B1F_Text_1986FE
08198759 g 00000000 AbandonedShip_Rooms2_B1F_Text_198759
081987c1 g 00000000 AbandonedShip_Rooms2_1F_Text_1987C1
Expand All @@ -20093,16 +20094,16 @@
08198c85 g 00000000 AbandonedShip_CaptainsOffice_Text_198C85
08198d00 g 00000000 AbandonedShip_CaptainsOffice_Text_198D00
08198d7b g 00000000 AbandonedShip_CaptainsOffice_Text_198D7B
08198dc0 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked
08198df4 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked
08198e28 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked
08198e5c g 00000000 AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked
08198e90 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_InsertedKey
08198ee2 g 00000000 AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash
08198f10 l 00000000 SecretBase_Text_SmallIndentInWall
08198f34 l 00000000 SecretBase_Text_IndentUseSecretPower
08198f6e l 00000000 SecretBase_Text_DiscoveredSmallCavern
08198f89 g 00000000 SecretBase_Text_WantToMakeYourSecretBaseHere
08198dc0 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_198DC0
08198df4 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_198DF4
08198e28 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_198E28
08198e5c g 00000000 AbandonedShip_HiddenFloorCorridors_Text_198E5C
08198e90 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_198E90
08198ee2 g 00000000 AbandonedShip_HiddenFloorRooms_Text_198EE2
08198f10 l 00000000 UnknownString_8198F10
08198f34 l 00000000 UnknownString_8198F34
08198f6e l 00000000 UnknownString_8198F6E
08198f89 g 00000000 SecretBase_RedCave1_Text_198F89
08198fad g 00000000 InsideOfTruck_Text_198FAD
08199007 g 00000000 SSTidalCorridor_Text_199007
08199007 g 00000000 SSTidalRooms_Text_199007
Expand Down
91 changes: 46 additions & 45 deletions pokeruby_de.sym
View file
Expand Up @@ -17080,15 +17080,15 @@
0815ed5d g 00000000 AbandonedShip_Rooms_1F_MapScripts
0815ed5e g 00000000 AbandonedShip_Rooms_1F_EventScript_15E986
0815ed67 g 00000000 AbandonedShip_Corridors_B1F_MapScripts
0815ed72 g 00000000 AbandonedShip_Corridors_B1F_OnResume
0815ed7b g 00000000 AbandonedShip_Corridors_B1F_OnLoad
0815ed8e g 00000000 AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom
0815ed98 g 00000000 AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom
0815eda2 g 00000000 AbandonedShip_Corridors_B1F_EventScript_TuberM
0815edab g 00000000 AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor
0815ede2 g 00000000 AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked
0815edec g 00000000 AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked
0815edf6 g 00000000 AbandonedShip_Corridors_B1F_EventScript_Duncan
0815ed72 g 00000000 AbandonedShip_Corridors_B1F_MapScript1_15E99A
0815ed7b g 00000000 AbandonedShip_Corridors_B1F_MapScript1_15E9A3
0815ed8e g 00000000 AbandonedShip_Corridors_B1F_EventScript_15E9B6
0815ed98 g 00000000 AbandonedShip_Corridors_B1F_EventScript_15E9C0
0815eda2 g 00000000 AbandonedShip_Corridors_B1F_EventScript_15E9CA
0815edab g 00000000 AbandonedShip_Corridors_B1F_EventScript_15E9D3
0815ede2 g 00000000 AbandonedShip_Corridors_B1F_EventScript_15EA0A
0815edec g 00000000 AbandonedShip_Corridors_B1F_EventScript_15EA14
0815edf6 g 00000000 AbandonedShip_Corridors_B1F_EventScript_15EA1E
0815ee0d g 00000000 AbandonedShip_Rooms_B1F_MapScripts
0815ee13 g 00000000 AbandonedShip_Rooms_B1F_MapScript1_15EA3B
0815ee1c g 00000000 AbandonedShip_Rooms_B1F_EventScript_15EA44
Expand All @@ -17109,25 +17109,25 @@
0815ef0f g 00000000 AbandonedShip_Underwater2_MapScripts
0815ef15 g 00000000 AbandonedShip_Underwater2_MapScript1_15EB3D
0815ef1e g 00000000 AbandonedShip_HiddenFloorCorridors_MapScripts
0815ef29 g 00000000 AbandonedShip_HiddenFloorCorridors_OnResume
0815ef32 g 00000000 AbandonedShip_HiddenFloorCorridors_OnLoad
0815ef7b g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1
0815ef85 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2
0815ef8f g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4
0815ef99 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6
0815efa3 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1
0815efad g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2
0815efb7 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4
0815efc1 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6
0815efcb g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door
0815f002 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door
0815f039 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door
0815f070 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door
0815f0a7 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked
0815f0b1 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked
0815f0bb g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked
0815f0c5 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked
0815f0cf g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
0815ef29 g 00000000 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51
0815ef32 g 00000000 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A
0815ef7b g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3
0815ef85 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD
0815ef8f g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7
0815ef99 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1
0815efa3 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB
0815efad g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5
0815efb7 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF
0815efc1 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9
0815efcb g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3
0815f002 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A
0815f039 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EC61
0815f070 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98
0815f0a7 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF
0815f0b1 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9
0815f0bb g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3
0815f0c5 g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15ECED
0815f0cf g 00000000 AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
0815f0d9 g 00000000 AbandonedShip_HiddenFloorRooms_MapScripts
0815f0df g 00000000 AbandonedShip_HiddenFloorRooms_MapScript2_15ED07
0815f0e9 g 00000000 AbandonedShip_HiddenFloorRooms_EventScript_15ED11
Expand Down Expand Up @@ -20088,13 +20088,14 @@
0819f802 g 00000000 AbandonedShip_Corridors_1F_Text_198493
0819f858 g 00000000 AbandonedShip_Corridors_1F_Text_1984D8
0819f89f g 00000000 AbandonedShip_Rooms_1F_Text_19850A
0819f90e g 00000000 AbandonedShip_Corridors_B1F_Text_DuncanIntro
0819f97c g 00000000 AbandonedShip_Corridors_B1F_Text_DuncanDefeat
0819f99a g 00000000 AbandonedShip_Corridors_B1F_Text_DuncanPostBattle
0819fa1c g 00000000 AbandonedShip_Corridors_B1F_Text_YayItsAShip
0819fa2f g 00000000 AbandonedShip_Corridors_B1F_Text_DoorIsLocked
0819fa67 g 00000000 AbandonedShip_Corridors_B1F_Text_InsertedStorageKey
0819faee g 00000000 AbandonedShip_Text_TheDoorIsOpen
0819f90e g 00000000 AbandonedShip_Corridors_B1F_Text_19856F
0819f97c g 00000000 AbandonedShip_Corridors_B1F_Text_1985C5
0819f99a g 00000000 AbandonedShip_Corridors_B1F_Text_1985D7
0819fa1c g 00000000 AbandonedShip_Corridors_B1F_Text_19864A
0819fa2f g 00000000 AbandonedShip_Corridors_B1F_Text_19865C
0819fa67 g 00000000 AbandonedShip_Corridors_B1F_Text_198692
0819faee g 00000000 AbandonedShip_Corridors_B1F_Text_1986EC
0819faee g 00000000 AbandonedShip_HiddenFloorCorridors_Text_1986EC
0819fb01 g 00000000 AbandonedShip_Rooms_B1F_Text_1986FE
0819fb69 g 00000000 AbandonedShip_Rooms2_B1F_Text_198759
0819fbe4 g 00000000 AbandonedShip_Rooms2_1F_Text_1987C1
Expand All @@ -20116,16 +20117,16 @@
081a0109 g 00000000 AbandonedShip_CaptainsOffice_Text_198C85
081a019d g 00000000 AbandonedShip_CaptainsOffice_Text_198D00
081a022a g 00000000 AbandonedShip_CaptainsOffice_Text_198D7B
081a027a g 00000000 AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked
081a02ae g 00000000 AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked
081a02e2 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked
081a0316 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked
081a034a g 00000000 AbandonedShip_HiddenFloorCorridors_Text_InsertedKey
081a03ba g 00000000 AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash
081a03f5 l 00000000 SecretBase_Text_SmallIndentInWall
081a041d l 00000000 SecretBase_Text_IndentUseSecretPower
081a0468 l 00000000 SecretBase_Text_DiscoveredSmallCavern
081a0489 g 00000000 SecretBase_Text_WantToMakeYourSecretBaseHere
081a027a g 00000000 AbandonedShip_HiddenFloorCorridors_Text_198DC0
081a02ae g 00000000 AbandonedShip_HiddenFloorCorridors_Text_198DF4
081a02e2 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_198E28
081a0316 g 00000000 AbandonedShip_HiddenFloorCorridors_Text_198E5C
081a034a g 00000000 AbandonedShip_HiddenFloorCorridors_Text_198E90
081a03ba g 00000000 AbandonedShip_HiddenFloorRooms_Text_198EE2
081a03f5 l 00000000 UnknownString_8198F10
081a041d l 00000000 UnknownString_8198F34
081a0468 l 00000000 UnknownString_8198F6E
081a0489 g 00000000 SecretBase_RedCave1_Text_198F89
081a04b8 g 00000000 InsideOfTruck_Text_198FAD
081a0516 g 00000000 SSTidalCorridor_Text_199007
081a0516 g 00000000 SSTidalRooms_Text_199007
Expand Down

0 comments on commit 56a86e4

Please sign in to comment.