Fix dialog asset remap gaps and void conditional-dialog callbacks

include/functions.h

@@ -2413,7 +2413,7 @@ void volatileFlag_clear(void);
 void volatileFlag_restoreAll(void);
 
 // --- core2/gc/dialog.c ---
-int func_803110F8(s32 next_state, s32 arg1, s32 arg2, s32 arg3, void (*arg4)(ActorMarker *, enum asset_e, s32));
+int func_803110F8(s32 next_state, s32 arg1, s32 arg2, s32 arg3, s32 (*arg4)(ActorMarker *, enum asset_e, s32));
 int gcdialog_showDialogConditional(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32), s32(*arg6)(ActorMarker *, s32, s32));
 int gcdialog_getCurrentTextId(void);
 int func_803115C4(s32 next_state);

src/core2/gc/dialog.c

@@ -863,7 +863,7 @@ void func_80310D2C(void){
     }
 }
 
-int func_803110F8(s32 next_state, s32 arg1, s32 arg2, s32 arg3, void (*arg4)(ActorMarker *, enum asset_e, s32)){
+int func_803110F8(s32 next_state, s32 arg1, s32 arg2, s32 arg3, s32 (*arg4)(ActorMarker *, enum asset_e, s32)){
     func_8025A55C(15000, 300, 2);
     gcdialog_showDialogConditional(next_state + 0xe57, 0x84, NULL, NULL, NULL, NULL, (s32(*)(ActorMarker *, s32, s32))arg4);
     func_80310A5C(arg2, arg3, arg1, 0, 0);

src/core2/quiz/game.c

@@ -978,8 +978,8 @@ void func_getCameraViewFromLevel(enum map_e map_id, s32 arg1, bool arg2) {
 }
 
 
-void func_802D5140(ActorMarker *caller, enum asset_e text_id, s32 arg2){
-    itemscore_noteScores_get(volatileFlag_getN(VOLATILE_FLAG_19_CURRENT_LEVEL_ID, 4));
+s32 func_802D5140(ActorMarker *caller, enum asset_e text_id, s32 arg2){
+    return itemscore_noteScores_get(volatileFlag_getN(VOLATILE_FLAG_19_CURRENT_LEVEL_ID, 4));
 }
 
 void func_802D5178(s32 arg0, enum file_progress_e arg1, s32 arg2, enum map_e arg3, s32 arg4, s32 arg5, enum actor_e arg6, s32 arg7){

src/core2/spline_pathfollow.c

@@ -926,8 +926,8 @@ f32 func_80342260(s32 arg0, f32 arg1, s32 arg2){
     return func_803234FC(func_80342038(arg0), arg1, 1.0f) / ((f32)arg2 /4);
 }
 
-void func_803422AC(ActorMarker *caller, enum asset_e text_id, s32 arg2){
-    jiggyscore_total();
+s32 func_803422AC(ActorMarker *caller, enum asset_e text_id, s32 arg2){
+    return jiggyscore_total();
 }
 
 s32 func_803422D4(Actor *arg0, Union_glspline *arg1, SplineList *arg2){

src/lair/ch/brentilda.c

@@ -19,13 +19,13 @@ ActorAnimationInfo chBrentildaAnimations[] ={
 ActorInfo chBrentilda = { 0x1E0, 0x348, 0x539, 0x1, chBrentildaAnimations, chBrentilda_update, actor_update_func_80326224, actor_draw, 2000, 0, 2.0f, 0};
 
 /* .code */
-void func_8038BA30(ActorMarker *marker, enum asset_e text_id, s32 arg2){
+s32 func_8038BA30(ActorMarker *marker, enum asset_e text_id, s32 arg2){
     Actor *this;
     s32 phi_v1;
 
     this = marker_getActor(marker);
     phi_v1 = this->unk10_12*2;
-    volatileFlag_getN(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE + this->actorTypeSpecificField*6 + phi_v1, 2);
+    return volatileFlag_getN(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE + this->actorTypeSpecificField*6 + phi_v1, 2);
 }
 
 void healDuoToFull(ActorMarker *marker, enum asset_e text_id, s32 arg2){