summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom6.s6
-rw-r--r--asm/rom_807C828.s76
-rw-r--r--src/rom4.c4
-rw-r--r--src/scrcmd.c4
-rw-r--r--src/start_menu.c16
5 files changed, 53 insertions, 53 deletions
diff --git a/asm/rom6.s b/asm/rom6.s
index 3258bd26c..8f00a3732 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -8924,7 +8924,7 @@ sub_810F83C: @ 810F83C
cmp r0, 0x1
beq _0810F858
movs r0, 0x14
- bl sub_80806B4
+ bl SetSav1Weather
_0810F858:
pop {r0}
bx r0
@@ -8942,7 +8942,7 @@ sub_810F85C: @ 810F85C
cmp r0, 0x1
beq _0810F878
movs r0, 0x15
- bl sub_80806B4
+ bl SetSav1Weather
_0810F878:
pop {r0}
bx r0
@@ -48964,7 +48964,7 @@ _081238B6:
b _081239D6
_081238C2:
ldrb r0, [r3, 0x2]
- bl sub_807C91C
+ bl DoWeatherEffect
ldr r1, [r5]
movs r0, 0x1
strb r0, [r1, 0x1]
diff --git a/asm/rom_807C828.s b/asm/rom_807C828.s
index badfd38b4..f5c9116d5 100644
--- a/asm/rom_807C828.s
+++ b/asm/rom_807C828.s
@@ -114,8 +114,8 @@ _0807C914: .4byte sub_807C9E4
_0807C918: .4byte 0x000006c9
thumb_func_end sub_807C828
- thumb_func_start sub_807C91C
-sub_807C91C: @ 807C91C
+ thumb_func_start DoWeatherEffect
+DoWeatherEffect: @ 807C91C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -125,7 +125,7 @@ sub_807C91C: @ 807C91C
beq _0807C932
cmp r4, 0xD
beq _0807C932
- bl play_some_sound
+ bl PlayRainSoundEffect
_0807C932:
ldr r1, _0807C974
ldr r2, _0807C978
@@ -165,7 +165,7 @@ _0807C978: .4byte 0x000006d1
_0807C97C: .4byte gUnknown_08396FC8
_0807C980: .4byte 0x000006d3
_0807C984: .4byte 0x000006ce
- thumb_func_end sub_807C91C
+ thumb_func_end DoWeatherEffect
thumb_func_start sub_807C988
sub_807C988: @ 807C988
@@ -173,7 +173,7 @@ sub_807C988: @ 807C988
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl play_some_sound
+ bl PlayRainSoundEffect
ldr r0, _0807C9AC
movs r2, 0xDA
lsls r2, 3
@@ -196,7 +196,7 @@ sub_807C9B4: @ 807C9B4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl play_some_sound
+ bl PlayRainSoundEffect
ldr r1, _0807C9E0
movs r2, 0xDA
lsls r2, 3
@@ -2834,8 +2834,8 @@ _0807DDAE:
_0807DDB4: .4byte 0x000006dd
thumb_func_end sub_807DD5C
- thumb_func_start play_some_sound
-play_some_sound: @ 807DDB8
+ thumb_func_start PlayRainSoundEffect
+PlayRainSoundEffect: @ 807DDB8
push {lr}
bl IsSpecialSEPlaying
lsls r0, 24
@@ -2867,7 +2867,7 @@ _0807DDF0:
_0807DDF6:
pop {r0}
bx r0
- thumb_func_end play_some_sound
+ thumb_func_end PlayRainSoundEffect
thumb_func_start sub_807DDFC
sub_807DDFC: @ 807DDFC
@@ -8184,35 +8184,35 @@ _080806AE:
bx r0
thumb_func_end unc_0807DAB4
- thumb_func_start sub_80806B4
-sub_80806B4: @ 80806B4
+ thumb_func_start SetSav1Weather
+SetSav1Weather: @ 80806B4
push {r4,r5,lr}
ldr r4, _080806D4
adds r4, 0x2E
ldrb r5, [r4]
lsls r0, 24
lsrs r0, 24
- bl sub_8080764
+ bl TranslateWeatherNum
strb r0, [r4]
ldrb r0, [r4]
adds r1, r5, 0
- bl sub_8080854
+ bl UpdateRainCounter
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080806D4: .4byte gSaveBlock1
- thumb_func_end sub_80806B4
+ thumb_func_end SetSav1Weather
- thumb_func_start sav1_get_weather_probably
-sav1_get_weather_probably: @ 80806D8
+ thumb_func_start GetSav1Weather
+GetSav1Weather: @ 80806D8
ldr r0, _080806E0
adds r0, 0x2E
ldrb r0, [r0]
bx lr
.align 2, 0
_080806E0: .4byte gSaveBlock1
- thumb_func_end sav1_get_weather_probably
+ thumb_func_end GetSav1Weather
thumb_func_start sub_80806E4
sub_80806E4: @ 80806E4
@@ -8222,11 +8222,11 @@ sub_80806E4: @ 80806E4
ldrb r5, [r4]
ldr r0, _08080708
ldrb r0, [r0, 0x16]
- bl sub_8080764
+ bl TranslateWeatherNum
strb r0, [r4]
ldrb r0, [r4]
adds r1, r5, 0
- bl sub_8080854
+ bl UpdateRainCounter
pop {r4,r5}
pop {r0}
bx r0
@@ -8238,11 +8238,11 @@ _08080708: .4byte gMapHeader
thumb_func_start sub_808070C
sub_808070C: @ 808070C
push {lr}
- bl sub_80806B4
- bl sav1_get_weather_probably
+ bl SetSav1Weather
+ bl GetSav1Weather
lsls r0, 24
lsrs r0, 24
- bl sub_807C91C
+ bl DoWeatherEffect
pop {r0}
bx r0
thumb_func_end sub_808070C
@@ -8250,8 +8250,8 @@ sub_808070C: @ 808070C
thumb_func_start sub_8080724
sub_8080724: @ 8080724
push {lr}
- bl sub_80806B4
- bl sav1_get_weather_probably
+ bl SetSav1Weather
+ bl GetSav1Weather
lsls r0, 24
lsrs r0, 24
bl sub_807C988
@@ -8262,10 +8262,10 @@ sub_8080724: @ 8080724
thumb_func_start sub_808073C
sub_808073C: @ 808073C
push {lr}
- bl sav1_get_weather_probably
+ bl GetSav1Weather
lsls r0, 24
lsrs r0, 24
- bl sub_807C91C
+ bl DoWeatherEffect
pop {r0}
bx r0
thumb_func_end sub_808073C
@@ -8273,7 +8273,7 @@ sub_808073C: @ 808073C
thumb_func_start sub_8080750
sub_8080750: @ 8080750
push {lr}
- bl sav1_get_weather_probably
+ bl GetSav1Weather
lsls r0, 24
lsrs r0, 24
bl sub_807C988
@@ -8281,8 +8281,8 @@ sub_8080750: @ 8080750
bx r0
thumb_func_end sub_8080750
- thumb_func_start sub_8080764
-sub_8080764: @ 8080764
+ thumb_func_start TranslateWeatherNum
+TranslateWeatherNum: @ 8080764
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -8383,7 +8383,7 @@ _0808082C:
_0808082E:
pop {r1}
bx r1
- thumb_func_end sub_8080764
+ thumb_func_end TranslateWeatherNum
thumb_func_start sub_8080834
sub_8080834: @ 8080834
@@ -8404,8 +8404,8 @@ sub_8080834: @ 8080834
_08080850: .4byte gSaveBlock1
thumb_func_end sub_8080834
- thumb_func_start sub_8080854
-sub_8080854: @ 8080854
+ thumb_func_start UpdateRainCounter
+UpdateRainCounter: @ 8080854
push {lr}
lsls r0, 24
lsls r1, 24
@@ -8422,7 +8422,7 @@ _08080868:
_0808086E:
pop {r0}
bx r0
- thumb_func_end sub_8080854
+ thumb_func_end UpdateRainCounter
thumb_func_start palette_bg_faded_fill_black
palette_bg_faded_fill_black: @ 8080874
@@ -9211,7 +9211,7 @@ sub_8080E88: @ 8080E88
bl ScriptContext2_Enable
bl sub_8053FF8
bl sub_8080918
- bl play_some_sound
+ bl PlayRainSoundEffect
movs r0, 0x9
bl PlaySE
ldr r0, _08080EB4
@@ -9234,7 +9234,7 @@ sp13E_warp_to_last_warp: @ 8080EC0
bl ScriptContext2_Enable
bl sub_8053FF8
bl sub_8080918
- bl play_some_sound
+ bl PlayRainSoundEffect
ldr r0, _08080EE4
ldr r1, _08080EE8
str r1, [r0]
@@ -9723,7 +9723,7 @@ _080812A2:
_080812A8:
bl sub_8053FF8
bl sub_8080918
- bl play_some_sound
+ bl PlayRainSoundEffect
movs r0, 0
strh r0, [r5, 0x8]
ldr r0, _080812C4
@@ -9798,7 +9798,7 @@ sub_8081334: @ 8081334
bl ScriptContext2_Enable
bl sub_8053FF8
bl sub_8080918
- bl play_some_sound
+ bl PlayRainSoundEffect
movs r0, 0x9
bl PlaySE
ldr r0, _08081360
@@ -11198,7 +11198,7 @@ _08081E62:
lsls r0, 5
cmp r1, r0
beq _08081E84
- bl sav1_get_weather_probably
+ bl GetSav1Weather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x8
diff --git a/src/rom4.c b/src/rom4.c
index 244e94533..8331e3581 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -70,7 +70,7 @@ extern u32 gUnknown_08216694[];
extern struct UnkWarpStruct *sub_80FA8CC(u8);
extern u16 VarGet(u16);
extern u8 FlagGet(u16);
-extern u8 sav1_get_weather_probably(void);
+extern u8 GetSav1Weather(void);
extern void PlayerGetDestCoords(u16 *, u16 *);
extern u8 sub_810D32C(void);
extern u16 GetLocalWildMon(u8 *);
@@ -778,7 +778,7 @@ u16 sav1_map_get_music(void)
if (gSaveBlock1.location.mapGroup == 0
&& gSaveBlock1.location.mapNum == 26
- && sav1_get_weather_probably() == 8)
+ && GetSav1Weather() == 8)
return BGM_ASHROAD;
music = sub_8053D9C(&gSaveBlock1.location);
diff --git a/src/scrcmd.c b/src/scrcmd.c
index ccd5cbdb3..d613e2c79 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -33,7 +33,7 @@ extern void sub_8081594(u8);
extern void sub_8053CE4(u32);
extern void fade_screen(u8, u8);
extern void DoTimeBasedEvents(void);
-extern void sub_80806B4(u32);
+extern void SetSav1Weather(u32);
extern void sub_80806E4(void);
extern void sub_808073C(void);
extern void activate_per_step_callback(u8);
@@ -724,7 +724,7 @@ bool8 ScrCmd_resetvars(struct ScriptContext *ctx)
bool8 ScrCmd_setweather(struct ScriptContext *ctx)
{
u16 value = VarGet(ScriptReadHalfword(ctx));
- sub_80806B4(value);
+ SetSav1Weather(value);
return FALSE;
}
diff --git a/src/start_menu.c b/src/start_menu.c
index c538c20c2..979199c0b 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -23,7 +23,7 @@ extern bool8 sub_8125D44(u8); //Saving related
extern void sub_80945C0(u8, u8);
extern void sub_80946C8(u8, u8);
extern void save_serialize_map(void);
-extern void play_some_sound(void);
+extern void PlayRainSoundEffect(void);
extern void sub_8093130(u8, void (*)(void));
extern void sub_805469C(void);
extern void sub_80C823C(void);
@@ -370,7 +370,7 @@ u8 StartMenu_PokedexCallback(void)
if(!gPaletteFade.active)
{
sav12_xor_increment(0x29);
- play_some_sound();
+ PlayRainSoundEffect();
SetMainCallback2(CB2_InitPokedex);
return 1;
}
@@ -382,7 +382,7 @@ u8 StartMenu_PokemonCallback(void)
{
if(!gPaletteFade.active)
{
- play_some_sound();
+ PlayRainSoundEffect();
SetMainCallback2(sub_8089A70);
return 1;
}
@@ -394,7 +394,7 @@ u8 StartMenu_BagCallback(void)
{
if(!gPaletteFade.active)
{
- play_some_sound();
+ PlayRainSoundEffect();
SetMainCallback2(sub_80A53F8);
return 1;
}
@@ -406,7 +406,7 @@ u8 StartMenu_PokenavCallback(void)
{
if(!gPaletteFade.active)
{
- play_some_sound();
+ PlayRainSoundEffect();
SetMainCallback2(sub_80EBA5C);
return 1;
}
@@ -418,7 +418,7 @@ u8 StartMenu_PlayerCallback(void)
{
if(!gPaletteFade.active)
{
- play_some_sound();
+ PlayRainSoundEffect();
sub_8093110(sub_805469C);
return 1;
}
@@ -438,7 +438,7 @@ u8 StartMenu_OptionCallback(void)
{
if(!gPaletteFade.active)
{
- play_some_sound();
+ PlayRainSoundEffect();
SetMainCallback2(CB2_InitOptionMenu);
gMain.field_8 = sub_805469C;
return 1;
@@ -466,7 +466,7 @@ u8 StartMenu_PlayerLinkCallback(void)
{
if(!gPaletteFade.active)
{
- play_some_sound();
+ PlayRainSoundEffect();
sub_8093130(gUnknown_03004860, sub_805469C);
return 1;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 16:00:16 +0000