Merge branch 'master' of https://github.com/pret/pokeruby

include/battle.h

@@ -35,7 +35,7 @@ extern u8 unk_2000000[];
 // to do: maybe try to reduce the defines needed to match?
 #define BATTLE_STRUCT ((struct BattleStruct *)(unk_2000000))
 #define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(unk_2000000 + 0x16800))
-#define UNK_2016A00_STRUCT ((struct UnknownStruct1 *)(unk_2000000 + 0x16A00))
+#define UNK_2016A00_STRUCT ((struct UnkBattleStruct1 *)(unk_2000000 + 0x16A00))
 #define AI_STACK ((struct AI_Stack *)(unk_2000000 + 0x16C00))
 #define AI_ARRAY_160CC     ((struct SmallItemStruct *)(unk_2000000 + 0x160CC))
 
@@ -61,7 +61,7 @@ struct Trainer
     /*0x24*/ void *party;
 };
 
-struct UnknownStruct1 // AI_Opponent_Info?
+struct UnkBattleStruct1 // AI_Opponent_Info?
 {
     /*0x00*/ u16 movesUsed[2][8]; // 0xFFFF means move not used (confuse self hit, etc)
     /*0x20*/ u8 unk20[2];
@@ -119,10 +119,10 @@ struct BattleStruct /* 0x2000000 */
     u8 filler2[0x72E];
     /* 0x16800 */ struct AI_ThinkingStruct ai; /* 0x2016800 */
     u8 filler1681C[0x1E4];
-    /* 0x16A00 */ struct UnknownStruct1 unk_2016A00_2;
+    /* 0x16A00 */ struct UnkBattleStruct1 unk_2016A00_2;
 };
 
-struct UnknownStruct4
+struct UnkBattleStruct4
 {
     /*0x00*/ u8 filler0[0x3];
     /*0x04*/ u16 unk4;
@@ -143,7 +143,7 @@ struct UnknownStruct4
 };
 
 extern struct UnknownStruct1 unk_2016A00;
-extern struct UnknownStruct4 gUnknown_02024CA8[];
+extern struct UnkBattleStruct4 gUnknown_02024CA8[];
 extern struct AI_ThinkingStruct gAIThinkingSpace;
 
 #endif // GUARD_BATTLE_H

include/songs.h

@@ -3,23 +3,23 @@
 
 enum
 {
-    SE_STOP,
-    SE_KAIFUKU,
-    SE_PC_LOGON,
-    SE_PC_OFF,
-    SE_PC_ON,
-    SE_SELECT,
-    SE_WIN_OPEN,
-    SE_WALL_HIT,
-    SE_DOOR,
-    SE_KAIDAN,
-    SE_DANSA,
-    SE_JITENSYA,
-    SE_KOUKA_L,
-    SE_KOUKA_M,
-    SE_KOUKA_H,
-    SE_BOWA2,
-    SE_POKE_DEAD,
+    /*0x00*/ SE_STOP,
+    /*0x01*/ SE_KAIFUKU,
+    /*0x02*/ SE_PC_LOGON,
+    /*0x03*/ SE_PC_OFF,
+    /*0x04*/ SE_PC_ON,
+    /*0x05*/ SE_SELECT,
+    /*0x06*/ SE_WIN_OPEN,
+    /*0x07*/ SE_WALL_HIT,
+    /*0x08*/ SE_DOOR,
+    /*0x09*/ SE_KAIDAN,
+    /*0x0A*/ SE_DANSA,
+    /*0x0B*/ SE_JITENSYA,
+    /*0x0C*/ SE_KOUKA_L,
+    /*0x0D*/ SE_KOUKA_M,
+    /*0x0E*/ SE_KOUKA_H,
+    /*0x0F*/ SE_BOWA2,
+    /*0x10*/ SE_POKE_DEAD,
     SE_NIGERU,
     SE_JIDO_DOA,
     SE_NAMINORI,

ld_script.txt

@@ -242,7 +242,6 @@ SECTIONS {
         src/fldeff_strength.o(.text);
         asm/battle_transition.o(.text);
         src/battle_811DA74.o(.text);
-        asm/battle_811DA74.o(.text);
         asm/battle_message.o(.text);
         asm/choose_party.o(.text);
         asm/cable_car.o(.text);

src/battle_2.c

@@ -1821,7 +1821,7 @@ void sub_8010874(void)
 
 void sub_8010B88(void)
 {
-    struct UnknownStruct4 sp0 = gUnknown_02024CA8[gUnknown_02024A60];
+    struct UnkBattleStruct4 sp0 = gUnknown_02024CA8[gUnknown_02024A60];
     s32 i;
     u8 *ptr;
     u32 *ptr2;

src/battle_ai.c

@@ -269,7 +269,7 @@ void BattleAI_HandleItemUseBeforeAISetup(void)
     s32 i;
     u8 *data = (u8 *)UNK_2016A00_STRUCT;
 
-    for (i = 0; (u32)i < sizeof(struct UnknownStruct1); i++)
+    for (i = 0; (u32)i < sizeof(struct UnkBattleStruct1); i++)
         data[i] = 0;
 
     if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)