Merge branch 'master' of github.com:twitchplayspokemon/pokeruby

4 files changed, 18 insertions, 18 deletions

diff --git a/asm/m4a_1.s b/asm/m4a_1.s
index 3f079d0ec..2b548cacc 100644
--- a/asm/m4a_1.s
+++ b/asm/m4a_1.s
@@ -1549,24 +1549,24 @@ ply_note:
 	ldr r1, =gClockTable
 	adds r0, r1
 	ldrb r0, [r0]
-	strb r0, [r5, 0x4]
+	strb r0, [r5, o_MusicPlayerTrack_gateTime]
 	ldr r3, [r5, o_MusicPlayerTrack_cmdPtr]
 	ldrb r0, [r3]
 	cmp r0, 0x80
-	bcs _081DDB46
+	bhs _081DDB46
 	strb r0, [r5, o_MusicPlayerTrack_key]
 	adds r3, 0x1
 	ldrb r0, [r3]
 	cmp r0, 0x80
-	bcs _081DDB44
-	strb r0, [r5, 0x6]
+	bhs _081DDB44
+	strb r0, [r5, o_MusicPlayerTrack_velocity]
 	adds r3, 0x1
 	ldrb r0, [r3]
 	cmp r0, 0x80
-	bcs _081DDB44
-	ldrb r1, [r5, 0x4]
+	bhs _081DDB44
+	ldrb r1, [r5, o_MusicPlayerTrack_gateTime]
 	adds r1, r0
-	strb r1, [r5, 0x4]
+	strb r1, [r5, o_MusicPlayerTrack_gateTime]
 	adds r3, 0x1
 _081DDB44:
 	str r3, [r5, o_MusicPlayerTrack_cmdPtr]
@@ -1574,16 +1574,16 @@ _081DDB46:
 	movs r0, 0
 	str r0, [sp, 0x14]
 	adds r4, r5, 0
-	adds r4, 0x24
+	adds r4, o_MusicPlayerTrack_ToneData_type
 	ldrb r2, [r4]
-	movs r0, 0xC0
+	movs r0, TONEDATA_TYPE_RHY | TONEDATA_TYPE_SPL
 	tst r0, r2
 	beq _081DDB98
-	ldrb r3, [r5, 0x5]
-	movs r0, 0x40
+	ldrb r3, [r5, o_MusicPlayerTrack_key]
+	movs r0, TONEDATA_TYPE_SPL
 	tst r0, r2
 	beq _081DDB66
-	ldr r1, [r5, 0x2C]
+	ldr r1, [r5, o_MusicPlayerTrack_ToneData_keySplitTable]
 	adds r1, r3
 	ldrb r0, [r1]
 	b _081DDB68
@@ -1593,7 +1593,7 @@ _081DDB68:
 	lsls r1, r0, 1
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, [r5, 0x28]
+	ldr r0, [r5, o_MusicPlayerTrack_ToneData_wav]
 	adds r1, r0
 	mov r9, r1
 	mov r6, r9
diff --git a/asm/rom3.s b/asm/rom3.s
index 0b329b8f7..0c51eac84 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -9229,7 +9229,7 @@ _0800DE88:
 _0800DED0: .4byte 0x020239f8
 _0800DED4: .4byte 0x03002970
 _0800DED8: .4byte gUnknown_081F9680
-_0800DEDC: .4byte gUnknown_081F9688
+_0800DEDC: .4byte gUnknown_081F9680 + 0x8
 _0800DEE0:
 	ldr r0, _0800DF84
 	ldr r5, _0800DF88
diff --git a/asm/rom5.s b/asm/rom5.s
index 2362dc989..020156d0b 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -272462,7 +272462,7 @@ _080FF81C: .4byte gUnknown_083EC954
 _080FF820: .4byte 0x020391a8
 _080FF824: .4byte 0x02020004
 _080FF828: .4byte 0x03004880
-_080FF82C: .4byte gUnknown_083EC93C
+_080FF82C: .4byte gSpriteTemplate_83EC93C
 _080FF830: .4byte gUnknown_083EC900
 _080FF834:
 	ldr r2, _080FF888
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index 4db808c2b..d9a718337 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -5854,7 +5854,7 @@ _08043C20: .4byte 0xfffffc00
 _08043C24: .4byte sub_8043D5C
 _08043C28: .4byte 0x02024a72
 _08043C2C: .4byte gSpriteTemplate_820A56C
-_08043C30: .4byte gUnknown_0820A684
+_08043C30: .4byte gSubspriteTables_820A684
 _08043C34: .4byte 0x06010000
 _08043C38: .4byte REG_BG0HOFS
 	thumb_func_end battle_make_oam_normal_battle
@@ -7518,7 +7518,7 @@ _08044940: .4byte gUnknown_0820A764
 _08044944: .4byte gUnknown_0820A774
 _08044948: .4byte gSpriteTemplate_820A7A4
 _0804494C: .4byte 0x02020004
-_08044950: .4byte gUnknown_0820A6E4
+_08044950: .4byte gSubspriteTables_820A6E4
 _08044954:
 	ldrh r0, [r4, 0x20]
 	adds r0, 0x60
@@ -8160,7 +8160,7 @@ _08044DFA:
 _08044E3C: .4byte sub_8045110
 _08044E40: .4byte 0x02020004
 _08044E44: .4byte sub_8045048
-_08044E48: .4byte gUnknown_0820A6EC
+_08044E48: .4byte gSubspriteTables_820A6EC
 _08044E4C: .4byte 0x03004b20
 _08044E50: .4byte sub_8044E74
 _08044E54: