Merge branch 'master' into link

sym_bss.txt

@@ -8,26 +8,26 @@
     .include "src/link.o"
     .include "src/link_rfu.o"
     .include "src/rom_8011DC0.o"
-    .include "src/rtc.o"
-    .include "src/main_menu.o"
-    .include "src/battle_1.o"
-    .include "src/egg_hatch.o"
-    .include "src/berry_blender.o"
-    .include "src/play_time.o"
-    .include "src/overworld.o"
-    .include "src/field_camera.o"
-    .include "src/script.o"
-    .include "src/scrcmd.o"
-    .include "src/tileset_anims.o"
-    .include "src/palette.o"
-    .include "src/sound.o"
-    .include "src/field_screen.o"
-    .include "src/field_effect.o"
-    .include "src/pokemon_storage_system.o"
-    .include "src/fldeff_cut.o"
-    .include "src/script_menu.o"
-    .include "src/record_mixing.o"
-    .include "src/tv.o"
+	.include "src/rtc.o"
+	.include "src/main_menu.o"
+	.include "src/rom_8034C54.o"
+	.include "src/egg_hatch.o"
+	.include "src/berry_blender.o"
+	.include "src/play_time.o"
+	.include "src/overworld.o"
+	.include "src/field_camera.o"
+	.include "src/script.o"
+	.include "src/scrcmd.o"
+	.include "src/tileset_anims.o"
+	.include "src/palette.o"
+	.include "src/sound.o"
+	.include "src/field_screen.o"
+	.include "src/field_effect.o"
+	.include "src/pokemon_storage_system.o"
+	.include "src/fldeff_cut.o"
+	.include "src/script_menu.o"
+	.include "src/record_mixing.o"
+	.include "src/tv.o"
 
 	.space 1 @ TODO: define this u32 in mauville_old_man
 gUnknown_03001178: @ 3001178
@@ -57,7 +57,7 @@ gUnknown_030011F7: @ 30011F7
 	.space 0x1
 
 	.include "src/starter_choose.o"
-	
+
 	.align 0x2
 
 gUnknown_030011FC: @ 30011FC
@@ -75,17 +75,7 @@ gUnknown_03001202: @ 3001202
 gUnknown_03001204: @ 3001204
 	.space 0x4
 
-gUnknown_03001208: @ 3001208
-	.space 0x2
-
-sTestingTransitionId: @ 300120A
-	.space 0x1
-
-sTestingTransitionState: @ 300120B
-	.space 0x5
-
-gUnknown_03001210: @ 3001210
-	.space 0x30
+	.include "src/battle_transition.o"
 
 gUnknown_03001240: @ 3001240
 	.space 0x30
@@ -194,9 +184,22 @@ gUnknown_030012FC: @ 30012FC
 	.space 0x4
 
 gUnknown_03001300: @ 3001300
-	.space 0x770
+	.space 0x40
+
+gMPlayTrack_BGM: @ 3001340
+	.space 0x320
+
+gMPlayTrack_SE1: @ 3001660
+	.space 0xF0
+
+gMPlayTrack_SE2: @ 3001750
+	.space 0x2D0
+
+gMPlayTrack_SE3: @ 3001A20
+	.space 0x50
 
 	.include "src/agb_flash.o"
 	.include "src/siirtc.o"
 	.include "tools/agbcc/lib/libgcc.a:dp-bit.o"
 	.include "tools/agbcc/lib/libgcc.a:fp-bit.o"
+	.include "tools/agbcc/lib/libc.a:syscalls.o"