mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-18 20:57:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link m_bgm

Browse Source
This commit is contained in:
Cuyler36
2023-12-13 18:19:42 -05:00
parent e66483b603
commit 6b97ca872b
11 changed files with 3026 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio.c
+4 -4
View File
@@ -49,11 +49,11 @@ extern void sAdo_GameFrame(){
Na_GameFrame();
}
extern void sAdo_BgmStart(s8 id){
extern void sAdo_BgmStart(u8 id){
Na_BgmStart(id);
}
extern void sAdo_BgmStop(s16 id){
extern void sAdo_BgmStop(u16 id){
Na_BgmStop(id);
}
extern void sAdo_SysTrgStart(u16 id){
@@ -261,9 +261,9 @@ extern void sAdo_MDPlayerPos(xyz_t* pos, u16 s1, u16 s2, int p){
Na_MDPlayerPos(scalc,s1,s2,p,fcalc);
}
extern void sAdo_BGMVolume(f32 f, u16 volume){
extern void sAdo_BGMVolume(f32 volume, u16 vol_move_ctr){
Na_BGMVolume(f,volume);
Na_BGMVolume(volume, vol_move_ctr);
}
extern void sAdo_BgmCrossfadeStart(u8 b){
src/m_bgm.c
+2969
View File
File diff suppressed because it is too large Load Diff
src/m_camera2.c
+1 -1
View File
@@ -1397,7 +1397,7 @@ static void Camera2_main_Normal_SetEndCenterPos_fromPlayer(GAME_PLAY* play, xyz_
Camera2_GetBorderScale(play, scale, &border_x0, &border_x1, &border_z0, &border_z1);
*end_center_pos = player->actor_class.eye.position;
if (mPlib_get_player_actor_main_index(play) == 114) {
if (mPlib_get_player_actor_main_index((GAME*)play) == 114) {
if (mFI_Wpos2BlockNum(&block_x, &block_z, player->actor_class.world.position)) {
if (block_x == 5) {
if (block_z == 7) {
src/m_demo.c
+1 -1
View File
@@ -439,7 +439,7 @@ static int wait_talk_start() {
if (demo->data.talk.change_player) {
if (
mPlib_get_player_actor_main_index((GAME_PLAY*)gamePT) != 65 &&
mPlib_get_player_actor_main_index(gamePT) != 65 &&
mPlib_request_main_talk_type1((GAME_PLAY*)gamePT, demo->current.actor, demo->data.talk.turn, FALSE) == FALSE
) {
return FALSE;
src/m_soncho.c
+1 -1
View File
@@ -1169,7 +1169,7 @@ extern int mSC_LightHouse_travel_check() {
}
extern void mSC_change_player_freeze(GAME_PLAY* play) {
if (mPlib_get_player_actor_main_index(play) != 74) {
if (mPlib_get_player_actor_main_index((GAME*)play) != 74) {
mPlib_request_main_demo_wait_type1(play, 0, NULL);
}
}