decompile sub_80A6354 - sub_80A6D1C

4 files changed, 14 insertions, 16 deletions

diff --git a/include/battle_setup.h b/include/battle_setup.h
index e88aefe6d..c8c463f6d 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -87,7 +87,7 @@ bool32 battle_exit_is_player_defeat(u32 a1);
 //void sub_80822BC(void);
 //void TrainerBattleLoadArgs(const struct TrainerBattleSpec *specs, u8 *data);
 //void battle_80801F0(void);
-u8 *TrainerBattleConfigure(u8 *data);
+u8 *TrainerBattleConfigure(const u8 *data);
 void TrainerWantsBattle(u8, u8 *);
 bool32 GetTrainerFlagFromScriptPointer(u8 *data);
 //void sub_8082524(void);
diff --git a/include/item_menu.h b/include/item_menu.h
index bbe4ac94a..1a0050334 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -6,10 +6,8 @@
 void sub_80A3684(void);
 void ClearBag(void);
 void sub_80A3E0C(void);
-//void sub_80A3FA0(u16 *, u32, u32, u32, u32, u32);
 void sub_80A3FA0(u16 *a, u8 b, u8 c, u8 d, u8 e, u16 f);
 void sub_80A4164(u8 *, u16, enum StringConvertMode, u8);
-//void sub_80A418C(u16, enum StringConvertMode, int, int, int);
 void sub_80A418C(u16 a, enum StringConvertMode b, u8 c, u8 d, u8 e);
 void sub_80A53F8(void);
 void HandleItemMenuPaletteFade(u8);
@@ -21,7 +19,7 @@ void sub_80A5D04(void);
 void sub_80A6300(void);
 void sub_80A68CC();
 void sub_80A6A30(void);
-int sub_80A6D1C(void);
+bool32 sub_80A6D1C(void);
 void sub_80A6DCC(void);
 void sub_80A7094(u8);
 u8 sub_80A7D8C(u8 berry, int i, int i1);
diff --git a/include/script.h b/include/script.h
index 5577fcb01..e35ec7608 100644
--- a/include/script.h
+++ b/include/script.h
@@ -12,8 +12,8 @@ struct ScriptContext
     u8 mode;
     u8 comparisonResult;
     u8 (*nativePtr)(void);
-    u8 *scriptPtr;
-    u8 *stack[20];
+    const u8 *scriptPtr;
+    const u8 *stack[20];
     ScrCmdFunc *cmdTable;
     ScrCmdFunc *cmdTableEnd;
     u32 data[4];
@@ -22,12 +22,12 @@ struct ScriptContext
 #define ScriptReadByte(ctx) (*(ctx->scriptPtr++))
 
 void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd);
-u8 SetupBytecodeScript(struct ScriptContext *ctx, void *ptr);
+u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr);
 void SetupNativeScript(struct ScriptContext *ctx, void *ptr);
 void StopScript(struct ScriptContext *ctx);
 u8 RunScript(struct ScriptContext *ctx);
-u8 ScriptPush(struct ScriptContext *ctx, u8 *ptr);
-u8 *ScriptPop(struct ScriptContext *ctx);
+u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr);
+const u8 *ScriptPop(struct ScriptContext *ctx);
 void ScriptJump(struct ScriptContext *ctx, u8 *ptr);
 void ScriptCall(struct ScriptContext *ctx, u8 *ptr);
 void ScriptReturn(struct ScriptContext *ctx);
@@ -38,10 +38,10 @@ void ScriptContext2_Disable(void);
 bool8 ScriptContext2_IsEnabled(void);
 void ScriptContext1_Init(void);
 bool8 ScriptContext2_RunScript(void);
-void ScriptContext1_SetupScript(u8 *ptr);
+void ScriptContext1_SetupScript(const u8 *ptr);
 void ScriptContext1_Stop(void);
 void EnableBothScriptContexts(void);
-void ScriptContext2_RunNewScript(u8 *ptr);
+void ScriptContext2_RunNewScript(const u8 *ptr);
 u8 *mapheader_get_tagged_pointer(u8 tag);
 void mapheader_run_script_by_tag(u8 tag);
 u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag);
diff --git a/include/songs.h b/include/songs.h
index a813cc785..8cf7ee5e9 100644
--- a/include/songs.h
+++ b/include/songs.h
@@ -94,11 +94,11 @@ enum
     SE_T_KAMI2,
     SE_ELEBETA,
     /*0x5A*/ SE_HINSI,
-    SE_EXPMAX,
-    SE_TAMAKORO,
-    SE_TAMAKORO_E,
-    SE_BASABASA,
-    SE_REGI,
+    /*0x5B*/ SE_EXPMAX,
+    /*0x5C*/ SE_TAMAKORO,
+    /*0x5D*/ SE_TAMAKORO_E,
+    /*0x5E*/ SE_BASABASA,
+    /*0x5F*/ SE_REGI,
     SE_C_GAJI,
     SE_C_MAKU_U,
     SE_C_MAKU_D,