From 80d7aa59020abd5a9055f32179b37510bca5569d Mon Sep 17 00:00:00 2001 From: huderlem Date: Tue, 18 Oct 2022 00:46:42 +0000 Subject: [PATCH] Update src/overworld.c --- pokeemerald.sym | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 54bd218cda..3955886a5e 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -323,7 +323,7 @@ 02038440 g 00000001 gAnimCustomPanning 02038444 l 00000004 sAnimTaskAffineAnim 02038454 g 00000750 gWeather -02038ba4 l 00000020 sFieldEffectPaletteGammaTypes +02038ba4 l 00000020 sFieldEffectPaletteColorMapTypes 02038bc4 l 00000001 sCurrentAbnormalWeather 02038bc6 l 00000002 sUnusedWeatherRelated 02038bc8 l 00000002 sTrainerBattleMode @@ -796,7 +796,7 @@ 03000f4c l 00000001 sMapMusicState 03000f4d l 00000001 sMapMusicFadeInSpeed 03000f4e l 00000002 sFanfareCounter -03000f50 l 00000004 sPaletteGammaTypes +03000f50 l 00000004 sPaletteColorMapTypes 03000f58 l 00000020 sActiveList 03000f78 l 00000188 sItemIconGfxBuffer 03001100 l 00000001 sCutSquareSide @@ -6838,31 +6838,31 @@ 080ab26c l 00000020 None_Init 080ab28c l 00000002 None_Main 080ab290 l 00000004 None_Finish -080ab294 l 00000114 BuildGammaShiftTables -080ab3a8 l 0000008a UpdateWeatherGammaShift +080ab294 l 00000114 BuildColorMaps +080ab3a8 l 0000008a UpdateWeatherColorMap 080ab434 l 00000118 FadeInScreenWithWeather 080ab54c l 00000060 FadeInScreen_RainShowShade 080ab5ac l 00000058 FadeInScreen_Drought 080ab604 l 0000003a FadeInScreen_FogHorizontal 080ab640 l 00000002 DoNothing -080ab644 l 00000204 ApplyGammaShift -080ab848 l 00000148 ApplyGammaShiftWithBlend -080ab990 l 00000120 ApplyDroughtGammaShiftWithBlend +080ab644 l 00000204 ApplyColorMap +080ab848 l 00000148 ApplyColorMapWithBlend +080ab990 l 00000120 ApplyDroughtColorMapWithBlend 080abab0 l 0000011a ApplyFogBlend 080abbcc l 00000034 MarkFogSpritePalToLighten 080abc00 l 00000046 LightenSpritePaletteInFog -080abc48 g 00000034 ApplyWeatherGammaShiftIfIdle -080abc7c g 00000054 ApplyWeatherGammaShiftIfIdle_Gradual +080abc48 g 00000034 ApplyWeatherColorMapIfIdle +080abc7c g 00000054 ApplyWeatherColorMapIfIdle_Gradual 080abcd0 g 0000012c FadeScreen 080abdfc g 0000001c IsWeatherNotFadingIn 080abe18 g 000000e8 UpdateSpritePaletteWithWeather -080abf00 g 00000020 ApplyWeatherGammaShiftToPal +080abf00 g 00000020 ApplyWeatherColorMapToPal 080abf20 l 0000002c IsFirstFrameOfWeatherFadeIn 080abf4c g 00000030 LoadCustomWeatherSpritePalette 080abf7c l 00000008 LoadDroughtWeatherPalette 080abf84 g 00000020 ResetDroughtWeatherPaletteLoading 080abfa4 g 0000003c LoadDroughtWeatherPalettes -080abfe0 l 00000010 SetDroughtGamma +080abfe0 l 00000010 SetDroughtColorMap 080abff0 g 0000002c DroughtStateInit 080ac01c g 00000108 DroughtStateRun 080ac124 g 00000040 Weather_SetBlendCoeffs @@ -47399,7 +47399,7 @@ 0854c14c g 00000004 gWeatherPtr 0854c150 l 000000f0 sWeatherFuncs 0854c240 g 00000010 gWeatherPalStateFuncs -0854c250 l 00000020 sBasePaletteGammaTypes +0854c250 l 00000020 sBasePaletteColorMapTypes 0854c270 g 00000020 gFogPalette 0854c290 g 00000020 gCloudsWeatherPalette 0854c2b0 g 00000020 gSandstormWeatherPalette