Merge branch 'master' into d_a_do

include/d/a/d_a_alink.h

@@ -2393,10 +2393,10 @@ public:
     /* 80108F64 */ bool cancelHookshotMove();
     /* 8010903C */ BOOL checkHookshotReadyMaterialOffMode() const;
     /* 80109070 */ void setHookshotReadyMaterial();
-    /* 801090EC */ void initHookshotUpperAnimeSpeed(int);
+    /* 801090EC */ int initHookshotUpperAnimeSpeed(int);
     /* 80109170 */ void initHookshotReady();
     /* 801091E4 */ void setHookshotReadyAnime();
-    /* 80109284 */ void checkUpperItemActionHookshot();
+    /* 80109284 */ int checkUpperItemActionHookshot();
     /* 801095C8 */ int checkNextActionHookshot();
     /* 801097A0 */ void setHookshotReturnEnd();
     /* 80109890 */ void setHookshotHangMoveBGCollect();

include/d/com/d_com_inf_game.h

@@ -954,7 +954,9 @@ inline void dComIfGs_onEventBit(u16 i_flag) {
     g_dComIfG_gameInfo.info.getSavedata().getEvent().onEventBit(i_flag);
 }
 
-inline BOOL i_dComIfGs_isEventBit(u16 i_flag) {
+// debug rom says `i_flag` is not const, but it's needed to match in some places?
+// missing some other inline maybe?
+inline BOOL i_dComIfGs_isEventBit(const u16 i_flag) {
     return g_dComIfG_gameInfo.info.getEvent().isEventBit(i_flag);
 }
 
@@ -2566,7 +2568,7 @@ inline int dComIfG_getTimerNowTimeMs() {
     return g_dComIfG_gameInfo.play.getTimerNowTimeMs();
 }
 
-inline int dComIfG_setTimerNowTimeMs(int time) {
+inline void dComIfG_setTimerNowTimeMs(int time) {
     g_dComIfG_gameInfo.play.setTimerNowTimeMs(time);
 }
 

include/d/kankyo/d_kankyo.h

@@ -542,7 +542,7 @@ inline dScnKy_env_light_c* i_dKy_getEnvlight() {
     return &g_env_light;
 }
 
-BOOL dKy_darkworld_stage_check(char const*, int);
+u8 dKy_darkworld_stage_check(char const*, int);
 BOOL dKy_withwarp_capture_check();
 bool dKy_darkworld_check();
 void dKy_undwater_filter_draw();