From 58e5eee0459b6d2eaae71eeab0c83ba5d2dd4249 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sun, 20 Nov 2022 15:18:13 +0000 Subject: [PATCH] Merge pull request #584 from cbt6/region-map-title-screen --- pokefirered.sym | 72 +++++++++++++++++++-------------------- pokefirered_rev1.sym | 72 +++++++++++++++++++-------------------- pokeleafgreen.sym | 76 +++++++++++++++++++++--------------------- pokeleafgreen_rev1.sym | 76 +++++++++++++++++++++--------------------- 4 files changed, 148 insertions(+), 148 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index 5655ddd5e..f67f869a9 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -5291,16 +5291,16 @@ 080796cc l 0000001c CB2_FadeOutTransitionToSaveClearScreen 080796e8 l 00000020 CB2_FadeOutTransitionToBerryFix 08079708 l 00000028 LoadSpriteGfxAndPals -08079730 l 0000007c SpriteCallback_TitleScreenFlameOrLeaf -080797ac l 00000094 CreateFlameOrLeafSprite -08079840 l 0000015c Task_FlameOrLeafSpawner +08079730 l 0000007c SpriteCallback_TitleScreenFlame +080797ac l 00000094 CreateFlameSprite +08079840 l 0000015c Task_FlameSpawner 0807999c l 00000016 TitleScreen_srand 080799b4 l 0000003c TitleScreen_rand 080799f0 l 00000020 CreateBlankSprite 08079a10 l 00000030 SetPalOnOrCreateBlankSprite 08079a40 l 00000048 CreateSlashSprite -08079a88 l 00000020 ScheduleHideSlashSprite -08079aa8 l 00000030 IsSlashSpriteHidden +08079a88 l 00000020 DeactivateSlashSprite +08079aa8 l 00000030 IsSlashSpriteDeactivated 08079ad8 l 000000a4 SpriteCallback_Slash 08079b7c g 0000008c ReloadSave 08079b7c l 00000000 .gcc2_compiled. @@ -7899,7 +7899,7 @@ 080bfe00 l 00000018 SetWhiteoutRespawnHealerNpcAsLastTalked 080bfe18 l 00000000 .gcc2_compiled. 080bfe18 l 00000088 RegionMap_DarkenPalette -080bfea0 l 0000003c sub_80BFEA0 +080bfea0 l 0000003c TintMapEdgesPalette 080bfedc l 00000074 InitRegionMap 080bff50 g 00000080 InitRegionMapWithExitCB 080bffd0 l 00000130 InitRegionMapType @@ -7935,13 +7935,13 @@ 080c0e5c l 00000014 SetRegionMapPlayerIsOn 080c0e70 l 00000170 InitSwitchMapMenu 080c0fe0 l 00000034 ResetGpuRegsForSwitchMapMenu -080c1014 l 00000044 sub_80C1014 -080c1058 l 00000040 sub_80C1058 +080c1014 l 00000044 FadeSwitchMapMenuIn +080c1058 l 00000040 FadeSwitchMapMenuOut 080c1098 l 000001e8 Task_SwitchMapMenu 080c1280 l 0000006c FreeSwitchMapMenu -080c12ec l 00000036 sub_80C12EC +080c12ec l 00000036 BrightenScreenForSwitchMapMenu 080c1324 l 0000006c LoadSwitchMapTilemap -080c1390 l 000000bc DrawSwitchMapSelectionHighlight +080c1390 l 000000bc SetGpuRegsToDimScreen 080c144c l 0000002c DimScreenForSwitchMapMenu 080c1478 l 00000240 HandleSwitchMapInput 080c16b8 l 00000018 SpriteCB_SwitchMapCursor @@ -7965,14 +7965,14 @@ 080c22c4 l 00000080 SetMapEdgeInvisibility 080c2344 l 00000178 LoadMapEdgeGfx 080c24bc l 00000080 InitScreenForMapOpenAnim -080c253c l 00000058 sub_80C253C +080c253c l 00000058 SetGpuRegsToFadeMapToWhite 080c2594 l 00000028 FinishMapOpenAnim 080c25bc l 00000048 FreeMapOpenCloseAnim 080c2604 l 00000078 FreeMapEdgeSprites 080c267c l 00000326 Task_MapOpenAnim 080c29a4 l 000001a4 MoveMapEdgesOutward -080c2b48 l 00000054 sub_80C2B48 -080c2b9c l 00000080 sub_80C2B9C +080c2b48 l 00000054 SetGpuWindowDimsToMapEdges +080c2b9c l 00000080 InitScreenForMapCloseAnim 080c2c1c l 0000001c DoMapCloseAnim 080c2c38 l 00000042 CreateMapEdgeSprites 080c2c7c l 000001a0 Task_MapCloseAnim @@ -32713,32 +32713,32 @@ 083bf574 l 00000018 sFlashingCircleImpactSpriteTemplate 083bf58c l 0000001c sBorderBgTiles 083bf5a8 l 000000a4 sBorderBgMap -083bf64c l 00000130 sSlashSpriteTiles -083bf77c l 00000020 sSlashSpritePals -083bf79c l 00000278 sFireSpriteTiles -083bfa14 l 000000a0 sBlankFireSpriteTiles +083bf64c l 00000130 sSlash_Gfx +083bf77c l 00000020 sFlames_Pal +083bf79c l 00000278 sFlames_Gfx +083bfa14 l 000000a0 sBlankFlames_Gfx 083bfab4 l 00000008 sOamData_FlameOrLeaf -083bfabc l 0000002c sSpriteAnims_FlameOrLeaf_0 -083bfae8 l 00000014 sSpriteAnims_FlameOrLeaf_1 -083bfafc l 00000008 sSpriteAnimTable_FlameOrLeaf -083bfb04 l 00000018 sSpriteTemplate_FlameOrLeaf_State1 -083bfb1c l 00000018 sSpriteTemplate_FlameOrLeaf_State0 -083bfb34 l 00000008 sOamData_UnknownEmptySprite -083bfb3c l 00000018 sUnknownEmptySprite +083bfabc l 0000002c sSpriteAnim_Flame +083bfae8 l 00000014 sSpriteAnim_Flame_Unused +083bfafc l 00000008 sSpriteAnim_FlameOrLeaf +083bfb04 l 00000018 sSpriteTemplate_FlameOrLeaf +083bfb1c l 00000018 sSpriteTemplate_BlankFlame +083bfb34 l 00000008 sOamData_BlankSprite +083bfb3c l 00000018 sSpriteTemplate_BlankSprite 083bfb54 l 00000008 sOamData_SlashSprite 083bfb5c l 00000018 sSlashSpriteTemplate 083bfb74 l 00000010 sBgTemplates 083bfb84 l 00000018 sSceneFuncs 083bfb9c l 00000020 sSpriteSheets 083bfbbc l 00000018 sSpritePals -083bfbd4 l 0000000f gUnknown_83BFBD4 -083bfbe4 l 00000824 gUnknown_83BFBE4 -083c0408 l 000007f8 gUnknown_83C0408 -083c0c00 l 0000079c gUnknown_83C0C00 -083c139c l 0000081c gUnknown_83C139C -083c1bb8 l 000007c8 gUnknown_83C1BB8 -083c2380 l 00000824 gUnknown_83C2380 -083c2ba4 l 00000018 gUnknown_83C2BA4 +083bfbd4 l 00000010 sFlameXPositions +083bfbe4 l 00000824 sUnused_Tilemap1 +083c0408 l 000007f8 sUnused_Tilemap2 +083c0c00 l 0000079c sUnused_Tilemap3 +083c139c l 0000081c sUnused_Tilemap4 +083c1bb8 l 000007c8 sUnused_Tilemap5 +083c2380 l 00000824 sUnused_Tilemap6 +083c2ba4 l 00000018 sUnused_Tilemaps 083c2bbc g 00000004 gWeatherPtr 083c2bc0 l 000000f0 sWeatherFuncs 083c2cb0 l 00000010 sWeatherPalStateFuncs @@ -36330,7 +36330,7 @@ 083ef29c l 00000020 sPlayerIcon_LeafPal 083ef2bc l 00000020 sMiscIcon_Pal 083ef2dc l 000000a0 sRegionMap_Pal -083ef37c l 00000008 unref_83EF37C +083ef37c l 00000008 sUnusedPalette 083ef384 l 00000020 sSwitchMapCursor_Pal 083ef3a4 l 00000020 sMapEdge_Pal 083ef3c4 l 0000008c sSwitchMapCursorLeft_Gfx @@ -36375,7 +36375,7 @@ 083f1c20 l 00000008 sOamData_MapEdge 083f1c28 l 00000008 sAnim_MapEdge 083f1c30 l 00000004 sAnims_MapEdge -083f1c34 l 00000008 gUnknown_83F1C34 +083f1c34 l 00000008 sMapWindowDim 083f1c3c l 00000008 sOamData_MapCursor 083f1c44 l 0000000c sAnim_MapCursor 083f1c50 l 00000004 sAnims_MapCursor @@ -50804,8 +50804,8 @@ 08eae094 g 00000020 gGraphics_TitleScreen_BackgroundPals 08eae0b4 g 000002c0 gGraphics_TitleScreen_CopyrightPressStartTiles 08eae374 g 00000114 gGraphics_TitleScreen_CopyrightPressStartMap -08eae488 g 00000020 gGraphics_TitleScreen_FireOrLeafPals -08eae4a8 g 00000080 gGraphics_TitleScreen_BlankObjTiles +08eae488 g 00000020 gTitleScreen_Slash_Pal +08eae4a8 g 00000080 gTitleScreen_BlankSprite_Tiles 08eae528 g 00000020 gCreditsAllRightsReservedGfxPal 08eae548 g 000003b8 gCreditsAllRightsReservedGfxTiles 08eae900 g 00000100 gCreditsAllRightsReservedGfxMap diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index bf5711bcd..1300139a9 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -5291,16 +5291,16 @@ 080796e0 l 0000001c CB2_FadeOutTransitionToSaveClearScreen 080796fc l 00000020 CB2_FadeOutTransitionToBerryFix 0807971c l 00000028 LoadSpriteGfxAndPals -08079744 l 0000007c SpriteCallback_TitleScreenFlameOrLeaf -080797c0 l 00000094 CreateFlameOrLeafSprite -08079854 l 0000015c Task_FlameOrLeafSpawner +08079744 l 0000007c SpriteCallback_TitleScreenFlame +080797c0 l 00000094 CreateFlameSprite +08079854 l 0000015c Task_FlameSpawner 080799b0 l 00000016 TitleScreen_srand 080799c8 l 0000003c TitleScreen_rand 08079a04 l 00000020 CreateBlankSprite 08079a24 l 00000030 SetPalOnOrCreateBlankSprite 08079a54 l 00000048 CreateSlashSprite -08079a9c l 00000020 ScheduleHideSlashSprite -08079abc l 00000030 IsSlashSpriteHidden +08079a9c l 00000020 DeactivateSlashSprite +08079abc l 00000030 IsSlashSpriteDeactivated 08079aec l 000000a4 SpriteCallback_Slash 08079b90 g 0000008c ReloadSave 08079b90 l 00000000 .gcc2_compiled. @@ -7899,7 +7899,7 @@ 080bfe14 l 00000018 SetWhiteoutRespawnHealerNpcAsLastTalked 080bfe2c l 00000000 .gcc2_compiled. 080bfe2c l 00000088 RegionMap_DarkenPalette -080bfeb4 l 0000003c sub_80BFEA0 +080bfeb4 l 0000003c TintMapEdgesPalette 080bfef0 l 00000074 InitRegionMap 080bff64 g 00000080 InitRegionMapWithExitCB 080bffe4 l 00000130 InitRegionMapType @@ -7935,13 +7935,13 @@ 080c0e70 l 00000014 SetRegionMapPlayerIsOn 080c0e84 l 00000170 InitSwitchMapMenu 080c0ff4 l 00000034 ResetGpuRegsForSwitchMapMenu -080c1028 l 00000044 sub_80C1014 -080c106c l 00000040 sub_80C1058 +080c1028 l 00000044 FadeSwitchMapMenuIn +080c106c l 00000040 FadeSwitchMapMenuOut 080c10ac l 000001e8 Task_SwitchMapMenu 080c1294 l 0000006c FreeSwitchMapMenu -080c1300 l 00000036 sub_80C12EC +080c1300 l 00000036 BrightenScreenForSwitchMapMenu 080c1338 l 0000006c LoadSwitchMapTilemap -080c13a4 l 000000bc DrawSwitchMapSelectionHighlight +080c13a4 l 000000bc SetGpuRegsToDimScreen 080c1460 l 0000002c DimScreenForSwitchMapMenu 080c148c l 00000240 HandleSwitchMapInput 080c16cc l 00000018 SpriteCB_SwitchMapCursor @@ -7965,14 +7965,14 @@ 080c22d8 l 00000080 SetMapEdgeInvisibility 080c2358 l 00000178 LoadMapEdgeGfx 080c24d0 l 00000080 InitScreenForMapOpenAnim -080c2550 l 00000058 sub_80C253C +080c2550 l 00000058 SetGpuRegsToFadeMapToWhite 080c25a8 l 00000028 FinishMapOpenAnim 080c25d0 l 00000048 FreeMapOpenCloseAnim 080c2618 l 00000078 FreeMapEdgeSprites 080c2690 l 00000326 Task_MapOpenAnim 080c29b8 l 000001a4 MoveMapEdgesOutward -080c2b5c l 00000054 sub_80C2B48 -080c2bb0 l 00000080 sub_80C2B9C +080c2b5c l 00000054 SetGpuWindowDimsToMapEdges +080c2bb0 l 00000080 InitScreenForMapCloseAnim 080c2c30 l 0000001c DoMapCloseAnim 080c2c4c l 00000042 CreateMapEdgeSprites 080c2c90 l 000001a0 Task_MapCloseAnim @@ -32714,32 +32714,32 @@ 083bf5e4 l 00000018 sFlashingCircleImpactSpriteTemplate 083bf5fc l 0000001c sBorderBgTiles 083bf618 l 000000a4 sBorderBgMap -083bf6bc l 00000130 sSlashSpriteTiles -083bf7ec l 00000020 sSlashSpritePals -083bf80c l 00000278 sFireSpriteTiles -083bfa84 l 000000a0 sBlankFireSpriteTiles +083bf6bc l 00000130 sSlash_Gfx +083bf7ec l 00000020 sFlames_Pal +083bf80c l 00000278 sFlames_Gfx +083bfa84 l 000000a0 sBlankFlames_Gfx 083bfb24 l 00000008 sOamData_FlameOrLeaf -083bfb2c l 0000002c sSpriteAnims_FlameOrLeaf_0 -083bfb58 l 00000014 sSpriteAnims_FlameOrLeaf_1 -083bfb6c l 00000008 sSpriteAnimTable_FlameOrLeaf -083bfb74 l 00000018 sSpriteTemplate_FlameOrLeaf_State1 -083bfb8c l 00000018 sSpriteTemplate_FlameOrLeaf_State0 -083bfba4 l 00000008 sOamData_UnknownEmptySprite -083bfbac l 00000018 sUnknownEmptySprite +083bfb2c l 0000002c sSpriteAnim_Flame +083bfb58 l 00000014 sSpriteAnim_Flame_Unused +083bfb6c l 00000008 sSpriteAnim_FlameOrLeaf +083bfb74 l 00000018 sSpriteTemplate_FlameOrLeaf +083bfb8c l 00000018 sSpriteTemplate_BlankFlame +083bfba4 l 00000008 sOamData_BlankSprite +083bfbac l 00000018 sSpriteTemplate_BlankSprite 083bfbc4 l 00000008 sOamData_SlashSprite 083bfbcc l 00000018 sSlashSpriteTemplate 083bfbe4 l 00000010 sBgTemplates 083bfbf4 l 00000018 sSceneFuncs 083bfc0c l 00000020 sSpriteSheets 083bfc2c l 00000018 sSpritePals -083bfc44 l 0000000f gUnknown_83BFBD4 -083bfc54 l 00000824 gUnknown_83BFBE4 -083c0478 l 000007f8 gUnknown_83C0408 -083c0c70 l 0000079c gUnknown_83C0C00 -083c140c l 0000081c gUnknown_83C139C -083c1c28 l 000007c8 gUnknown_83C1BB8 -083c23f0 l 00000824 gUnknown_83C2380 -083c2c14 l 00000018 gUnknown_83C2BA4 +083bfc44 l 00000010 sFlameXPositions +083bfc54 l 00000824 sUnused_Tilemap1 +083c0478 l 000007f8 sUnused_Tilemap2 +083c0c70 l 0000079c sUnused_Tilemap3 +083c140c l 0000081c sUnused_Tilemap4 +083c1c28 l 000007c8 sUnused_Tilemap5 +083c23f0 l 00000824 sUnused_Tilemap6 +083c2c14 l 00000018 sUnused_Tilemaps 083c2c2c g 00000004 gWeatherPtr 083c2c30 l 000000f0 sWeatherFuncs 083c2d20 l 00000010 sWeatherPalStateFuncs @@ -36331,7 +36331,7 @@ 083ef30c l 00000020 sPlayerIcon_LeafPal 083ef32c l 00000020 sMiscIcon_Pal 083ef34c l 000000a0 sRegionMap_Pal -083ef3ec l 00000008 unref_83EF37C +083ef3ec l 00000008 sUnusedPalette 083ef3f4 l 00000020 sSwitchMapCursor_Pal 083ef414 l 00000020 sMapEdge_Pal 083ef434 l 0000008c sSwitchMapCursorLeft_Gfx @@ -36376,7 +36376,7 @@ 083f1c90 l 00000008 sOamData_MapEdge 083f1c98 l 00000008 sAnim_MapEdge 083f1ca0 l 00000004 sAnims_MapEdge -083f1ca4 l 00000008 gUnknown_83F1C34 +083f1ca4 l 00000008 sMapWindowDim 083f1cac l 00000008 sOamData_MapCursor 083f1cb4 l 0000000c sAnim_MapCursor 083f1cc0 l 00000004 sAnims_MapCursor @@ -50805,8 +50805,8 @@ 08eae094 g 00000020 gGraphics_TitleScreen_BackgroundPals 08eae0b4 g 000002c0 gGraphics_TitleScreen_CopyrightPressStartTiles 08eae374 g 00000114 gGraphics_TitleScreen_CopyrightPressStartMap -08eae488 g 00000020 gGraphics_TitleScreen_FireOrLeafPals -08eae4a8 g 00000080 gGraphics_TitleScreen_BlankObjTiles +08eae488 g 00000020 gTitleScreen_Slash_Pal +08eae4a8 g 00000080 gTitleScreen_BlankSprite_Tiles 08eae528 g 00000020 gCreditsAllRightsReservedGfxPal 08eae548 g 000003b8 gCreditsAllRightsReservedGfxTiles 08eae900 g 00000100 gCreditsAllRightsReservedGfxMap diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index e48de273e..8410eb040 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -5291,18 +5291,18 @@ 080796cc l 0000001c CB2_FadeOutTransitionToSaveClearScreen 080796e8 l 00000020 CB2_FadeOutTransitionToBerryFix 08079708 l 00000028 LoadSpriteGfxAndPals -08079730 l 00000080 SpriteCallback_TitleScreenFlameOrLeaf -080797b0 l 00000050 CreateFlameOrLeafSprite -08079800 l 00000044 SpriteCallback_LG_8079800 -08079844 l 00000060 sub_LG_8079844 -080798a4 l 000000ca Task_FlameOrLeafSpawner +08079730 l 00000080 SpriteCallback_TitleScreenLeaf +080797b0 l 00000050 CreateLeafSprite +08079800 l 00000044 SpriteCallback_Streak +08079844 l 00000060 CreateStreakSprites +080798a4 l 000000ca Task_LeafSpawner 08079970 l 00000016 TitleScreen_srand 08079988 l 0000003c TitleScreen_rand 080799c4 l 00000020 CreateBlankSprite 080799e4 l 00000030 SetPalOnOrCreateBlankSprite 08079a14 l 00000048 CreateSlashSprite -08079a5c l 00000020 ScheduleHideSlashSprite -08079a7c l 00000030 IsSlashSpriteHidden +08079a5c l 00000020 DeactivateSlashSprite +08079a7c l 00000030 IsSlashSpriteDeactivated 08079aac l 000000a4 SpriteCallback_Slash 08079b50 g 0000008c ReloadSave 08079b50 l 00000000 .gcc2_compiled. @@ -7901,7 +7901,7 @@ 080bfdd4 l 00000018 SetWhiteoutRespawnHealerNpcAsLastTalked 080bfdec l 00000000 .gcc2_compiled. 080bfdec l 00000088 RegionMap_DarkenPalette -080bfe74 l 0000003c sub_80BFEA0 +080bfe74 l 0000003c TintMapEdgesPalette 080bfeb0 l 00000074 InitRegionMap 080bff24 g 00000080 InitRegionMapWithExitCB 080bffa4 l 00000130 InitRegionMapType @@ -7937,13 +7937,13 @@ 080c0e30 l 00000014 SetRegionMapPlayerIsOn 080c0e44 l 00000170 InitSwitchMapMenu 080c0fb4 l 00000034 ResetGpuRegsForSwitchMapMenu -080c0fe8 l 00000044 sub_80C1014 -080c102c l 00000040 sub_80C1058 +080c0fe8 l 00000044 FadeSwitchMapMenuIn +080c102c l 00000040 FadeSwitchMapMenuOut 080c106c l 000001e8 Task_SwitchMapMenu 080c1254 l 0000006c FreeSwitchMapMenu -080c12c0 l 00000036 sub_80C12EC +080c12c0 l 00000036 BrightenScreenForSwitchMapMenu 080c12f8 l 0000006c LoadSwitchMapTilemap -080c1364 l 000000bc DrawSwitchMapSelectionHighlight +080c1364 l 000000bc SetGpuRegsToDimScreen 080c1420 l 0000002c DimScreenForSwitchMapMenu 080c144c l 00000240 HandleSwitchMapInput 080c168c l 00000018 SpriteCB_SwitchMapCursor @@ -7967,14 +7967,14 @@ 080c2298 l 00000080 SetMapEdgeInvisibility 080c2318 l 00000178 LoadMapEdgeGfx 080c2490 l 00000080 InitScreenForMapOpenAnim -080c2510 l 00000058 sub_80C253C +080c2510 l 00000058 SetGpuRegsToFadeMapToWhite 080c2568 l 00000028 FinishMapOpenAnim 080c2590 l 00000048 FreeMapOpenCloseAnim 080c25d8 l 00000078 FreeMapEdgeSprites 080c2650 l 00000326 Task_MapOpenAnim 080c2978 l 000001a4 MoveMapEdgesOutward -080c2b1c l 00000054 sub_80C2B48 -080c2b70 l 00000080 sub_80C2B9C +080c2b1c l 00000054 SetGpuWindowDimsToMapEdges +080c2b70 l 00000080 InitScreenForMapCloseAnim 080c2bf0 l 0000001c DoMapCloseAnim 080c2c0c l 00000042 CreateMapEdgeSprites 080c2c50 l 000001a0 Task_MapCloseAnim @@ -32715,32 +32715,32 @@ 083bf554 l 00000018 sFlashingCircleImpactSpriteTemplate 083bf56c l 0000001c sBorderBgTiles 083bf588 l 000000ac sBorderBgMap -083bf634 l 00000130 sSlashSpriteTiles -083bf764 l 00000020 sSlashSpritePals -083bf784 l 00000118 sLeafSpriteTiles -083bf89c l 00000060 sBlankLeafSpriteTiles +083bf634 l 00000130 sSlash_Gfx +083bf764 l 00000020 sLeaves_Pal +083bf784 l 00000118 sLeaves_Gfx +083bf89c l 00000060 sStreak_Gfx 083bf8fc l 00000008 sOamData_FlameOrLeaf -083bf904 l 00000030 sSpriteAnims_FlameOrLeaf_0 -083bf934 l 00000004 sSpriteAnimTable_FlameOrLeaf -083bf938 l 00000018 sSpriteTemplate_FlameOrLeaf_State1 -083bf950 l 00000008 sOamData_LG_83BF950 -083bf958 l 00000018 sSpriteTemplate_FlameOrLeaf_State0 -083bf970 l 00000008 sOamData_UnknownEmptySprite -083bf978 l 00000018 sUnknownEmptySprite +083bf904 l 00000030 sSpriteAnim_Leaf +083bf934 l 00000004 sSpriteAnim_FlameOrLeaf +083bf938 l 00000018 sSpriteTemplate_FlameOrLeaf +083bf950 l 00000008 sOamData_Streak +083bf958 l 00000018 sSpriteTemplate_Streak +083bf970 l 00000008 sOamData_BlankSprite +083bf978 l 00000018 sSpriteTemplate_BlankSprite 083bf990 l 00000008 sOamData_SlashSprite 083bf998 l 00000018 sSlashSpriteTemplate 083bf9b0 l 00000010 sBgTemplates 083bf9c0 l 00000018 sSceneFuncs 083bf9d8 l 00000020 sSpriteSheets 083bf9f8 l 00000018 sSpritePals -083bfa10 l 00000010 gUnknown_LG_83BFA10 -083bfa20 l 00000824 gUnknown_83BFBE4 -083c0244 l 000007f8 gUnknown_83C0408 -083c0a3c l 0000079c gUnknown_83C0C00 -083c11d8 l 0000081c gUnknown_83C139C -083c19f4 l 000007c8 gUnknown_83C1BB8 -083c21bc l 00000824 gUnknown_83C2380 -083c29e0 l 00000018 gUnknown_83C2BA4 +083bfa10 l 00000010 sStreakYPositions +083bfa20 l 00000824 sUnused_Tilemap1 +083c0244 l 000007f8 sUnused_Tilemap2 +083c0a3c l 0000079c sUnused_Tilemap3 +083c11d8 l 0000081c sUnused_Tilemap4 +083c19f4 l 000007c8 sUnused_Tilemap5 +083c21bc l 00000824 sUnused_Tilemap6 +083c29e0 l 00000018 sUnused_Tilemaps 083c29f8 g 00000004 gWeatherPtr 083c29fc l 000000f0 sWeatherFuncs 083c2aec l 00000010 sWeatherPalStateFuncs @@ -36332,7 +36332,7 @@ 083ef0d8 l 00000020 sPlayerIcon_LeafPal 083ef0f8 l 00000020 sMiscIcon_Pal 083ef118 l 000000a0 sRegionMap_Pal -083ef1b8 l 00000008 unref_83EF37C +083ef1b8 l 00000008 sUnusedPalette 083ef1c0 l 00000020 sSwitchMapCursor_Pal 083ef1e0 l 00000020 sMapEdge_Pal 083ef200 l 0000008c sSwitchMapCursorLeft_Gfx @@ -36377,7 +36377,7 @@ 083f1a5c l 00000008 sOamData_MapEdge 083f1a64 l 00000008 sAnim_MapEdge 083f1a6c l 00000004 sAnims_MapEdge -083f1a70 l 00000008 gUnknown_83F1C34 +083f1a70 l 00000008 sMapWindowDim 083f1a78 l 00000008 sOamData_MapCursor 083f1a80 l 0000000c sAnim_MapCursor 083f1a8c l 00000004 sAnims_MapCursor @@ -50806,8 +50806,8 @@ 08eae388 g 00000020 gGraphics_TitleScreen_BackgroundPals 08eae3a8 g 000002c0 gGraphics_TitleScreen_CopyrightPressStartTiles 08eae668 g 00000114 gGraphics_TitleScreen_CopyrightPressStartMap -08eae77c g 00000020 gGraphics_TitleScreen_FireOrLeafPals -08eae79c g 00000080 gGraphics_TitleScreen_BlankObjTiles +08eae77c g 00000020 gTitleScreen_Slash_Pal +08eae79c g 00000080 gTitleScreen_BlankSprite_Tiles 08eae81c g 00000020 gCreditsAllRightsReservedGfxPal 08eae83c g 000003b8 gCreditsAllRightsReservedGfxTiles 08eaebf4 g 00000100 gCreditsAllRightsReservedGfxMap diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 070a0b7fc..6ae3461ad 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -5291,18 +5291,18 @@ 080796e0 l 0000001c CB2_FadeOutTransitionToSaveClearScreen 080796fc l 00000020 CB2_FadeOutTransitionToBerryFix 0807971c l 00000028 LoadSpriteGfxAndPals -08079744 l 00000080 SpriteCallback_TitleScreenFlameOrLeaf -080797c4 l 00000050 CreateFlameOrLeafSprite -08079814 l 00000044 SpriteCallback_LG_8079800 -08079858 l 00000060 sub_LG_8079844 -080798b8 l 000000ca Task_FlameOrLeafSpawner +08079744 l 00000080 SpriteCallback_TitleScreenLeaf +080797c4 l 00000050 CreateLeafSprite +08079814 l 00000044 SpriteCallback_Streak +08079858 l 00000060 CreateStreakSprites +080798b8 l 000000ca Task_LeafSpawner 08079984 l 00000016 TitleScreen_srand 0807999c l 0000003c TitleScreen_rand 080799d8 l 00000020 CreateBlankSprite 080799f8 l 00000030 SetPalOnOrCreateBlankSprite 08079a28 l 00000048 CreateSlashSprite -08079a70 l 00000020 ScheduleHideSlashSprite -08079a90 l 00000030 IsSlashSpriteHidden +08079a70 l 00000020 DeactivateSlashSprite +08079a90 l 00000030 IsSlashSpriteDeactivated 08079ac0 l 000000a4 SpriteCallback_Slash 08079b64 g 0000008c ReloadSave 08079b64 l 00000000 .gcc2_compiled. @@ -7901,7 +7901,7 @@ 080bfde8 l 00000018 SetWhiteoutRespawnHealerNpcAsLastTalked 080bfe00 l 00000000 .gcc2_compiled. 080bfe00 l 00000088 RegionMap_DarkenPalette -080bfe88 l 0000003c sub_80BFEA0 +080bfe88 l 0000003c TintMapEdgesPalette 080bfec4 l 00000074 InitRegionMap 080bff38 g 00000080 InitRegionMapWithExitCB 080bffb8 l 00000130 InitRegionMapType @@ -7937,13 +7937,13 @@ 080c0e44 l 00000014 SetRegionMapPlayerIsOn 080c0e58 l 00000170 InitSwitchMapMenu 080c0fc8 l 00000034 ResetGpuRegsForSwitchMapMenu -080c0ffc l 00000044 sub_80C1014 -080c1040 l 00000040 sub_80C1058 +080c0ffc l 00000044 FadeSwitchMapMenuIn +080c1040 l 00000040 FadeSwitchMapMenuOut 080c1080 l 000001e8 Task_SwitchMapMenu 080c1268 l 0000006c FreeSwitchMapMenu -080c12d4 l 00000036 sub_80C12EC +080c12d4 l 00000036 BrightenScreenForSwitchMapMenu 080c130c l 0000006c LoadSwitchMapTilemap -080c1378 l 000000bc DrawSwitchMapSelectionHighlight +080c1378 l 000000bc SetGpuRegsToDimScreen 080c1434 l 0000002c DimScreenForSwitchMapMenu 080c1460 l 00000240 HandleSwitchMapInput 080c16a0 l 00000018 SpriteCB_SwitchMapCursor @@ -7967,14 +7967,14 @@ 080c22ac l 00000080 SetMapEdgeInvisibility 080c232c l 00000178 LoadMapEdgeGfx 080c24a4 l 00000080 InitScreenForMapOpenAnim -080c2524 l 00000058 sub_80C253C +080c2524 l 00000058 SetGpuRegsToFadeMapToWhite 080c257c l 00000028 FinishMapOpenAnim 080c25a4 l 00000048 FreeMapOpenCloseAnim 080c25ec l 00000078 FreeMapEdgeSprites 080c2664 l 00000326 Task_MapOpenAnim 080c298c l 000001a4 MoveMapEdgesOutward -080c2b30 l 00000054 sub_80C2B48 -080c2b84 l 00000080 sub_80C2B9C +080c2b30 l 00000054 SetGpuWindowDimsToMapEdges +080c2b84 l 00000080 InitScreenForMapCloseAnim 080c2c04 l 0000001c DoMapCloseAnim 080c2c20 l 00000042 CreateMapEdgeSprites 080c2c64 l 000001a0 Task_MapCloseAnim @@ -32716,32 +32716,32 @@ 083bf5c4 l 00000018 sFlashingCircleImpactSpriteTemplate 083bf5dc l 0000001c sBorderBgTiles 083bf5f8 l 000000ac sBorderBgMap -083bf6a4 l 00000130 sSlashSpriteTiles -083bf7d4 l 00000020 sSlashSpritePals -083bf7f4 l 00000118 sLeafSpriteTiles -083bf90c l 00000060 sBlankLeafSpriteTiles +083bf6a4 l 00000130 sSlash_Gfx +083bf7d4 l 00000020 sLeaves_Pal +083bf7f4 l 00000118 sLeaves_Gfx +083bf90c l 00000060 sStreak_Gfx 083bf96c l 00000008 sOamData_FlameOrLeaf -083bf974 l 00000030 sSpriteAnims_FlameOrLeaf_0 -083bf9a4 l 00000004 sSpriteAnimTable_FlameOrLeaf -083bf9a8 l 00000018 sSpriteTemplate_FlameOrLeaf_State1 -083bf9c0 l 00000008 sOamData_LG_83BF950 -083bf9c8 l 00000018 sSpriteTemplate_FlameOrLeaf_State0 -083bf9e0 l 00000008 sOamData_UnknownEmptySprite -083bf9e8 l 00000018 sUnknownEmptySprite +083bf974 l 00000030 sSpriteAnim_Leaf +083bf9a4 l 00000004 sSpriteAnim_FlameOrLeaf +083bf9a8 l 00000018 sSpriteTemplate_FlameOrLeaf +083bf9c0 l 00000008 sOamData_Streak +083bf9c8 l 00000018 sSpriteTemplate_Streak +083bf9e0 l 00000008 sOamData_BlankSprite +083bf9e8 l 00000018 sSpriteTemplate_BlankSprite 083bfa00 l 00000008 sOamData_SlashSprite 083bfa08 l 00000018 sSlashSpriteTemplate 083bfa20 l 00000010 sBgTemplates 083bfa30 l 00000018 sSceneFuncs 083bfa48 l 00000020 sSpriteSheets 083bfa68 l 00000018 sSpritePals -083bfa80 l 00000010 gUnknown_LG_83BFA10 -083bfa90 l 00000824 gUnknown_83BFBE4 -083c02b4 l 000007f8 gUnknown_83C0408 -083c0aac l 0000079c gUnknown_83C0C00 -083c1248 l 0000081c gUnknown_83C139C -083c1a64 l 000007c8 gUnknown_83C1BB8 -083c222c l 00000824 gUnknown_83C2380 -083c2a50 l 00000018 gUnknown_83C2BA4 +083bfa80 l 00000010 sStreakYPositions +083bfa90 l 00000824 sUnused_Tilemap1 +083c02b4 l 000007f8 sUnused_Tilemap2 +083c0aac l 0000079c sUnused_Tilemap3 +083c1248 l 0000081c sUnused_Tilemap4 +083c1a64 l 000007c8 sUnused_Tilemap5 +083c222c l 00000824 sUnused_Tilemap6 +083c2a50 l 00000018 sUnused_Tilemaps 083c2a68 g 00000004 gWeatherPtr 083c2a6c l 000000f0 sWeatherFuncs 083c2b5c l 00000010 sWeatherPalStateFuncs @@ -36333,7 +36333,7 @@ 083ef148 l 00000020 sPlayerIcon_LeafPal 083ef168 l 00000020 sMiscIcon_Pal 083ef188 l 000000a0 sRegionMap_Pal -083ef228 l 00000008 unref_83EF37C +083ef228 l 00000008 sUnusedPalette 083ef230 l 00000020 sSwitchMapCursor_Pal 083ef250 l 00000020 sMapEdge_Pal 083ef270 l 0000008c sSwitchMapCursorLeft_Gfx @@ -36378,7 +36378,7 @@ 083f1acc l 00000008 sOamData_MapEdge 083f1ad4 l 00000008 sAnim_MapEdge 083f1adc l 00000004 sAnims_MapEdge -083f1ae0 l 00000008 gUnknown_83F1C34 +083f1ae0 l 00000008 sMapWindowDim 083f1ae8 l 00000008 sOamData_MapCursor 083f1af0 l 0000000c sAnim_MapCursor 083f1afc l 00000004 sAnims_MapCursor @@ -50807,8 +50807,8 @@ 08eae388 g 00000020 gGraphics_TitleScreen_BackgroundPals 08eae3a8 g 000002c0 gGraphics_TitleScreen_CopyrightPressStartTiles 08eae668 g 00000114 gGraphics_TitleScreen_CopyrightPressStartMap -08eae77c g 00000020 gGraphics_TitleScreen_FireOrLeafPals -08eae79c g 00000080 gGraphics_TitleScreen_BlankObjTiles +08eae77c g 00000020 gTitleScreen_Slash_Pal +08eae79c g 00000080 gTitleScreen_BlankSprite_Tiles 08eae81c g 00000020 gCreditsAllRightsReservedGfxPal 08eae83c g 000003b8 gCreditsAllRightsReservedGfxTiles 08eaebf4 g 00000100 gCreditsAllRightsReservedGfxMap