mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-27 15:42:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

link ac_weather

Browse Source
This commit is contained in:
Prakxo
2023-11-03 11:40:02 +00:00
parent aae583e085
commit 9a33aef125
8 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/rel_slices.yml
+4 -4
View File
@@ -542,10 +542,10 @@ m_map_ovl.c:
.rodata: [0x8064B628, 0x8064B6B0]
.data: [0x806CD9C0, 0x806CE008]
.bss: [0x81340468, 0x81340488]
#ac_weather.c:
# .text: [0x8060193C, 0x80602E70]
# .rodata: []
# .data: []
ac_weather.c:
.text: [0x8060193C, 0x80602E70]
.rodata: [0x8064BAE8, 0x8064BB08]
.data: [0x806D1D50, 0x806D1DA0]
m_select.c:
.text: [0x80627F88, 0x80629CA8]
.rodata: [0x8064D1B0, 0x8064D1B8]
include/ac_weather_fine.h
+3 -1
View File
@@ -14,4 +14,6 @@ extern aWeather_Profile_c iam_weather_fine;
#ifdef __cplusplus
}
#endif
#endif
#endif
include/ac_weather_leaf.h
+2
View File
@@ -14,4 +14,6 @@ extern aWeather_Profile_c iam_weather_leaf;
#ifdef __cplusplus
}
#endif
#endif
include/ac_weather_rain.h
+2
View File
@@ -14,4 +14,6 @@ extern aWeather_Profile_c iam_weather_rain;
#ifdef __cplusplus
}
#endif
#endif
include/ac_weather_sakura.h
+2
View File
@@ -14,4 +14,6 @@ extern aWeather_Profile_c iam_weather_sakura;
#ifdef __cplusplus
}
#endif
#endif
include/ac_weather_snow.h
+2
View File
@@ -14,4 +14,6 @@ extern aWeather_Profile_c iam_weather_snow;
#ifdef __cplusplus
}
#endif
#endif
include/ef_effect_control.h
+6 -1
View File
@@ -30,11 +30,16 @@ enum {
typedef void (*eEC_NAME2EFFECTMAKE_PROC)(int, xyz_t, int, short, GAME*, u16, s16, s16);
typedef void (*eEC_REGISTEFFECTLIGHT_PROC)(f32*, s16,s16,s16);
typedef int (*eEC_EFFECTLIGHTSTATUS_PROC)(rgba_t*, int*); // returns eEC_LIGHT_COLOR_*
typedef struct effect_control_clip_s {
/* 0x00 */ eEC_NAME2EFFECTMAKE_PROC effect_make_proc;
/* 0x04 */ u8 _04[0x3C - 0x04];
/* 0x04 */ u8 _04[0x30 - 0x04];
/* 0x30 */ eEC_REGISTEFFECTLIGHT_PROC regist_effect_light;
/* 0x34 */ void* _34;
/* 0x38 */ void* _38;
/* 0x3C */ eEC_EFFECTLIGHTSTATUS_PROC effect_light_status;
/* 0x40 */ void* _40;
/* 0x44 */ void* _44;
rel/ac_weather.c
+14 -7
View File
@@ -12,10 +12,13 @@
#include "m_malloc.h"
#include "m_player_lib.h"
void Weather_Actor_ct(ACTOR* actor, GAME* game);
void Weather_Actor_dt(ACTOR* actor, GAME* game);
void Weather_Actor_move(ACTOR* actor, GAME* game);
void Weather_Actor_draw(ACTOR* actor, GAME* game);
static void Weather_Actor_ct(ACTOR* actor, GAME* game);
static void Weather_Actor_dt(ACTOR* actor, GAME* game);
static void Weather_Actor_move(ACTOR* actor, GAME* game);
static void Weather_Actor_draw(ACTOR* actor, GAME* game);
static void aWeather_SetNowProfile(WEATHER_ACTOR* weather, s16 id);
static aWeather_Profile_c* profile_tbl[] = {
&iam_weather_fine,
@@ -369,8 +372,12 @@ void aWeather_SnowInAdvance(WEATHER_ACTOR* weather, GAME_PLAY* play, int moves){
void Weather_Actor_ct(ACTOR* actor, GAME* game){
static s16 DemoWeatherTbl[10][2] = {
static s16 DemoWeatherTbl[5][2] = {
3,1,
1,2,
0,0,
0,0,
2,1,
};
WEATHER_ACTOR* weather = (WEATHER_ACTOR*)actor;
GAME_PLAY* play = (GAME_PLAY*)game;
@@ -637,7 +644,7 @@ static void aWeather_MakeKaminari(WEATHER_ACTOR* weather){
if (((timer == weather->lightning_timer2) || (timer == (weather->lightning_timer2 + 20))) &&
(Common_Get(clip.effect_clip) != NULL) && ( (Save_Get(scene_no) - SCENE_MY_ROOM_BASEMENT_S) > 3U) &&
( (Save_Get(scene_no) - SCENE_MUSEUM_ROOM_PAINTING) > 1U) && ( Save_Get(scene_no) != SCENE_MUSEUM_ROOM_FISH)) {
f32 effect[] = { 12712.2f };
f32 effect[] = { 12712.249f };
Common_Get(clip.effect_clip)->regist_effect_light(effect, 2, 0x23, 0);
}
if (timer == (weather->lightning_timer2 + 65)) {