Merge branch 'master' into pokenav-decomp-again

asm/m4a_1.s

@@ -1907,3 +1907,28 @@ _081DDD90:
 	thumb_func_end ply_mod
 
 	.align 2, 0 @ Don't pad with nop.
+
+    .bss
+gUnknown_03001300:
+    .space 0x40
+    .size gUnknown_03001300, .-gUnknown_03001300
+
+    .global gMPlayTrack_BGM
+gMPlayTrack_BGM:
+    .space 0x320
+    .size gMPlayTrack_BGM, .-gMPlayTrack_BGM
+
+    .global gMPlayTrack_SE1
+gMPlayTrack_SE1:
+    .space 0xF0
+    .size gMPlayTrack_SE1, .-gMPlayTrack_SE1
+
+    .global gMPlayTrack_SE2
+gMPlayTrack_SE2:
+    .space 0x2D0
+    .size gMPlayTrack_SE2, .-gMPlayTrack_SE2
+
+    .global gMPlayTrack_SE3
+gMPlayTrack_SE3:
+    .space 0x50
+    .size gMPlayTrack_SE3, .-gMPlayTrack_SE3

asm/macros/battle_anim_script.inc

@@ -153,19 +153,19 @@
 	.byte \param4
 	.endm
 
-	.macro loopsewithpan se:req, param1:req, param2:req, param3:req
+	.macro loopsewithpan se:req, pan:req, wait:req, times:req
 	.byte 0x1c
 	.2byte \se
-	.byte \param1
-	.byte \param2
-	.byte \param3
+	.byte \pan
+	.byte \wait
+	.byte \times
 	.endm
 
-	.macro waitplaysewithpan se:req, param1:req, param2:req
+	.macro waitplaysewithpan se:req, pan:req, wait:req
 	.byte 0x1d
 	.2byte \se
-	.byte \param1
-	.byte \param2
+	.byte \pan
+	.byte \wait
 	.endm
 
 	.macro setbldcnt param0:req

asm/macros/battle_script.inc

@@ -403,6 +403,38 @@
 	.byte \param0
 	.byte \param1
 	.endm
+	
+	@ Help macros for 5 uses of moveend command
+	
+	@ All cases
+	.macro moveendall
+	setbyte sMOVEEND_STATE, 0
+	moveend 0, 0
+	.endm
+	
+	@ Chosen case
+	.macro moveendcase case:req
+	setbyte sMOVEEND_STATE, \case
+	moveend 1, 0
+	.endm
+	
+	@ All cases from (inclusive)
+	.macro moveendfrom from:req
+	setbyte sMOVEEND_STATE, \from
+	moveend 0, 0
+	.endm
+	
+	@ All cases from 0 to (not inclusive)
+	.macro moveendto to:req
+	setbyte sMOVEEND_STATE, 0
+	moveend 2, \to
+	.endm
+	
+	@ Cases from (inclusive) to (not inclusive)
+	.macro moveendfromto from:req, to:req
+	setbyte sMOVEEND_STATE, \from
+	moveend 2, \to
+	.endm
 
 	.macro typecalc2
 	.byte 0x4a
@@ -1092,7 +1124,7 @@
 	.byte 0xdd
 	.endm
 
-	.macro asistattackselect param0:req
+	.macro assistattackselect param0:req
 	.byte 0xde
 	.4byte \param0
 	.endm

asm/macros/event.inc

@@ -77,7 +77,7 @@
 	.endm
 
 	@ Executes a script stored in a default RAM location.
-	.macro gotoram
+	.macro returnram
 	.byte 0x0c
 	.endm
 
@@ -1440,7 +1440,7 @@
 	.endm
 
 	@ Depending on factors I haven't managed to understand yet, this command may cause script execution to jump to the offset specified by the pointer at 0x020375C0.
-	.macro execram
+	.macro gotoram
 	.byte 0xcf
 	.endm
 

asm/pokenav.s

@@ -5961,7 +5961,7 @@ sub_81CC09C: @ 81CC09C
 	ldrb r0, [r4, 0x14]
 	movs r1, 0x1
 	movs r2, 0x4
-	bl sub_8098858
+	bl DrawTextBorderOuter
 	ldrb r0, [r4, 0x14]
 	movs r1, 0x11
 	bl FillWindowPixelBuffer
@@ -7211,7 +7211,7 @@ sub_81CCA1C: @ 81CCA1C
 	ldrb r0, [r5, 0x8]
 	movs r1, 0x42
 	movs r2, 0x4
-	bl sub_8098858
+	bl DrawTextBorderOuter
 	ldr r1, =gUnknown_08622888
 	str r4, [sp]
 	movs r0, 0x1
@@ -8696,7 +8696,7 @@ sub_81CD624: @ 81CD624
 	adds r1, r6, 0
 	movs r2, 0x2D
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	cmp r0, 0
 	beq _081CD690
 	ldr r1, =gText_EggNickname
@@ -8711,14 +8711,14 @@ _081CD690:
 	adds r1, r6, 0
 	movs r2, 0x2
 	adds r3, r5, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	adds r0, r5, 0
 	bl StringGetEnd10
 	adds r0, r4, 0
 	adds r1, r6, 0
 	movs r2, 0xB
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	lsls r0, 16
 	lsrs r7, r0, 16
 	cmp r4, 0xE
@@ -9185,7 +9185,7 @@ _081CDA5A:
 	adds r1, r7, 0
 	movs r2, 0x16
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	mov r1, r9
 	lsls r5, r1, 2
 	adds r4, r5, r1
@@ -9197,7 +9197,7 @@ _081CDA5A:
 	adds r1, r7, 0
 	movs r2, 0x2F
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	ldr r1, =0x00006429
 	add r1, r8
 	adds r1, r4
@@ -9206,7 +9206,7 @@ _081CDA5A:
 	adds r1, r7, 0
 	movs r2, 0x21
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	ldr r1, =0x0000642a
 	add r1, r8
 	adds r1, r4
@@ -9215,7 +9215,7 @@ _081CDA5A:
 	adds r1, r7, 0
 	movs r2, 0x18
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	ldr r1, =0x0000642b
 	add r1, r8
 	adds r1, r4
@@ -9224,7 +9224,7 @@ _081CDA5A:
 	adds r1, r7, 0
 	movs r2, 0x17
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	ldr r1, =0x0000642c
 	add r1, r8
 	adds r1, r4
@@ -9238,14 +9238,14 @@ _081CDA5A:
 	adds r1, r7, 0
 	movs r2, 0x30
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	cmp r0, 0xFF
 	beq _081CDB10
 	adds r0, r6, 0
 	adds r1, r7, 0
 	movs r2, 0x30
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	movs r1, 0x1D
 	bl __udivsi3
 	b _081CDB12
@@ -9258,7 +9258,7 @@ _081CDB12:
 	adds r1, r7, 0
 	movs r2, 0x8
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	ldr r1, =0x00006783
 	add r1, r8
 	add r1, r9
@@ -9355,7 +9355,7 @@ _081CDBD0:
 	adds r1, r6, 0
 	movs r2, 0x41
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	adds r4, r0, 0
 	lsls r4, 16
 	lsrs r4, 16
@@ -9363,13 +9363,13 @@ _081CDBD0:
 	adds r1, r6, 0
 	movs r2, 0x1
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	mov r8, r0
 	adds r0, r5, 0
 	adds r1, r6, 0
 	movs r2, 0
 	movs r3, 0
-	bl sub_81D2C68
+	bl GetBoxOrPartyMonData
 	adds r5, r0, 0
 	lsls r0, r4, 3
 	ldr r1, =gMonFrontPicTable