15% pog

4 files changed, 77 insertions, 7 deletions

diff --git a/include/code_8041D5C.h b/include/code_8041D5C.h
index 39df243..6c75c23 100644
--- a/include/code_8041D5C.h
+++ b/include/code_8041D5C.h
@@ -10,7 +10,7 @@ struct subStruct_8048524
     /* 0xE */ s16 HP; // HP??
     s16 unk10;
     u8 fill12[0x46 - 0x12];
-    u8 unk46;
+    s8 unk46;
     u8 fill47[0xA4 - 0x47];
     u8 unkA4;
     u8 fillA5[0xAC - 0xA5];
@@ -38,7 +38,9 @@ struct unkDungeon_8041D5C
     u32 unk8;
     s32 unkC;
     s32 unk10;
-    u8 fill14[0x70 - 0x14];
+    u8 fill14[0x20 - 0x14];
+    u8 unk20;
+    u8 unk21[0x70 - 0x21];
     struct subStruct_8048524 *unk70;
 };
 
diff --git a/include/constants/bg_music.h b/include/constants/bg_music.h
index a51e244..53b18fb 100644
--- a/include/constants/bg_music.h
+++ b/include/constants/bg_music.h
@@ -2,19 +2,86 @@
 #define GUARD_BG_MUSIC_H 
 
 #define MUS_TEAM_BASE 1
+#define MUS_FRIEND_AREA_SWAMP 2
+#define MUS_FRIEND_AREA_CAVES 3
+#define MUS_DREAM 4
+#define MUS_BENEVOLENT_SPIRT 5
+#define MUS_LEGEND_OF_NINETALES 6
 #define MUS_POKEMON_SQUARE 7
 #define MUS_LOADING_SCREEN 8
+#define MUS_RISING_FEAR 9
 #define MUS_THERES_TROUBLE 10
+#define MUS_DECISIVE_BATTLE 11
+#define MUS_WELCOME_TO_WORLD_POKEMON 12
+#define MUS_BURIED_RELIC 13
+#define MUS_THUNDERWAVE_CAVE 14
+#define MUS_SINISTER_WOODS 15
+#define MUS_FRIEND_AREA_POND 16
 #define MUS_KECLEON_SHOP 17
 #define MUS_STOP_THIEF 18
-#define MUS_WORLD_CALAMITY 19
+#define MUS_WORLD_CALAMITY 19 // GIANT_STAR_APPROACHING
+#define MUS_GRAND_CANYON 20
+#define MUS_STORMY_SEA 21
+#define MUS_SKY_TOWER 22
+#define MUS_SKY_TOWER_SUMMIT 23
+#define MUS_RUN_AWAY 24
+#define MUS_MT_BLAZE 25
+#define MUS_SKY_TOWER_END 26
+#define MUS_FRIEND_AREA_STRATOS_LOOKOUT 27
+#define MUS_FRIEND_AREA_RAINBOW_PEAK 28
+#define MUS_GENGAR_DREAM 29
+#define MUS_FRIEND_AREA_DEEPSEA_CURRENT 30
+#define MUS_FRIEND_AREA_SEAFLOOR_CAVE 31
+#define MUS_LAST_BATTLE 32
+#define MUS_MT_BLAZE_PEAK 33
+#define MUS_FRIEND_AREA_VOLCANIC_PIT 34
+#define MUS_FRIEND_AREA_CRYPTIC_CAVE 35
+#define MUS_THROUGH_THE_LAND_OF_ICE_AND_SNOW 36
+#define MUS_GENGAR_DARK_WORLD 37
+#define MUS_MT_BLAZE_END 38
+#define MUS_FROSTY_GROTTO 39
 #define MUS_INTRO 40
+#define MUS_AFTER_THE_BATTLE 41
+#define MUS_NEVER_FORGET 42
 #define MUS_TITLE_SCREEN 43
 #define MUS_CREDITS 44
 #define MUS_EPILOGUE 45
+#define MUS_OPENING_TITLE 46
 #define MUS_DUNGEON_FAIL 51
 #define MUS_DUNGEON_COMPLETE 52
 
+// 53 - 99 are blank/empty slots for BG Music
+
+#define MUS_FRIEND_AREA_UNUSED_1 100
+#define MUS_MEETING_WITH_PARTNER 101
+#define MUS_LAPIS_CAVE 102
+#define MUS_A_SUCCESSFUL_RESCUE 103
+#define MUS_FROSTY_FOREST 104
+#define MUS_FRIEND_AREA_STEPPE 105
+#define MUS_FRIEND_AREA_OCEANIC 106
+#define MUS_FRIEND_AREA_FIELD 107
+#define MUS_MAGMA_CAVERN 108
+#define MUS_FRIEND_AREA_UNUSED_2 109
+#define MUS_MAKUHITA_DOJO 110
+#define MUS_MT_THUNDER 111
+#define MUS_FRIEND_AREA_LAB 112
+#define MUS_SILENT_CHASM 113
+#define MUS_IN_THE_DEPTHS_OF_PIT 114
+#define MUS_MT_FREEZE 115
+#define MUS_FRIEND_AREA_WILDS 116
+#define MUS_FRIEND_AREA_LEGENDARY_ISLAND 117
+#define MUS_FRIEND_AREA_SOUTHERN_ISLAND 118
+#define MUS_FRIEND_AREA_ENCLOSED_ISLAND 119
+#define MUS_MT_STEEL 120
+#define MUS_FRIEND_AREA_FOREST 121
+#define MUS_FRIEND_AREA_FINAL_ISLAND 122
+#define MUS_MT_FREEZE_PEAK 123
+#define MUS_MAGMA_CAVERN_PIT 124
+#define MUS_TINY_WOODS 125
+#define MUS_MT_THUNDER_PEAK 126
+#define MUS_FRIEND_AREA_HEALING_FOREST 127
+#define MUS_MONSTER_HOUSE 128
+
 #define NUM_BG_SONGS 128
 
 #endif //GUARD_BG_MUSIC_H
diff --git a/include/kangaskhan_storage.h b/include/kangaskhan_storage.h
index 3f1292a..6b42151 100644
--- a/include/kangaskhan_storage.h
+++ b/include/kangaskhan_storage.h
@@ -3,6 +3,7 @@
 
 #include "text.h"
 #include "menu.h"
+#include "gUnknown_203B460.h"
 
 struct unkStruct_203B208
 {
@@ -10,11 +11,10 @@ struct unkStruct_203B208
     u32 unk0;
     u32 currState;
     u32 unk8;
-    u16 unkC;
-    u8 itemIndex;
-    u8 unkF;
+    struct ItemStruct_203B460 unkC;
     u32 unk10;
-    u32 unk14;
+    u8 unk14; // another itemIndex?
+    u8 fill15[0x3];
     u32 unk18;
     u32 unk1C;
     u32 unk20;
diff --git a/include/pokemon.h b/include/pokemon.h
index 223c74f..a7b2acb 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -156,5 +156,6 @@ u8 GetPokemonOverworldPalette(s16 index, u32 r1);
 bool8 IsPokemonDialogueSpriteAvail(s16 index, s32 r1);
 struct OpenedFile *OpenPokemonDialogueSpriteFile(s16 index);
 struct OpenedFile *GetDialogueSpriteDataPtr(s16 index);
+s32 GetUnownIndex(s16 index);
 
 #endif // POKEMON_H