Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2024-11-23 04:59:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

label more functions and variables

Browse Source
This commit is contained in:
camthesaxman 2017-11-26 01:41:51 -06:00
parent 0621797d34
commit 4e1098beb6
6 changed files with 362 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/battle_anim_80CA710.s
View File

@ -11280,7 +11280,7 @@ _080D812A:
ldr r2, _080D81C4 @ =0x85000400
str r2, [r0, 0x8]
ldr r2, [r0, 0x8]
ldr r2, _080D81C8 @ =gWeatherFog2Tiles
ldr r2, _080D81C8 @ =gWeatherFog1Tiles
ldr r3, [sp]
str r2, [r0]
str r3, [r0, 0x4]
@ -11326,7 +11326,7 @@ _080D81B8: .4byte gUnknown_030041B4
_080D81BC: .4byte REG_BG1HOFS
_080D81C0: .4byte 0x040000d4
_080D81C4: .4byte 0x85000400
_080D81C8: .4byte gWeatherFog2Tiles
_080D81C8: .4byte gWeatherFog1Tiles
_080D81CC: .4byte 0x80000400
_080D81D0: .4byte gBattleAnimFogTilemap
_080D81D4: .4byte gUnknown_083970E8
@ -11672,7 +11672,7 @@ _080D845E:
ldr r2, _080D84FC @ =0x85000400
str r2, [r0, 0x8]
ldr r2, [r0, 0x8]
ldr r2, _080D8500 @ =gWeatherFog2Tiles
ldr r2, _080D8500 @ =gWeatherFog1Tiles
ldr r3, [sp]
str r2, [r0]
str r3, [r0, 0x4]
@ -11720,7 +11720,7 @@ _080D84F0: .4byte gUnknown_030041B4
_080D84F4: .4byte REG_BG1HOFS
_080D84F8: .4byte 0x040000d4
_080D84FC: .4byte 0x85000400
_080D8500: .4byte gWeatherFog2Tiles
_080D8500: .4byte gWeatherFog1Tiles
_080D8504: .4byte 0x80000400
_080D8508: .4byte gBattleAnimFogTilemap
_080D850C: .4byte gUnknown_083970E8

BIN
graphics/weather/fog1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 928 B

After

Width:  |  Height:  |  Size: 1018 B

BIN
graphics/weather/fog2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1018 B

After

Width:  |  Height:  |  Size: 928 B

56
include/field_weather.h
View File

@ -6,29 +6,35 @@
#define WEATHER_RAIN_LIGHT 3
#define WEATHER_SNOW 4
#define WEATHER_RAIN_MED 5
#define WEATHER_FOG_2 6
#define WEATHER_FOG_1 7
#define WEATHER_FOG_1 6
#define WEATHER_ASH 7
#define WEATHER_FOG_2 9
#define WEATHER_DROUGHT 12
#define WEATHER_RAIN_HEAVY 13
#define WEATHER_BUBBLES 14
struct Sprite;
// TODO: This might be a union
struct Weather2
{
/*0x000*/ u8 filler0[0xA0];
/*0x0A0*/ struct Sprite *fogSprites[20];
/*0x0F0*/ struct Sprite *fog1Sprites[20];
/*0x140*/ struct Sprite *unknown_140[20];
/*0x190*/ struct Sprite *unknown_190[20];
/*0x1E0*/ struct Sprite *unknown_1E0[5];
};
struct Weather
{
/*0x000*/ struct Sprite *rainSprites[24];
/*0x060*/ struct Sprite *snowflakeSprites[0x65]; // snowflakes?
/*0x1F4*/ struct Sprite *cloudSprites[3];
union
{
struct
{
struct Sprite *rainSprites[24];
struct Sprite *snowflakeSprites[101];
struct Sprite *cloudSprites[3];
} s1;
struct
{
u8 filler0[0xA0];
struct Sprite *fog1Sprites[20];
struct Sprite *ashSprites[20];
struct Sprite *fog2Sprites[20];
struct Sprite *sandstormSprites1[20];
struct Sprite *sandstormSprites2[5];
} s2;
} sprites;
u8 unknown_200[2][32];
u8 filler_240[0x460-0x240];
u8 unk460[2][32];
@ -47,7 +53,7 @@ struct Weather
u8 unknown_6CA;
u8 unknown_6CB;
u16 initStep;
u16 unknown_6CE;
u16 finishStep;
u8 currWeather;
u8 nextWeather;
u8 weatherGfxLoaded;
@ -57,11 +63,11 @@ struct Weather
u16 unknown_6D6;
u8 unknown_6D8;
u8 unknown_6D9;
u8 unknown_6DA;
u8 rainSpriteCount;
u8 unknown_6DB;
u8 unknown_6DC;
u8 rainStrength;
/*0x6DE*/ u8 cloudsActive;
/*0x6DE*/ u8 cloudSpritesCreated;
u8 filler_6DF[1];
u16 unknown_6E0;
u16 unknown_6E2;
@ -73,15 +79,15 @@ struct Weather
u8 unknown_6EB;
u8 unknown_6EC;
u8 unknown_6ED;
u16 fog2ScrollPosX;
u16 fog1ScrollPosX;
u16 unknown_6F0;
u16 unknown_6F2;
u8 unknown_6F4[6];
u8 unknown_6FA;
u8 unknown_6FB; // fogActive
u8 fog1SpritesCreated;
u16 unknown_6FC;
u16 unknown_6FE;
u8 unknown_700;
u8 ashSpritesCreated;
u8 filler_701[3];
u32 unknown_704;
u32 unknown_708;
@ -90,15 +96,15 @@ struct Weather
u16 unknown_710;
u16 unknown_712;
u16 unknown_714;
u8 unknown_716;
u8 unknown_717;
u8 sandstormSprites1Created;
u8 sandstormSprites2Created;
u16 unknown_718;
u16 unknown_71A;
u16 unknown_71C;
u16 unknown_71E;
u16 unknown_720;
u16 unknown_722;
u8 unknown_724;
u8 fog2SpritesCreated;
u8 filler_725[1];
u16 unknown_726;
u16 unknown_728;

96
src/field/field_weather.c
View File

@ -72,10 +72,10 @@ void Clouds_InitVars(void);
void Clouds_Main(void);
void Clouds_InitAll(void);
bool8 Clouds_Finish(void);
void sub_807DF9C(void);
void nullsub_55(void);
void sub_807DFC0(void);
bool8 sub_807DFD0(void);
void Weather2_InitVars(void);
void Weather2_Main(void);
void Weather2_InitAll(void);
bool8 Weather2_Finish(void);
void LightRain_InitVars(void);
void LightRain_Main(void);
void LightRain_InitAll(void);
@ -88,60 +88,60 @@ void MedRain_InitVars(void);
void Rain_Main(void);
void MedRain_InitAll(void);
bool8 Rain_Finish(void);
void Fog1_InitVars(void);
void Fog1_Main(void);
void Fog1_InitAll(void);
bool8 Fog1_Finish(void);
void Ash_InitVars(void);
void Ash_Main(void);
void Ash_InitAll(void);
bool8 Ash_Finish(void);
void Sandstorm_InitVars(void);
void Sandstorm_Main(void);
void Sandstorm_InitAll(void);
bool8 Sandstorm_Finish(void);
void Fog2_InitVars(void);
void Fog2_Main(void);
void Fog2_InitAll(void);
bool8 Fog2_Finish(void);
void Fog1_InitVars(void);
void sub_807F888(void);
void sub_807F858(void);
bool8 sub_807F934(void);
void sub_807FE9C(void);
void sub_807FF4C(void);
void sub_807FF1C(void);
bool8 sub_807FFC8(void);
void sub_807FB24(void);
void sub_807FBD8(void);
void sub_807FBA8(void);
bool8 sub_807FC3C(void);
void Fog2_InitVars(void);
void Fog2_Main(void);
void Fog2_InitAll(void);
bool8 Fog2_Finish(void);
void sub_8080430(void);
void nullsub_56(void);
void sub_8080460(void);
bool8 sub_8080470(void);
void sub_807E110(void);
void sub_807E174(void);
void sub_807E144(void);
bool8 sub_807E258(void);
void Fog1_Main(void);
void Fog1_InitAll(void);
bool8 Fog1_Finish(void);
void Weather11_InitVars(void);
void Weather11_Main(void);
void Weather11_InitAll(void);
bool8 Weather11_Finish(void);
void Drought_InitVars(void);
void Drought_Main(void);
void Drought_InitAll(void);
bool8 Drought_Finish(void);
void HeavyRain_InitVars(void);
void Rain_Main(void);
void HeavyRain_InitAll(void);
bool8 Rain_Finish(void);
void sub_8080474(void);
void sub_80804F8(void);
void sub_80804C8(void);
bool8 sub_808056C(void);
void Bubbles_InitVars(void);
void Bubbles_Main(void);
void Bubbles_InitAll(void);
bool8 Bubbles_Finish(void);
static const struct WeatherCallbacks sWeatherFuncs[] =
{
{None_Init, None_Main, None_Init, None_Finish},
{Clouds_InitVars, Clouds_Main, Clouds_InitAll, Clouds_Finish},
{sub_807DF9C, nullsub_55, sub_807DFC0, sub_807DFD0},
{Weather2_InitVars, Weather2_Main, Weather2_InitAll, Weather2_Finish},
{LightRain_InitVars, LightRain_Main, LightRain_InitAll, LightRain_Finish}, // light rain
{Snow_InitVars, Snow_Main, Snow_InitAll, Snow_Finish}, // snow
{Snow_InitVars, Snow_Main, Snow_InitAll, Snow_Finish},
{MedRain_InitVars, Rain_Main, MedRain_InitAll, Rain_Finish},
{Fog1_InitVars, Fog1_Main, Fog1_InitAll, Fog1_Finish},
{Ash_InitVars, Ash_Main, Ash_InitAll, Ash_Finish},
{Sandstorm_InitVars, Sandstorm_Main, Sandstorm_InitAll, Sandstorm_Finish},
{Fog2_InitVars, Fog2_Main, Fog2_InitAll, Fog2_Finish},
{Fog1_InitVars, sub_807F888, sub_807F858, sub_807F934}, // fog 1
{sub_807FE9C, sub_807FF4C, sub_807FF1C, sub_807FFC8},
{sub_807FB24, sub_807FBD8, sub_807FBA8, sub_807FC3C},
{Fog2_InitVars, Fog2_Main, Fog2_InitAll, Fog2_Finish},
{sub_8080430, nullsub_56, sub_8080460, sub_8080470},
{sub_807E110, sub_807E174, sub_807E144, sub_807E258},
{Fog1_InitVars, Fog1_Main, Fog1_InitAll, Fog1_Finish},
{Weather11_InitVars, Weather11_Main, Weather11_InitAll, Weather11_Finish},
{Drought_InitVars, Drought_Main, Drought_InitAll, Drought_Finish},
{HeavyRain_InitVars, Rain_Main, HeavyRain_InitAll, Rain_Finish},
{sub_8080474, sub_80804F8, sub_80804C8, sub_808056C},
{Bubbles_InitVars, Bubbles_Main, Bubbles_InitAll, Bubbles_Finish},
};
void (*const gUnknown_083970B8[])(void) =
@ -200,15 +200,15 @@ void StartWeather(void)
sub_807CB10();
gWeatherPtr->unknown_6D5 = index;
gWeatherPtr->unknown_6D4 = AllocSpritePalette(0x1201);
gWeatherPtr->unknown_6DA = 0;
gWeatherPtr->rainSpriteCount = 0;
gWeatherPtr->unknown_6D8 = 0;
gWeatherPtr->cloudsActive = 0;
gWeatherPtr->cloudSpritesCreated = 0;
gWeatherPtr->snowflakeSpriteCount = 0;
gWeatherPtr->unknown_700 = 0;
gWeatherPtr->unknown_6FB = 0;
gWeatherPtr->unknown_724 = 0;
gWeatherPtr->unknown_716 = 0;
gWeatherPtr->unknown_717 = 0;
gWeatherPtr->ashSpritesCreated = 0;
gWeatherPtr->fog1SpritesCreated = 0;
gWeatherPtr->fog2SpritesCreated = 0;
gWeatherPtr->sandstormSprites1Created = 0;
gWeatherPtr->sandstormSprites2Created = 0;
gWeatherPtr->unknown_72E = 0;
gWeatherPtr->unknown_6FA = 0;
Weather_SetBlendCoeffs(16, 0);
@ -232,7 +232,7 @@ void DoWeatherEffect(u8 effect)
}
gWeatherPtr->unknown_6D3 = 0;
gWeatherPtr->nextWeather = effect;
gWeatherPtr->unknown_6CE = 0;
gWeatherPtr->finishStep = 0;
}
void sub_807C988(u8 effect)

534
src/field/field_weather_effects.c
View File

File diff suppressed because it is too large Load Diff