Merge pull request #2141 from pret/porymap-6

This commit is contained in:
GriffinRichards
2025-05-27 14:56:46 +00:00
parent 67b5837f9c
commit eb21f57c5f
+7 -5
View File
@@ -30914,14 +30914,14 @@
0828cda2 g 00000000 GabbyAndTy_EventScript_ShowAtRoute118_1 0828cda2 g 00000000 GabbyAndTy_EventScript_ShowAtRoute118_1
0828cda6 g 00000000 GabbyAndTy_EventScript_HideAtRoute120_1 0828cda6 g 00000000 GabbyAndTy_EventScript_HideAtRoute120_1
0828cdaa g 00000000 GabbyAndTy_EventScript_ShowAtRoute120_1 0828cdaa g 00000000 GabbyAndTy_EventScript_ShowAtRoute120_1
0828cdae g 00000000 GabbyAndTy_EventScript_HideAtRoute111_3 0828cdae g 00000000 GabbyAndTy_EventScript_HideAtRoute111_2
0828cdb2 g 00000000 GabbyAndTy_EventScript_ShowAtRoute111_3 0828cdb2 g 00000000 GabbyAndTy_EventScript_ShowAtRoute111_2
0828cdb6 g 00000000 GabbyAndTy_EventScript_HideAtRoute118_2 0828cdb6 g 00000000 GabbyAndTy_EventScript_HideAtRoute118_2
0828cdba g 00000000 GabbyAndTy_EventScript_ShowAtRoute118_2 0828cdba g 00000000 GabbyAndTy_EventScript_ShowAtRoute118_2
0828cdbe g 00000000 GabbyAndTy_EventScript_HideAtRoute120_2 0828cdbe g 00000000 GabbyAndTy_EventScript_HideAtRoute120_2
0828cdc2 g 00000000 GabbyAndTy_EventScript_ShowAtRoute120_2 0828cdc2 g 00000000 GabbyAndTy_EventScript_ShowAtRoute120_2
0828cdc6 g 00000000 GabbyAndTy_EventScript_HideAtRoute111_2 0828cdc6 g 00000000 GabbyAndTy_EventScript_HideAtRoute111_3
0828cdca g 00000000 GabbyAndTy_EventScript_ShowAtRoute111_2 0828cdca g 00000000 GabbyAndTy_EventScript_ShowAtRoute111_3
0828cdce g 00000000 GabbyAndTy_EventScript_HideAtRoute118_3 0828cdce g 00000000 GabbyAndTy_EventScript_HideAtRoute118_3
0828cdd2 g 00000000 GabbyAndTy_EventScript_ShowAtRoute118_3 0828cdd2 g 00000000 GabbyAndTy_EventScript_ShowAtRoute118_3
0828cdd6 g 00000000 GabbyAndTy_EventScript_GabbyBattle1 0828cdd6 g 00000000 GabbyAndTy_EventScript_GabbyBattle1
@@ -48855,7 +48855,7 @@
0857dd04 l 00001680 sMapPopUp_OutlineTable 0857dd04 l 00001680 sMapPopUp_OutlineTable
0857f384 l 000000c0 sMapPopUp_PaletteTable 0857f384 l 000000c0 sMapPopUp_PaletteTable
0857f444 l 00000020 sMapPopUp_Palette_Underwater 0857f444 l 00000020 sMapPopUp_Palette_Underwater
0857f464 l 00000068 sRegionMapSectionId_To_PopUpThemeIdMapping 0857f464 l 00000068 sMapSectionToThemeId
0857f4cc l 00000010 sText_PyramidFloor1 0857f4cc l 00000010 sText_PyramidFloor1
0857f4dc l 00000010 sText_PyramidFloor2 0857f4dc l 00000010 sText_PyramidFloor2
0857f4ec l 00000010 sText_PyramidFloor3 0857f4ec l 00000010 sText_PyramidFloor3
@@ -51826,6 +51826,8 @@
0859f51c l 00000008 sSpritePalette_SwapLine 0859f51c l 00000008 sSpritePalette_SwapLine
0859f524 l 00000018 sSpriteTemplate_SwapLine 0859f524 l 00000018 sSpriteTemplate_SwapLine
0859f53c l 000000b0 sHealLocations 0859f53c l 000000b0 sHealLocations
0859f5ec l 00000000 sWhiteoutRespawnHealCenterMapIdxs
0859f5ec l 00000000 sWhiteoutRespawnHealerNpcIds
0859f5ec l 00000020 sRegionMapCursorPal 0859f5ec l 00000020 sRegionMapCursorPal
0859f60c l 00000044 sRegionMapCursorSmallGfxLZ 0859f60c l 00000044 sRegionMapCursorSmallGfxLZ
0859f650 l 000000ec sRegionMapCursorLargeGfxLZ 0859f650 l 000000ec sRegionMapCursorLargeGfxLZ