resolve review comments

asm/battle_controller_pokedude.s

@@ -2862,7 +2862,7 @@ sub_81577B4: @ 81577B4
 	ldr r0, _081577E4 @ =gActiveBattler
 	ldrb r0, [r0]
 	lsls r2, r0, 9
-	ldr r1, _081577E8 @ =(gBattleBufferA + 3)
+	ldr r1, _081577E8 @ =gBattleBufferA + 3
 	adds r5, r2, r1
 	mov r8, r5
 	bl GetBattlerSide
@@ -2876,7 +2876,7 @@ sub_81577B4: @ 81577B4
 	b _081577F8
 	.align 2, 0
 _081577E4: .4byte gActiveBattler
-_081577E8: .4byte (gBattleBufferA + 3)
+_081577E8: .4byte gBattleBufferA + 3
 _081577EC: .4byte gPlayerParty
 _081577F0:
 	movs r0, 0x64
@@ -3148,7 +3148,7 @@ _08157AA4:
 	ldr r0, _08157AB8 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157ABC @ =(gBattleBufferA + 3)
+	ldr r0, _08157ABC @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0xB
@@ -3156,12 +3156,12 @@ _08157AA4:
 	b _0815809A
 	.align 2, 0
 _08157AB8: .4byte gActiveBattler
-_08157ABC: .4byte (gBattleBufferA + 3)
+_08157ABC: .4byte gBattleBufferA + 3
 _08157AC0:
 	ldr r0, _08157AD4 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157AD8 @ =(gBattleBufferA + 3)
+	ldr r0, _08157AD8 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0xC
@@ -3169,7 +3169,7 @@ _08157AC0:
 	b _0815809A
 	.align 2, 0
 _08157AD4: .4byte gActiveBattler
-_08157AD8: .4byte (gBattleBufferA + 3)
+_08157AD8: .4byte gBattleBufferA + 3
 _08157ADC:
 	movs r4, 0
 	movs r0, 0xC
@@ -3213,7 +3213,7 @@ _08157B2C:
 	ldr r5, _08157B80 @ =gActiveBattler
 	ldrb r2, [r5]
 	lsls r2, 9
-	ldr r4, _08157B84 @ =(gBattleBufferA + 3)
+	ldr r4, _08157B84 @ =gBattleBufferA + 3
 	adds r2, r4
 	adds r0, r6, 0
 	movs r1, 0x11
@@ -3249,7 +3249,7 @@ _08157B2C:
 	b _0815809A
 	.align 2, 0
 _08157B80: .4byte gActiveBattler
-_08157B84: .4byte (gBattleBufferA + 3)
+_08157B84: .4byte gBattleBufferA + 3
 _08157B88:
 	ldr r0, _08157BA4 @ =gActiveBattler
 	ldrb r2, [r0]
@@ -3270,7 +3270,7 @@ _08157BA8:
 	ldr r0, _08157BBC @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157BC0 @ =(gBattleBufferA + 3)
+	ldr r0, _08157BC0 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x1
@@ -3278,12 +3278,12 @@ _08157BA8:
 	b _0815809A
 	.align 2, 0
 _08157BBC: .4byte gActiveBattler
-_08157BC0: .4byte (gBattleBufferA + 3)
+_08157BC0: .4byte gBattleBufferA + 3
 _08157BC4:
 	ldr r0, _08157BD8 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157BDC @ =(gBattleBufferA + 3)
+	ldr r0, _08157BDC @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x19
@@ -3291,12 +3291,12 @@ _08157BC4:
 	b _0815809A
 	.align 2, 0
 _08157BD8: .4byte gActiveBattler
-_08157BDC: .4byte (gBattleBufferA + 3)
+_08157BDC: .4byte gBattleBufferA + 3
 _08157BE0:
 	ldr r0, _08157BF4 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157BF8 @ =(gBattleBufferA + 3)
+	ldr r0, _08157BF8 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x1A
@@ -3304,12 +3304,12 @@ _08157BE0:
 	b _0815809A
 	.align 2, 0
 _08157BF4: .4byte gActiveBattler
-_08157BF8: .4byte (gBattleBufferA + 3)
+_08157BF8: .4byte gBattleBufferA + 3
 _08157BFC:
 	ldr r0, _08157C10 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157C14 @ =(gBattleBufferA + 3)
+	ldr r0, _08157C14 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x1B
@@ -3317,12 +3317,12 @@ _08157BFC:
 	b _0815809A
 	.align 2, 0
 _08157C10: .4byte gActiveBattler
-_08157C14: .4byte (gBattleBufferA + 3)
+_08157C14: .4byte gBattleBufferA + 3
 _08157C18:
 	ldr r0, _08157C2C @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157C30 @ =(gBattleBufferA + 3)
+	ldr r0, _08157C30 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x1C
@@ -3330,12 +3330,12 @@ _08157C18:
 	b _0815809A
 	.align 2, 0
 _08157C2C: .4byte gActiveBattler
-_08157C30: .4byte (gBattleBufferA + 3)
+_08157C30: .4byte gBattleBufferA + 3
 _08157C34:
 	ldr r0, _08157C48 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157C4C @ =(gBattleBufferA + 3)
+	ldr r0, _08157C4C @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x1D
@@ -3343,12 +3343,12 @@ _08157C34:
 	b _0815809A
 	.align 2, 0
 _08157C48: .4byte gActiveBattler
-_08157C4C: .4byte (gBattleBufferA + 3)
+_08157C4C: .4byte gBattleBufferA + 3
 _08157C50:
 	ldr r0, _08157C64 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157C68 @ =(gBattleBufferA + 3)
+	ldr r0, _08157C68 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x1E
@@ -3356,12 +3356,12 @@ _08157C50:
 	b _0815809A
 	.align 2, 0
 _08157C64: .4byte gActiveBattler
-_08157C68: .4byte (gBattleBufferA + 3)
+_08157C68: .4byte gBattleBufferA + 3
 _08157C6C:
 	ldr r0, _08157C80 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157C84 @ =(gBattleBufferA + 3)
+	ldr r0, _08157C84 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x1F
@@ -3369,12 +3369,12 @@ _08157C6C:
 	b _0815809A
 	.align 2, 0
 _08157C80: .4byte gActiveBattler
-_08157C84: .4byte (gBattleBufferA + 3)
+_08157C84: .4byte gBattleBufferA + 3
 _08157C88:
 	ldr r0, _08157C9C @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157CA0 @ =(gBattleBufferA + 3)
+	ldr r0, _08157CA0 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x20
@@ -3382,12 +3382,12 @@ _08157C88:
 	b _0815809A
 	.align 2, 0
 _08157C9C: .4byte gActiveBattler
-_08157CA0: .4byte (gBattleBufferA + 3)
+_08157CA0: .4byte gBattleBufferA + 3
 _08157CA4:
 	ldr r0, _08157CB8 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157CBC @ =(gBattleBufferA + 3)
+	ldr r0, _08157CBC @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x22
@@ -3395,12 +3395,12 @@ _08157CA4:
 	b _0815809A
 	.align 2, 0
 _08157CB8: .4byte gActiveBattler
-_08157CBC: .4byte (gBattleBufferA + 3)
+_08157CBC: .4byte gBattleBufferA + 3
 _08157CC0:
 	ldr r0, _08157CD4 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157CD8 @ =(gBattleBufferA + 3)
+	ldr r0, _08157CD8 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x23
@@ -3408,12 +3408,12 @@ _08157CC0:
 	b _0815809A
 	.align 2, 0
 _08157CD4: .4byte gActiveBattler
-_08157CD8: .4byte (gBattleBufferA + 3)
+_08157CD8: .4byte gBattleBufferA + 3
 _08157CDC:
 	ldr r0, _08157CF0 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157CF4 @ =(gBattleBufferA + 3)
+	ldr r0, _08157CF4 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x24
@@ -3421,12 +3421,12 @@ _08157CDC:
 	b _0815809A
 	.align 2, 0
 _08157CF0: .4byte gActiveBattler
-_08157CF4: .4byte (gBattleBufferA + 3)
+_08157CF4: .4byte gBattleBufferA + 3
 _08157CF8:
 	ldr r0, _08157D0C @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157D10 @ =(gBattleBufferA + 3)
+	ldr r0, _08157D10 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x25
@@ -3434,12 +3434,12 @@ _08157CF8:
 	b _0815809A
 	.align 2, 0
 _08157D0C: .4byte gActiveBattler
-_08157D10: .4byte (gBattleBufferA + 3)
+_08157D10: .4byte gBattleBufferA + 3
 _08157D14:
 	ldr r0, _08157D28 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157D2C @ =(gBattleBufferA + 3)
+	ldr r0, _08157D2C @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x26
@@ -3447,12 +3447,12 @@ _08157D14:
 	b _0815809A
 	.align 2, 0
 _08157D28: .4byte gActiveBattler
-_08157D2C: .4byte (gBattleBufferA + 3)
+_08157D2C: .4byte gBattleBufferA + 3
 _08157D30:
 	ldr r5, _08157D8C @ =gActiveBattler
 	ldrb r2, [r5]
 	lsls r2, 9
-	ldr r4, _08157D90 @ =(gBattleBufferA + 3)
+	ldr r4, _08157D90 @ =gBattleBufferA + 3
 	adds r2, r4
 	adds r0, r6, 0
 	movs r1, 0x27
@@ -3492,12 +3492,12 @@ _08157D30:
 	b _08157E2A
 	.align 2, 0
 _08157D8C: .4byte gActiveBattler
-_08157D90: .4byte (gBattleBufferA + 3)
+_08157D90: .4byte gBattleBufferA + 3
 _08157D94:
 	ldr r0, _08157DA8 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157DAC @ =(gBattleBufferA + 3)
+	ldr r0, _08157DAC @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x27
@@ -3505,12 +3505,12 @@ _08157D94:
 	b _0815809A
 	.align 2, 0
 _08157DA8: .4byte gActiveBattler
-_08157DAC: .4byte (gBattleBufferA + 3)
+_08157DAC: .4byte gBattleBufferA + 3
 _08157DB0:
 	ldr r0, _08157DC4 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157DC8 @ =(gBattleBufferA + 3)
+	ldr r0, _08157DC8 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x28
@@ -3518,12 +3518,12 @@ _08157DB0:
 	b _0815809A
 	.align 2, 0
 _08157DC4: .4byte gActiveBattler
-_08157DC8: .4byte (gBattleBufferA + 3)
+_08157DC8: .4byte gBattleBufferA + 3
 _08157DCC:
 	ldr r0, _08157DE0 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157DE4 @ =(gBattleBufferA + 3)
+	ldr r0, _08157DE4 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x29
@@ -3531,12 +3531,12 @@ _08157DCC:
 	b _0815809A
 	.align 2, 0
 _08157DE0: .4byte gActiveBattler
-_08157DE4: .4byte (gBattleBufferA + 3)
+_08157DE4: .4byte gBattleBufferA + 3
 _08157DE8:
 	ldr r0, _08157DFC @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157E00 @ =(gBattleBufferA + 3)
+	ldr r0, _08157E00 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x2A
@@ -3544,12 +3544,12 @@ _08157DE8:
 	b _0815809A
 	.align 2, 0
 _08157DFC: .4byte gActiveBattler
-_08157E00: .4byte (gBattleBufferA + 3)
+_08157E00: .4byte gBattleBufferA + 3
 _08157E04:
 	ldr r0, _08157E18 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157E1C @ =(gBattleBufferA + 3)
+	ldr r0, _08157E1C @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x2B
@@ -3557,12 +3557,12 @@ _08157E04:
 	b _0815809A
 	.align 2, 0
 _08157E18: .4byte gActiveBattler
-_08157E1C: .4byte (gBattleBufferA + 3)
+_08157E1C: .4byte gBattleBufferA + 3
 _08157E20:
 	ldr r0, _08157E34 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157E38 @ =(gBattleBufferA + 3)
+	ldr r0, _08157E38 @ =gBattleBufferA + 3
 	adds r2, r0
 _08157E2A:
 	adds r0, r6, 0
@@ -3571,12 +3571,12 @@ _08157E2A:
 	b _0815809A
 	.align 2, 0
 _08157E34: .4byte gActiveBattler
-_08157E38: .4byte (gBattleBufferA + 3)
+_08157E38: .4byte gBattleBufferA + 3
 _08157E3C:
 	ldr r0, _08157E50 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157E54 @ =(gBattleBufferA + 3)
+	ldr r0, _08157E54 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0
@@ -3584,12 +3584,12 @@ _08157E3C:
 	b _0815809A
 	.align 2, 0
 _08157E50: .4byte gActiveBattler
-_08157E54: .4byte (gBattleBufferA + 3)
+_08157E54: .4byte gBattleBufferA + 3
 _08157E58:
 	ldr r0, _08157E6C @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157E70 @ =(gBattleBufferA + 3)
+	ldr r0, _08157E70 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x9
@@ -3597,12 +3597,12 @@ _08157E58:
 	b _0815809A
 	.align 2, 0
 _08157E6C: .4byte gActiveBattler
-_08157E70: .4byte (gBattleBufferA + 3)
+_08157E70: .4byte gBattleBufferA + 3
 _08157E74:
 	ldr r0, _08157E88 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157E8C @ =(gBattleBufferA + 3)
+	ldr r0, _08157E8C @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x37
@@ -3610,12 +3610,12 @@ _08157E74:
 	b _0815809A
 	.align 2, 0
 _08157E88: .4byte gActiveBattler
-_08157E8C: .4byte (gBattleBufferA + 3)
+_08157E8C: .4byte gBattleBufferA + 3
 _08157E90:
 	ldr r0, _08157EA4 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157EA8 @ =(gBattleBufferA + 3)
+	ldr r0, _08157EA8 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x38
@@ -3623,12 +3623,12 @@ _08157E90:
 	b _0815809A
 	.align 2, 0
 _08157EA4: .4byte gActiveBattler
-_08157EA8: .4byte (gBattleBufferA + 3)
+_08157EA8: .4byte gBattleBufferA + 3
 _08157EAC:
 	ldr r0, _08157EC0 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157EC4 @ =(gBattleBufferA + 3)
+	ldr r0, _08157EC4 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x39
@@ -3636,12 +3636,12 @@ _08157EAC:
 	b _0815809A
 	.align 2, 0
 _08157EC0: .4byte gActiveBattler
-_08157EC4: .4byte (gBattleBufferA + 3)
+_08157EC4: .4byte gBattleBufferA + 3
 _08157EC8:
 	ldr r0, _08157EDC @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157EE0 @ =(gBattleBufferA + 3)
+	ldr r0, _08157EE0 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x3A
@@ -3649,12 +3649,12 @@ _08157EC8:
 	b _0815809A
 	.align 2, 0
 _08157EDC: .4byte gActiveBattler
-_08157EE0: .4byte (gBattleBufferA + 3)
+_08157EE0: .4byte gBattleBufferA + 3
 _08157EE4:
 	ldr r0, _08157EF8 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157EFC @ =(gBattleBufferA + 3)
+	ldr r0, _08157EFC @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x3B
@@ -3662,12 +3662,12 @@ _08157EE4:
 	b _0815809A
 	.align 2, 0
 _08157EF8: .4byte gActiveBattler
-_08157EFC: .4byte (gBattleBufferA + 3)
+_08157EFC: .4byte gBattleBufferA + 3
 _08157F00:
 	ldr r0, _08157F14 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157F18 @ =(gBattleBufferA + 3)
+	ldr r0, _08157F18 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x3C
@@ -3675,12 +3675,12 @@ _08157F00:
 	b _0815809A
 	.align 2, 0
 _08157F14: .4byte gActiveBattler
-_08157F18: .4byte (gBattleBufferA + 3)
+_08157F18: .4byte gBattleBufferA + 3
 _08157F1C:
 	ldr r0, _08157F30 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157F34 @ =(gBattleBufferA + 3)
+	ldr r0, _08157F34 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x3D
@@ -3688,12 +3688,12 @@ _08157F1C:
 	b _0815809A
 	.align 2, 0
 _08157F30: .4byte gActiveBattler
-_08157F34: .4byte (gBattleBufferA + 3)
+_08157F34: .4byte gBattleBufferA + 3
 _08157F38:
 	ldr r0, _08157F4C @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157F50 @ =(gBattleBufferA + 3)
+	ldr r0, _08157F50 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x3E
@@ -3701,12 +3701,12 @@ _08157F38:
 	b _0815809A
 	.align 2, 0
 _08157F4C: .4byte gActiveBattler
-_08157F50: .4byte (gBattleBufferA + 3)
+_08157F50: .4byte gBattleBufferA + 3
 _08157F54:
 	ldr r0, _08157F68 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157F6C @ =(gBattleBufferA + 3)
+	ldr r0, _08157F6C @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x3F
@@ -3714,12 +3714,12 @@ _08157F54:
 	b _0815809A
 	.align 2, 0
 _08157F68: .4byte gActiveBattler
-_08157F6C: .4byte (gBattleBufferA + 3)
+_08157F6C: .4byte gBattleBufferA + 3
 _08157F70:
 	ldr r0, _08157F84 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157F88 @ =(gBattleBufferA + 3)
+	ldr r0, _08157F88 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x16
@@ -3727,12 +3727,12 @@ _08157F70:
 	b _0815809A
 	.align 2, 0
 _08157F84: .4byte gActiveBattler
-_08157F88: .4byte (gBattleBufferA + 3)
+_08157F88: .4byte gBattleBufferA + 3
 _08157F8C:
 	ldr r0, _08157FA0 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157FA4 @ =(gBattleBufferA + 3)
+	ldr r0, _08157FA4 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x17
@@ -3740,12 +3740,12 @@ _08157F8C:
 	b _0815809A
 	.align 2, 0
 _08157FA0: .4byte gActiveBattler
-_08157FA4: .4byte (gBattleBufferA + 3)
+_08157FA4: .4byte gBattleBufferA + 3
 _08157FA8:
 	ldr r0, _08157FBC @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157FC0 @ =(gBattleBufferA + 3)
+	ldr r0, _08157FC0 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x18
@@ -3753,12 +3753,12 @@ _08157FA8:
 	b _0815809A
 	.align 2, 0
 _08157FBC: .4byte gActiveBattler
-_08157FC0: .4byte (gBattleBufferA + 3)
+_08157FC0: .4byte gBattleBufferA + 3
 _08157FC4:
 	ldr r0, _08157FD8 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157FDC @ =(gBattleBufferA + 3)
+	ldr r0, _08157FDC @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x21
@@ -3766,12 +3766,12 @@ _08157FC4:
 	b _0815809A
 	.align 2, 0
 _08157FD8: .4byte gActiveBattler
-_08157FDC: .4byte (gBattleBufferA + 3)
+_08157FDC: .4byte gBattleBufferA + 3
 _08157FE0:
 	ldr r0, _08157FF4 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08157FF8 @ =(gBattleBufferA + 3)
+	ldr r0, _08157FF8 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x2F
@@ -3779,12 +3779,12 @@ _08157FE0:
 	b _0815809A
 	.align 2, 0
 _08157FF4: .4byte gActiveBattler
-_08157FF8: .4byte (gBattleBufferA + 3)
+_08157FF8: .4byte gBattleBufferA + 3
 _08157FFC:
 	ldr r0, _08158010 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08158014 @ =(gBattleBufferA + 3)
+	ldr r0, _08158014 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x30
@@ -3792,12 +3792,12 @@ _08157FFC:
 	b _0815809A
 	.align 2, 0
 _08158010: .4byte gActiveBattler
-_08158014: .4byte (gBattleBufferA + 3)
+_08158014: .4byte gBattleBufferA + 3
 _08158018:
 	ldr r0, _0815802C @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08158030 @ =(gBattleBufferA + 3)
+	ldr r0, _08158030 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x32
@@ -3805,12 +3805,12 @@ _08158018:
 	b _0815809A
 	.align 2, 0
 _0815802C: .4byte gActiveBattler
-_08158030: .4byte (gBattleBufferA + 3)
+_08158030: .4byte gBattleBufferA + 3
 _08158034:
 	ldr r0, _08158048 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _0815804C @ =(gBattleBufferA + 3)
+	ldr r0, _0815804C @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x33
@@ -3818,12 +3818,12 @@ _08158034:
 	b _0815809A
 	.align 2, 0
 _08158048: .4byte gActiveBattler
-_0815804C: .4byte (gBattleBufferA + 3)
+_0815804C: .4byte gBattleBufferA + 3
 _08158050:
 	ldr r0, _08158064 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08158068 @ =(gBattleBufferA + 3)
+	ldr r0, _08158068 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x34
@@ -3831,12 +3831,12 @@ _08158050:
 	b _0815809A
 	.align 2, 0
 _08158064: .4byte gActiveBattler
-_08158068: .4byte (gBattleBufferA + 3)
+_08158068: .4byte gBattleBufferA + 3
 _0815806C:
 	ldr r0, _08158080 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _08158084 @ =(gBattleBufferA + 3)
+	ldr r0, _08158084 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x35
@@ -3844,12 +3844,12 @@ _0815806C:
 	b _0815809A
 	.align 2, 0
 _08158080: .4byte gActiveBattler
-_08158084: .4byte (gBattleBufferA + 3)
+_08158084: .4byte gBattleBufferA + 3
 _08158088:
 	ldr r0, _081580C4 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r2, 9
-	ldr r0, _081580C8 @ =(gBattleBufferA + 3)
+	ldr r0, _081580C8 @ =gBattleBufferA + 3
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x36
@@ -3876,7 +3876,7 @@ _0815809A:
 	bx r0
 	.align 2, 0
 _081580C4: .4byte gActiveBattler
-_081580C8: .4byte (gBattleBufferA + 3)
+_081580C8: .4byte gBattleBufferA + 3
 _081580CC: .4byte gBattlerPartyIndexes
 _081580D0: .4byte gPlayerParty
 	thumb_func_end sub_81577B4
@@ -5063,7 +5063,7 @@ sub_8158A88: @ 8158A88
 	ldr r0, _08158AC4 @ =gActiveBattler
 	ldrb r4, [r0]
 	lsls r4, 9
-	ldr r0, _08158AC8 @ =(gBattleBufferA + 2)
+	ldr r0, _08158AC8 @ =gBattleBufferA + 2
 	adds r4, r0
 	ldrh r0, [r4]
 	bl BufferStringBattle
@@ -5080,7 +5080,7 @@ sub_8158A88: @ 8158A88
 _08158ABC: .4byte gBattle_BG0_X
 _08158AC0: .4byte gBattle_BG0_Y
 _08158AC4: .4byte gActiveBattler
-_08158AC8: .4byte (gBattleBufferA + 2)
+_08158AC8: .4byte gBattleBufferA + 2
 _08158ACC: .4byte gDisplayedStringBattle
 _08158AD0:
 	ldr r0, _08158AEC @ =gDisplayedStringBattle
@@ -6552,7 +6552,7 @@ _08159690:
 	strb r1, [r0]
 	ldrb r0, [r5]
 	lsls r4, r0, 9
-	ldr r3, _081596DC @ =(gBattleBufferA + 4)
+	ldr r3, _081596DC @ =gBattleBufferA + 4
 	adds r1, r4, r3
 	subs r2, r3, 0x3
 	adds r2, r4, r2
@@ -6573,7 +6573,7 @@ _081596CE:
 	.align 2, 0
 _081596D4: .4byte gBattleSpritesDataPtr
 _081596D8: .4byte gActiveBattler
-_081596DC: .4byte (gBattleBufferA + 4)
+_081596DC: .4byte gBattleBufferA + 4
 _081596E0: .4byte gBattlerStatusSummaryTaskId
 	thumb_func_end sub_8159660
 
@@ -7081,7 +7081,7 @@ sub_8159AB8: @ 8159AB8
 	ldr r3, _08159B5C @ =gActiveBattler
 	ldrb r5, [r3]
 	lsls r1, r5, 9
-	ldr r0, _08159B60 @ =(gBattleBufferA + 2)
+	ldr r0, _08159B60 @ =gBattleBufferA + 2
 	adds r7, r1, r0
 	mov r12, r7
 	subs r0, 0x2
@@ -7150,7 +7150,7 @@ _08159B04:
 _08159B54: .4byte gUnknown_8479198
 _08159B58: .4byte gBattleStruct
 _08159B5C: .4byte gActiveBattler
-_08159B60: .4byte (gBattleBufferA + 2)
+_08159B60: .4byte gBattleBufferA + 2
 _08159B64: .4byte gBattlerControllerFuncs
 _08159B68: .4byte gUnknown_3005EE0
 _08159B6C:

asm/battle_interface.s

@@ -4304,7 +4304,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r1, _08049D84 @ =gUnknown_83FE81C
+	ldr r1, _08049D84 @ =gText_HighlightRed_Left
 	mov r0, sp
 	bl StringCopy
 	ldr r1, _08049D88 @ =gNumSafariBalls
@@ -4350,7 +4350,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08049D84: .4byte gUnknown_83FE81C
+_08049D84: .4byte gText_HighlightRed_Left
 _08049D88: .4byte gNumSafariBalls
 _08049D8C: .4byte gSprites
 _08049D90: .4byte 0x060102c0

asm/battle_message.s

@@ -20,7 +20,7 @@ BufferStringBattle: @ 80D7274
 	mov r8, r0
 	ldrb r1, [r0]
 	lsls r1, 9
-	ldr r0, _080D7338 @ =(gBattleBufferA + 4)
+	ldr r0, _080D7338 @ =gBattleBufferA + 4
 	adds r1, r0
 	str r1, [r4]
 	ldr r2, _080D733C @ =gLastUsedItem
@@ -107,7 +107,7 @@ _080D7326:
 	.align 2, 0
 _080D7330: .4byte gUnknown_2039A34
 _080D7334: .4byte gActiveBattler
-_080D7338: .4byte (gBattleBufferA + 4)
+_080D7338: .4byte gBattleBufferA + 4
 _080D733C: .4byte gLastUsedItem
 _080D7340: .4byte gLastUsedAbility
 _080D7344: .4byte gBattleScripting
@@ -2943,7 +2943,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
 	ldr r0, _080D8A38 @ =gActiveBattler
 	ldrb r2, [r0]
 	lsls r1, r2, 9
-	ldr r0, _080D8A3C @ =(gBattleBufferA + 4)
+	ldr r0, _080D8A3C @ =gBattleBufferA + 4
 	adds r1, r0
 	ldr r4, _080D8A40 @ =gUnknown_8D2FBB4
 	ldr r0, _080D8A44 @ =gMoveSelectionCursor
@@ -2983,7 +2983,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC
 	bx r0
 	.align 2, 0
 _080D8A38: .4byte gActiveBattler
-_080D8A3C: .4byte (gBattleBufferA + 4)
+_080D8A3C: .4byte gBattleBufferA + 4
 _080D8A40: .4byte gUnknown_8D2FBB4
 _080D8A44: .4byte gMoveSelectionCursor
 _080D8A48: .4byte gPlttBufferUnfaded

data/data_83F5738.s

@@ -344,29 +344,32 @@ gText_BattleSwitchWhich:: @ 83FE7A0
 gUnknown_83FE80C:: @ 83FE80C
 	.incbin "baserom.gba", 0x3FE80C, 0x10
 
-gUnknown_83FE81C:: @ 83FE81C
+gText_HighlightRed_Left:: @ 83FE81C
-	.incbin "baserom.gba", 0x3FE81C, 0xE
+	.string "{HIGHLIGHT RED}Left: $"
 
-gText_Sleep:: @ 83FE82A
+gText_HighlightRed::
-	.incbin "baserom.gba", 0x3FE82A, 0x6
+	.string "{HIGHLIGHT RED}$"
 
-gText_Poison:: @ 83FE830
+gText_Sleep::
-	.incbin "baserom.gba", 0x3FE830, 0x7
+	.string "sleep$"
 
-gText_Burn:: @ 83FE837
+gText_Poison::
-	.incbin "baserom.gba", 0x3FE837, 0x5
+	.string "poison$"
 
-gText_Paralysis:: @ 83FE83C
+gText_Burn::
-	.incbin "baserom.gba", 0x3FE83C, 0xA
+	.string "burn$"
 
-gText_Ice:: @ 83FE846
+gText_Paralysis::
-	.incbin "baserom.gba", 0x3FE846, 0x4
+	.string "paralysis$"
 
-gText_Confusion:: @ 83FE84A
+gText_Ice::
-	.incbin "baserom.gba", 0x3FE84A, 0xA
+	.string "ice$"
 
-gText_Love:: @ 83FE854
+gText_Confusion::
-	.incbin "baserom.gba", 0x3FE854, 0x5
+	.string "confusion$"
+
+gText_Love::
+	.string "love$"
 
 gUnknown_83FE859:: @ 83FE859
 	.incbin "baserom.gba", 0x3FE859, 0x3

data/maps/CeladonCity_GameCorner/scripts.inc

@@ -429,7 +429,7 @@ EventScript_16CABE:: @ 816CABE
 	return
 
 CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
-	trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10
 	msgbox gUnknown_8196E9B, 6
 	end
 

data/maps/CeladonCity_Gym/scripts.inc

@@ -3,7 +3,7 @@ CeladonCity_Gym_MapScripts:: @ 816D060
 
 CeladonCity_Gym_EventScript_16D061:: @ 816D061
 	famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0
 	checkflag FLAG_GOT_TM19_FROM_ERIKA
 	goto_if FALSE, EventScript_16D0C6
 	famechecker FAMECHECKER_ERIKA, 4
@@ -38,39 +38,39 @@ EventScript_16D107:: @ 816D107
 	end
 
 CeladonCity_Gym_EventScript_16D111:: @ 816D111
-	trainerbattle 0, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4
 	msgbox gUnknown_81974D6, 6
 	end
 
 CeladonCity_Gym_EventScript_16D128:: @ 816D128
-	trainerbattle 0, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF
 	famechecker FAMECHECKER_ERIKA, 2
 	msgbox gUnknown_8197708, 6
 	end
 
 CeladonCity_Gym_EventScript_16D14C:: @ 816D14C
-	trainerbattle 0, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB
 	msgbox gUnknown_81975D1, 6
 	end
 
 CeladonCity_Gym_EventScript_16D163:: @ 816D163
-	trainerbattle 0, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C
 	msgbox gUnknown_8197527, 6
 	end
 
 CeladonCity_Gym_EventScript_16D17A:: @ 816D17A
-	trainerbattle 0, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660
 	famechecker FAMECHECKER_ERIKA, 3
 	msgbox gUnknown_8197664, 6
 	end
 
 CeladonCity_Gym_EventScript_16D19E:: @ 816D19E
-	trainerbattle 0, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A
 	msgbox gUnknown_8197788, 6
 	end
 
 CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5
-	trainerbattle 0, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832
 	msgbox gUnknown_819783E, 6
 	end
 

data/maps/CeruleanCity/scripts.inc

@@ -73,15 +73,15 @@ EventScript_1664CC:: @ 81664CC
 	end
 
 EventScript_166582:: @ 8166582
-	trainerbattle 3, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71
 	return
 
 EventScript_16658D:: @ 816658D
-	trainerbattle 3, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71
 	return
 
 EventScript_166598:: @ 8166598
-	trainerbattle 3, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71
 	return
 
 EventScript_1665A3:: @ 81665A3
@@ -177,7 +177,7 @@ CeruleanCity_EventScript_166603:: @ 8166603
 	waitmessage
 	playbgm MUS_ROCKET, 0
 	waitbuttonpress
-	trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
 	setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
 	goto EventScript_16662E
 	end
@@ -228,7 +228,7 @@ EventScript_1666C3:: @ 81666C3
 	textcolor 0
 	msgbox Text_17EE0E
 	setvar VAR_LAST_TALKED, 2
-	trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
 	setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
 	goto EventScript_16662E
 	end

data/maps/CeruleanCity_Gym/scripts.inc

@@ -3,7 +3,7 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0
 
 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1
 	famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
 	checkflag FLAG_GOT_TM03_FROM_MISTY
 	goto_if FALSE, EventScript_16AAF9
 	msgbox gUnknown_81922BF
@@ -37,12 +37,12 @@ EventScript_16AB3A:: @ 816AB3A
 	end
 
 CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44
-	trainerbattle 0, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0
 	msgbox gUnknown_81924E4, 6
 	end
 
 CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B
-	trainerbattle 0, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547
 	famechecker FAMECHECKER_MISTY, 2
 	msgbox gUnknown_8192556, 6
 	end

data/maps/CinnabarIsland_Gym/scripts.inc

@@ -54,7 +54,7 @@ EventScript_16D9CE:: @ 816D9CE
 
 CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4
 	famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06
 	checkflag FLAG_GOT_TM38_FROM_BLAINE
 	goto_if FALSE, EventScript_16DA34
 	msgbox gUnknown_819971D
@@ -90,12 +90,12 @@ EventScript_16DA75:: @ 816DA75
 	end
 
 CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F
-	trainerbattle 0, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6
 	msgbox gUnknown_81997EA, 6
 	end
 
 CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96
-	trainerbattle 2, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
 	msgbox gUnknown_8199911, 6
 	end
 
@@ -110,7 +110,7 @@ EventScript_16DABC:: @ 816DABC
 	return
 
 CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2
-	trainerbattle 2, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
 	famechecker FAMECHECKER_BLAINE, 2
 	msgbox gUnknown_81999DF, 6
 	end
@@ -126,7 +126,7 @@ EventScript_16DAF5:: @ 816DAF5
 	return
 
 CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB
-	trainerbattle 2, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16
 	msgbox gUnknown_8199B27, 6
 	end
 
@@ -141,7 +141,7 @@ EventScript_16DB21:: @ 816DB21
 	return
 
 CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27
-	trainerbattle 2, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42
 	msgbox gUnknown_819987D, 6
 	end
 
@@ -156,7 +156,7 @@ EventScript_16DB4D:: @ 816DB4D
 	return
 
 CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53
-	trainerbattle 2, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E
 	msgbox gUnknown_8199986, 6
 	end
 
@@ -171,7 +171,7 @@ EventScript_16DB79:: @ 816DB79
 	return
 
 CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F
-	trainerbattle 2, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
 	msgbox gUnknown_8199AC9, 6
 	end
 
@@ -281,7 +281,7 @@ EventScript_16DC7A:: @ 816DC7A
 	call_if eq, EventScript_16DCC6
 	textcolor 0
 	msgbox gUnknown_819983F
-	trainerbattle 3, TRAINER_BURGLAR_QUINN, 0, Text_199870
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_QUINN, 0, Text_199870
 	checkflag FLAG_CINNABAR_GYM_QUIZ_1
 	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DC58
@@ -360,7 +360,7 @@ EventScript_16DD51:: @ 816DD51
 	call_if eq, EventScript_16DD9D
 	textcolor 0
 	msgbox gUnknown_81998BD
-	trainerbattle 3, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED
 	checkflag FLAG_CINNABAR_GYM_QUIZ_2
 	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DD31
@@ -448,7 +448,7 @@ EventScript_16DE2F:: @ 816DE2F
 	call_if eq, EventScript_16DE7B
 	textcolor 0
 	msgbox gUnknown_8199948
-	trainerbattle 3, TRAINER_BURGLAR_RAMON, 0, Text_199973
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_RAMON, 0, Text_199973
 	checkflag FLAG_CINNABAR_GYM_QUIZ_3
 	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DE0F
@@ -527,7 +527,7 @@ EventScript_16DF06:: @ 816DF06
 	call_if eq, EventScript_16DF52
 	textcolor 0
 	msgbox gUnknown_81999B7
-	trainerbattle 3, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB
 	checkflag FLAG_CINNABAR_GYM_QUIZ_4
 	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DEE6
@@ -606,7 +606,7 @@ EventScript_16DFDD:: @ 816DFDD
 	call_if eq, EventScript_16E029
 	textcolor 0
 	msgbox gUnknown_8199A7F
-	trainerbattle 3, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9
 	checkflag FLAG_CINNABAR_GYM_QUIZ_5
 	goto_if TRUE, EventScript_16DC68
 	call EventScript_16DFBD
@@ -685,7 +685,7 @@ EventScript_16E0B4:: @ 816E0B4
 	call_if eq, EventScript_16E100
 	textcolor 0
 	msgbox gUnknown_8199AFC
-	trainerbattle 3, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16
 	checkflag FLAG_CINNABAR_GYM_QUIZ_6
 	goto_if TRUE, EventScript_16DC68
 	call EventScript_16E094

data/maps/FiveIsland_LostCave_Room1/scripts.inc

@@ -2,6 +2,6 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6
 	.byte 0
 
 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7
-	trainerbattle 0, TRAINER_RUIN_MANIAC_LAWSON, 0, Text_17CEF5, Text_17CF42
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAWSON, 0, Text_17CEF5, Text_17CF42
 	msgbox gUnknown_817CF54, 6
 	end

data/maps/FiveIsland_LostCave_Room10/scripts.inc

@@ -28,7 +28,7 @@ EventScript_164C52:: @ 8164C52
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_164CB6
-	trainerbattle 3, TRAINER_LADY_SELPHY, 0, Text_17D086
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_LADY_SELPHY, 0, Text_17D086
 	msgbox gUnknown_817D0B2
 	closemessage
 	call EventScript_164CA5

data/maps/FiveIsland_LostCave_Room4/scripts.inc

@@ -2,6 +2,6 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10
 	.byte 0
 
 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11
-	trainerbattle 0, TRAINER_PSYCHIC_LAURA, 0, Text_17CFC1, Text_17CFFB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_LAURA, 0, Text_17CFC1, Text_17CFFB
 	msgbox gUnknown_817D037, 6
 	end

data/maps/FiveIsland_Meadow/scripts.inc

@@ -39,16 +39,16 @@ EventScript_168983:: @ 8168983
 	return
 
 FiveIsland_Meadow_EventScript_16898D:: @ 816898D
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_49, 0, Text_18AC88, Text_18ACB3
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_49, 0, Text_18AC88, Text_18ACB3
 	msgbox gUnknown_818ACC5, 6
 	end
 
 FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_50, 0, Text_18ACF0, Text_18AD39
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_50, 0, Text_18ACF0, Text_18AD39
 	msgbox gUnknown_818AD59, 6
 	end
 
 FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_51, 0, Text_18ADC6, Text_18ADFB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_51, 0, Text_18ADC6, Text_18ADFB
 	msgbox gUnknown_818AE16, 6
 	end

data/maps/FiveIsland_RocketWarehouse/scripts.inc

@@ -43,7 +43,7 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81
 	end
 
 FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93
-	trainerbattle 2, TRAINER_SCIENTIST_GIDEON, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SCIENTIST_GIDEON, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD
 	checkflag FLAG_SYS_CAN_LINK_WITH_RS
 	goto_if TRUE, EventScript_163FB7
 	msgbox gUnknown_817BCA3, 6
@@ -62,17 +62,17 @@ EventScript_163FCD:: @ 8163FCD
 	end
 
 FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_47, 0, Text_17B54D, Text_17B585
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_47, 0, Text_17B54D, Text_17B585
 	msgbox gUnknown_817B5A6, 6
 	end
 
 FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_48, 0, Text_17B677, Text_17B6D9
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_48, 0, Text_17B677, Text_17B6D9
 	msgbox gUnknown_817B6EF, 6
 	end
 
 FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014
-	trainerbattle 2, TRAINER_TEAM_ROCKET_ADMIN_2, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_ADMIN_2, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F
 	msgbox gUnknown_817BA64, 6
 	end
 
@@ -100,12 +100,12 @@ EventScript_164065:: @ 8164065
 	return
 
 FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_42, 0, Text_17B5D6, Text_17B62F
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_42, 0, Text_17B5D6, Text_17B62F
 	msgbox gUnknown_817B642, 6
 	end
 
 FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
-	trainerbattle 2, TRAINER_TEAM_ROCKET_ADMIN, 0, Text_17B72D, Text_17B79C, EventScript_1640A2
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_ADMIN, 0, Text_17B72D, Text_17B79C, EventScript_1640A2
 	msgbox gUnknown_817B7FA, 6
 	end
 

data/maps/FourIsland_IcefallCave_Back/scripts.inc

@@ -46,7 +46,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
 	textcolor 0
 	msgbox gUnknown_817B20B
 	setvar VAR_LAST_TALKED, 4
-	trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_45, 0, Text_17B251
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_45, 0, Text_17B251
 	applymovement 3, Movement_163F1B
 	waitmovement 0
 	textcolor 1

data/maps/FuchsiaCity_Gym/scripts.inc

@@ -3,7 +3,7 @@ FuchsiaCity_Gym_MapScripts:: @ 816D54D
 
 FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E
 	famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580
 	checkflag FLAG_GOT_TM06_FROM_KOGA
 	goto_if FALSE, EventScript_16D5A6
 	msgbox gUnknown_8198481
@@ -37,33 +37,33 @@ EventScript_16D5E7:: @ 816D5E7
 	end
 
 FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1
-	trainerbattle 0, TRAINER_TAMER_PHIL, 0, Text_198866, Text_1988B6
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_PHIL, 0, Text_198866, Text_1988B6
 	msgbox gUnknown_81988CB, 6
 	end
 
 FuchsiaCity_Gym_EventScript_16D608:: @ 816D608
-	trainerbattle 0, TRAINER_TAMER_EDGAR, 0, Text_19891F, Text_19897F
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EDGAR, 0, Text_19891F, Text_19897F
 	msgbox gUnknown_8198985, 6
 	end
 
 FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F
-	trainerbattle 0, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779
 	famechecker FAMECHECKER_KOGA, 2
 	msgbox gUnknown_8198787, 6
 	end
 
 FuchsiaCity_Gym_EventScript_16D643:: @ 816D643
-	trainerbattle 0, TRAINER_JUGGLER_SHAWN, 0, Text_1989A1, Text_1989EA
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_SHAWN, 0, Text_1989A1, Text_1989EA
 	msgbox gUnknown_8198A10, 6
 	end
 
 FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A
-	trainerbattle 0, TRAINER_JUGGLER_KAYDEN, 0, Text_198629, Text_1986B4
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KAYDEN, 0, Text_198629, Text_1986B4
 	msgbox gUnknown_81986C9, 6
 	end
 
 FuchsiaCity_Gym_EventScript_16D671:: @ 816D671
-	trainerbattle 0, TRAINER_JUGGLER_NATE, 0, Text_1987E8, Text_198812
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NATE, 0, Text_1987E8, Text_198812
 	msgbox gUnknown_8198825, 6
 	end
 

data/maps/MtEmber_Exterior/scripts.inc

@@ -43,7 +43,7 @@ EventScript_1639A8:: @ 81639A8
 	waitmovement 0
 	playbgm MUS_ROCKET, 0
 	msgbox gUnknown_817AA06
-	trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_43, 0, Text_17AA34
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_43, 0, Text_17AA34
 	msgbox gUnknown_817AA3F
 	checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44
 	goto_if eq, EventScript_1639DB
@@ -82,7 +82,7 @@ EventScript_163A1B:: @ 8163A1B
 EventScript_163A25:: @ 8163A25
 	playbgm MUS_ROCKET, 0
 	msgbox gUnknown_817AA56
-	trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_44, 0, Text_17AA8A
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_44, 0, Text_17AA8A
 	msgbox gUnknown_817AA99
 	checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43
 	goto_if eq, EventScript_1639DB
@@ -116,16 +116,16 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E
 	end
 
 MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4
-	trainerbattle 0, TRAINER_PKMN_RANGER_LOGAN, 0, Text_17AB73, Text_17ABAA
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_LOGAN, 0, Text_17AB73, Text_17ABAA
 	msgbox gUnknown_817ABD8, 6
 	end
 
 MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB
-	trainerbattle 0, TRAINER_PKMN_RANGER_BETH, 0, Text_17AC55, Text_17AC82
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_BETH, 0, Text_17AC55, Text_17AC82
 	msgbox gUnknown_817ACA2, 6
 	end
 
 MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2
-	trainerbattle 0, TRAINER_CRUSH_GIRL_JOCELYN, 0, Text_17AD06, Text_17AD6B
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_JOCELYN, 0, Text_17AD06, Text_17AD6B
 	msgbox gUnknown_817AD89, 6
 	end

data/maps/MtMoon_1F/scripts.inc

@@ -11,36 +11,36 @@ MtMoon_1F_EventScript_1605EE:: @ 81605EE
 	end
 
 MtMoon_1F_EventScript_1605F7:: @ 81605F7
-	trainerbattle 0, TRAINER_HIKER_MARCOS, 0, Text_17279D, Text_1727CB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_MARCOS, 0, Text_17279D, Text_1727CB
 	msgbox gUnknown_81727DF, 6
 	end
 
 MtMoon_1F_EventScript_16060E:: @ 816060E
-	trainerbattle 0, TRAINER_YOUNGSTER_JOSH, 0, Text_17281D, Text_172844
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOSH, 0, Text_17281D, Text_172844
 	msgbox gUnknown_8172863, 6
 	end
 
 MtMoon_1F_EventScript_160625:: @ 8160625
-	trainerbattle 0, TRAINER_LASS_MIRIAM, 0, Text_172896, Text_1728C3
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MIRIAM, 0, Text_172896, Text_1728C3
 	msgbox gUnknown_81728D2, 6
 	end
 
 MtMoon_1F_EventScript_16063C:: @ 816063C
-	trainerbattle 0, TRAINER_LASS_IRIS, 0, Text_172972, Text_1729A4
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_IRIS, 0, Text_172972, Text_1729A4
 	msgbox gUnknown_81729AC, 6
 	end
 
 MtMoon_1F_EventScript_160653:: @ 8160653
-	trainerbattle 0, TRAINER_SUPER_NERD_JOVAN, 0, Text_17290B, Text_172927
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_JOVAN, 0, Text_17290B, Text_172927
 	msgbox gUnknown_817293C, 6
 	end
 
 MtMoon_1F_EventScript_16066A:: @ 816066A
-	trainerbattle 0, TRAINER_BUG_CATCHER_KENT, 0, Text_1729EA, Text_172A1A
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KENT, 0, Text_1729EA, Text_172A1A
 	msgbox gUnknown_8172A26, 6
 	end
 
 MtMoon_1F_EventScript_160681:: @ 8160681
-	trainerbattle 0, TRAINER_BUG_CATCHER_ROBBY, 0, Text_172A55, Text_172A8F
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ROBBY, 0, Text_172A55, Text_172A8F
 	msgbox gUnknown_8172A97, 6
 	end

data/maps/MtMoon_B2F/scripts.inc

@@ -38,7 +38,7 @@ EventScript_1606DD:: @ 81606DD
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setvar VAR_LAST_TALKED, 3
-	trainerbattle 3, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99
 	setvar VAR_MAP_SCENE_MT_MOON_B2F, 1
 	msgbox gUnknown_8172BAB
 	return
@@ -123,21 +123,21 @@ Movement_1607E0:: @ 81607E0
 	step_end
 
 MtMoon_B2F_EventScript_1607E4:: @ 81607E4
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT, 0, Text_172C5A, Text_172CB8
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT, 0, Text_172C5A, Text_172CB8
 	msgbox gUnknown_8172CCB, 6
 	end
 
 MtMoon_B2F_EventScript_1607FB:: @ 81607FB
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_2, 0, Text_172CFC, Text_172D46
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_2, 0, Text_172CFC, Text_172D46
 	msgbox gUnknown_8172D51, 6
 	end
 
 MtMoon_B2F_EventScript_160812:: @ 8160812
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_3, 0, Text_172D82, Text_172DAF
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_3, 0, Text_172D82, Text_172DAF
 	msgbox gUnknown_8172DC1, 6
 	end
 
 MtMoon_B2F_EventScript_160829:: @ 8160829
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_4, 0, Text_172DF0, Text_172E3E
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_4, 0, Text_172DF0, Text_172E3E
 	msgbox gUnknown_8172E4B, 6
 	end

data/maps/PalletTown_ProfessorOaksLab/scripts.inc

@@ -347,7 +347,7 @@ EventScript_16939C:: @ 816939C
 	end
 
 EventScript_1693AC:: @ 81693AC
-	trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
 	goto EventScript_1694C2
 	end
 
@@ -403,7 +403,7 @@ EventScript_169414:: @ 8169414
 	end
 
 EventScript_169424:: @ 8169424
-	trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
 	goto EventScript_1694C2
 	end
 
@@ -462,7 +462,7 @@ EventScript_16948F:: @ 816948F
 	end
 
 EventScript_16949F:: @ 816949F
-	trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
 	goto EventScript_1694C2
 	end
 

data/maps/PewterCity_Gym/scripts.inc

@@ -3,7 +3,7 @@ PewterCity_Gym_MapScripts:: @ 816A592
 
 PewterCity_Gym_EventScript_16A593:: @ 816A593
 	famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5
 	checkflag FLAG_GOT_TM39_FROM_BROCK
 	goto_if FALSE, EventScript_16A5F3
 	msgbox gUnknown_819110F
@@ -39,7 +39,7 @@ EventScript_16A634:: @ 816A634
 	end
 
 PewterCity_Gym_EventScript_16A63E:: @ 816A63E
-	trainerbattle 0, TRAINER_CAMPER_LIAM, 0, Text_1911EC, Text_191237
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_LIAM, 0, Text_1911EC, Text_191237
 	msgbox gUnknown_819126B, 6
 	end
 

data/maps/PokemonLeague_AgathasRoom/scripts.inc

@@ -78,11 +78,11 @@ EventScript_1628F2:: @ 81628F2
 	return
 
 EventScript_1628FB:: @ 81628FB
-	trainerbattle 3, TRAINER_ELITE_FOUR_AGATHA, 0, Text_1786D7
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA, 0, Text_1786D7
 	return
 
 EventScript_162906:: @ 8162906
-	trainerbattle 3, TRAINER_ELITE_FOUR_AGATHA_2, 0, Text_1786D7
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA_2, 0, Text_1786D7
 	return
 
 EventScript_162911:: @ 8162911

data/maps/PokemonLeague_BrunosRoom/scripts.inc

@@ -77,11 +77,11 @@ EventScript_16275A:: @ 816275A
 	return
 
 EventScript_162763:: @ 8162763
-	trainerbattle 3, TRAINER_ELITE_FOUR_BRUNO, 0, Text_178409
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_BRUNO, 0, Text_178409
 	return
 
 EventScript_16276E:: @ 816276E
-	trainerbattle 3, TRAINER_ELITE_FOUR_BRUNO_2, 0, Text_178409
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_BRUNO_2, 0, Text_178409
 	return
 
 EventScript_162779:: @ 8162779

data/maps/PokemonLeague_ChampionsRoom/scripts.inc

@@ -142,27 +142,27 @@ EventScript_162CBC:: @ 8162CBC
 	return
 
 EventScript_162CC5:: @ 8162CC5
-	trainerbattle 3, TRAINER_CHAMPION_FIRST_SQUIRTLE, 0, Text_178E3F
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_SQUIRTLE, 0, Text_178E3F
 	return
 
 EventScript_162CD0:: @ 8162CD0
-	trainerbattle 3, TRAINER_CHAMPION_FIRST_BULBASAUR, 0, Text_178E3F
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_BULBASAUR, 0, Text_178E3F
 	return
 
 EventScript_162CDB:: @ 8162CDB
-	trainerbattle 3, TRAINER_CHAMPION_FIRST_CHARMANDER, 0, Text_178E3F
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_CHARMANDER, 0, Text_178E3F
 	return
 
 EventScript_162CE6:: @ 8162CE6
-	trainerbattle 3, TRAINER_CHAMPION_REMATCH_SQUIRTLE, 0, Text_178E3F
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_SQUIRTLE, 0, Text_178E3F
 	return
 
 EventScript_162CF1:: @ 8162CF1
-	trainerbattle 3, TRAINER_CHAMPION_REMATCH_BULBASAUR, 0, Text_178E3F
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_BULBASAUR, 0, Text_178E3F
 	return
 
 EventScript_162CFC:: @ 8162CFC
-	trainerbattle 3, TRAINER_CHAMPION_REMATCH_CHARMANDER, 0, Text_178E3F
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_CHARMANDER, 0, Text_178E3F
 	return
 
 Movement_162D07:: @ 8162D07

data/maps/PokemonLeague_LancesRoom/scripts.inc

@@ -131,11 +131,11 @@ EventScript_162A82:: @ 8162A82
 	return
 
 EventScript_162A8B:: @ 8162A8B
-	trainerbattle 3, TRAINER_ELITE_FOUR_LANCE, 0, Text_178A15
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LANCE, 0, Text_178A15
 	return
 
 EventScript_162A96:: @ 8162A96
-	trainerbattle 3, TRAINER_ELITE_FOUR_LANCE_2, 0, Text_178A15
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LANCE_2, 0, Text_178A15
 	return
 
 EventScript_162AA1:: @ 8162AA1

data/maps/PokemonLeague_LoreleisRoom/scripts.inc

@@ -82,11 +82,11 @@ EventScript_16264A:: @ 816264A
 	return
 
 EventScript_162653:: @ 8162653
-	trainerbattle 3, TRAINER_ELITE_FOUR_LORELEI, 0, Text_178191
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LORELEI, 0, Text_178191
 	return
 
 EventScript_16265E:: @ 816265E
-	trainerbattle 3, TRAINER_ELITE_FOUR_LORELEI_2, 0, Text_178191
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LORELEI_2, 0, Text_178191
 	return
 
 EventScript_162669:: @ 8162669

data/maps/PokemonMansion_1F/scripts.inc

@@ -23,11 +23,11 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212
 	end
 
 PokemonMansion_1F_EventScript_162226:: @ 8162226
-	trainerbattle 0, TRAINER_SCIENTIST_TED, 0, Text_177364, Text_177391
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TED, 0, Text_177364, Text_177391
 	msgbox gUnknown_8177397, 6
 	end
 
 PokemonMansion_1F_EventScript_16223D:: @ 816223D
-	trainerbattle 0, TRAINER_YOUNGSTER_JOHNSON, 0, Text_1773C6, Text_1773FD
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOHNSON, 0, Text_1773C6, Text_1773FD
 	msgbox gUnknown_8177418, 6
 	end

data/maps/PokemonMansion_2F/scripts.inc

@@ -26,6 +26,6 @@ PokemonMansion_2F_EventScript_162281:: @ 8162281
 	end
 
 PokemonMansion_2F_EventScript_16228A:: @ 816228A
-	trainerbattle 0, TRAINER_BURGLAR_ARNIE, 0, Text_177498, Text_1774CB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_ARNIE, 0, Text_177498, Text_1774CB
 	msgbox gUnknown_81774E3, 6
 	end

data/maps/PokemonMansion_3F/scripts.inc

@@ -22,11 +22,11 @@ PokemonMansion_3F_EventScript_1622C5:: @ 81622C5
 	end
 
 PokemonMansion_3F_EventScript_1622CE:: @ 81622CE
-	trainerbattle 0, TRAINER_BURGLAR_SIMON, 0, Text_1775E7, Text_177602
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_SIMON, 0, Text_1775E7, Text_177602
 	msgbox gUnknown_8177608, 6
 	end
 
 PokemonMansion_3F_EventScript_1622E5:: @ 81622E5
-	trainerbattle 0, TRAINER_SCIENTIST_BRAYDON, 0, Text_177628, Text_177643
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_BRAYDON, 0, Text_177628, Text_177643
 	msgbox gUnknown_8177657, 6
 	end

data/maps/PokemonMansion_B1F/scripts.inc

@@ -22,11 +22,11 @@ PokemonMansion_B1F_EventScript_162320:: @ 8162320
 	end
 
 PokemonMansion_B1F_EventScript_162329:: @ 8162329
-	trainerbattle 0, TRAINER_BURGLAR_LEWIS, 0, Text_1776C0, Text_1776D7
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_LEWIS, 0, Text_1776C0, Text_1776D7
 	msgbox gUnknown_81776DE, 6
 	end
 
 PokemonMansion_B1F_EventScript_162340:: @ 8162340
-	trainerbattle 0, TRAINER_SCIENTIST_IVAN, 0, Text_177720, Text_177757
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_IVAN, 0, Text_177720, Text_177757
 	msgbox gUnknown_817776A, 6
 	end

data/maps/PokemonTower_2F/scripts.inc

@@ -64,15 +64,15 @@ EventScript_16334B:: @ 816334B
 	return
 
 EventScript_16335D:: @ 816335D
-	trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, 0, Text_179D73
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, 0, Text_179D73
 	return
 
 EventScript_163368:: @ 8163368
-	trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, 0, Text_179D73
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, 0, Text_179D73
 	return
 
 EventScript_163373:: @ 8163373
-	trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, 0, Text_179D73
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, 0, Text_179D73
 	return
 
 EventScript_16337E:: @ 816337E

data/maps/PokemonTower_3F/scripts.inc

@@ -2,16 +2,16 @@ PokemonTower_3F_MapScripts:: @ 81633A6
 	.byte 0
 
 PokemonTower_3F_EventScript_1633A7:: @ 81633A7
-	trainerbattle 0, TRAINER_CHANNELER_PATRICIA, 0, Text_179FA0, Text_179FBC
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_PATRICIA, 0, Text_179FA0, Text_179FBC
 	msgbox gUnknown_8179FD3, 6
 	end
 
 PokemonTower_3F_EventScript_1633BE:: @ 81633BE
-	trainerbattle 0, TRAINER_CHANNELER_CARLY, 0, Text_179F62, Text_179F72
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_CARLY, 0, Text_179F62, Text_179F72
 	msgbox gUnknown_8179F88, 6
 	end
 
 PokemonTower_3F_EventScript_1633D5:: @ 81633D5
-	trainerbattle 0, TRAINER_CHANNELER_HOPE, 0, Text_179F09, Text_179F21
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_HOPE, 0, Text_179F09, Text_179F21
 	msgbox gUnknown_8179F31, 6
 	end

data/maps/PokemonTower_4F/scripts.inc

@@ -2,16 +2,16 @@ PokemonTower_4F_MapScripts:: @ 81633EC
 	.byte 0
 
 PokemonTower_4F_EventScript_1633ED:: @ 81633ED
-	trainerbattle 0, TRAINER_CHANNELER_PAULA, 0, Text_17A004, Text_17A017
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_PAULA, 0, Text_17A004, Text_17A017
 	msgbox gUnknown_817A02B, 6
 	end
 
 PokemonTower_4F_EventScript_163404:: @ 8163404
-	trainerbattle 0, TRAINER_CHANNELER_LAUREL, 0, Text_17A046, Text_17A061
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_LAUREL, 0, Text_17A046, Text_17A061
 	msgbox gUnknown_817A067, 6
 	end
 
 PokemonTower_4F_EventScript_16341B:: @ 816341B
-	trainerbattle 0, TRAINER_CHANNELER_JODY, 0, Text_17A096, Text_17A0AB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JODY, 0, Text_17A096, Text_17A0AB
 	msgbox gUnknown_817A0BB, 6
 	end

data/maps/PokemonTower_5F/scripts.inc

@@ -22,21 +22,21 @@ PokemonTower_5F_EventScript_163453:: @ 8163453
 	end
 
 PokemonTower_5F_EventScript_16345B:: @ 816345B
-	trainerbattle 0, TRAINER_CHANNELER_TAMMY, 0, Text_17A11F, Text_17A132
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_TAMMY, 0, Text_17A11F, Text_17A132
 	msgbox gUnknown_817A138, 6
 	end
 
 PokemonTower_5F_EventScript_163472:: @ 8163472
-	trainerbattle 0, TRAINER_CHANNELER_RUTH, 0, Text_17A150, Text_17A164
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_RUTH, 0, Text_17A150, Text_17A164
 	msgbox gUnknown_817A176, 6
 	end
 
 PokemonTower_5F_EventScript_163489:: @ 8163489
-	trainerbattle 0, TRAINER_CHANNELER_KARINA, 0, Text_17A187, Text_17A190
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_KARINA, 0, Text_17A187, Text_17A190
 	msgbox gUnknown_817A194, 6
 	end
 
 PokemonTower_5F_EventScript_1634A0:: @ 81634A0
-	trainerbattle 0, TRAINER_CHANNELER_JANAE, 0, Text_17A1AA, Text_17A1B7
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JANAE, 0, Text_17A1AA, Text_17A1B7
 	msgbox gUnknown_817A1BD, 6
 	end

data/maps/PokemonTower_6F/scripts.inc

@@ -36,16 +36,16 @@ Movement_163512:: @ 8163512
 	step_end
 
 PokemonTower_6F_EventScript_163514:: @ 8163514
-	trainerbattle 0, TRAINER_CHANNELER_ANGELICA, 0, Text_17A243, Text_17A253
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_ANGELICA, 0, Text_17A243, Text_17A253
 	msgbox gUnknown_817A25A, 6
 	end
 
 PokemonTower_6F_EventScript_16352B:: @ 816352B
-	trainerbattle 0, TRAINER_CHANNELER_EMILIA, 0, Text_17A272, Text_17A27F
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_EMILIA, 0, Text_17A272, Text_17A27F
 	msgbox gUnknown_817A293, 6
 	end
 
 PokemonTower_6F_EventScript_163542:: @ 8163542
-	trainerbattle 0, TRAINER_CHANNELER_JENNIFER, 0, Text_17A2C8, Text_17A2DC
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JENNIFER, 0, Text_17A2C8, Text_17A2DC
 	msgbox gUnknown_817A2E2, 6
 	end

data/maps/PokemonTower_7F/scripts.inc

@@ -16,7 +16,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A
 	end
 
 PokemonTower_7F_EventScript_163586:: @ 8163586
-	trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_19, 0, Text_17A380, Text_17A3A4, EventScript_1635A1
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_19, 0, Text_17A380, Text_17A3A4, EventScript_1635A1
 	msgbox gUnknown_817A3AF, 6
 	end
 
@@ -103,7 +103,7 @@ Movement_163633:: @ 8163633
 	step_end
 
 PokemonTower_7F_EventScript_16363D:: @ 816363D
-	trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_20, 0, Text_17A3CD, Text_17A466, EventScript_163658
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_20, 0, Text_17A3CD, Text_17A466, EventScript_163658
 	msgbox gUnknown_817A477, 6
 	end
 
@@ -169,7 +169,7 @@ Movement_1636CD:: @ 81636CD
 	step_end
 
 PokemonTower_7F_EventScript_1636D6:: @ 81636D6
-	trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_21, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_21, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1
 	msgbox gUnknown_817A506, 6
 	end
 

data/maps/RockTunnel_1F/scripts.inc

@@ -11,36 +11,36 @@ RockTunnel_1F_EventScript_162DE0:: @ 8162DE0
 	end
 
 RockTunnel_1F_EventScript_162DE9:: @ 8162DE9
-	trainerbattle 0, TRAINER_HIKER_LENNY, 0, Text_179366, Text_179388
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LENNY, 0, Text_179366, Text_179388
 	msgbox gUnknown_8179396, 6
 	end
 
 RockTunnel_1F_EventScript_162E00:: @ 8162E00
-	trainerbattle 0, TRAINER_HIKER_OLIVER, 0, Text_1793F1, Text_17940E
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_OLIVER, 0, Text_1793F1, Text_17940E
 	msgbox gUnknown_817943A, 6
 	end
 
 RockTunnel_1F_EventScript_162E17:: @ 8162E17
-	trainerbattle 0, TRAINER_HIKER_LUCAS, 0, Text_17947B, Text_1794AC
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LUCAS, 0, Text_17947B, Text_1794AC
 	msgbox gUnknown_81794B4, 6
 	end
 
 RockTunnel_1F_EventScript_162E2E:: @ 8162E2E
-	trainerbattle 0, TRAINER_POKEMANIAC_ASHTON, 0, Text_1794D4, Text_1794EE
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_ASHTON, 0, Text_1794D4, Text_1794EE
 	msgbox gUnknown_81794F9, 6
 	end
 
 RockTunnel_1F_EventScript_162E45:: @ 8162E45
-	trainerbattle 0, TRAINER_PICNICKER_LEAH, 0, Text_17951C, Text_179547
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_LEAH, 0, Text_17951C, Text_179547
 	msgbox gUnknown_8179558, 6
 	end
 
 RockTunnel_1F_EventScript_162E5C:: @ 8162E5C
-	trainerbattle 0, TRAINER_PICNICKER_ARIANA, 0, Text_1795E5, Text_179604
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ARIANA, 0, Text_1795E5, Text_179604
 	msgbox gUnknown_8179613, 6
 	end
 
 RockTunnel_1F_EventScript_162E73:: @ 8162E73
-	trainerbattle 0, TRAINER_PICNICKER_DANA, 0, Text_179577, Text_1795A1
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DANA, 0, Text_179577, Text_1795A1
 	msgbox gUnknown_81795B5, 6
 	end

data/maps/RockTunnel_B1F/scripts.inc

@@ -2,41 +2,41 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A
 	.byte 0
 
 RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B
-	trainerbattle 0, TRAINER_PICNICKER_SOFIA, 0, Text_179657, Text_1796B9
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_SOFIA, 0, Text_179657, Text_1796B9
 	msgbox gUnknown_81796CE, 6
 	end
 
 RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2
-	trainerbattle 0, TRAINER_PICNICKER_MARTHA, 0, Text_1798AD, Text_1798DD
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MARTHA, 0, Text_1798AD, Text_1798DD
 	msgbox gUnknown_81798E9, 6
 	end
 
 RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9
-	trainerbattle 0, TRAINER_HIKER_DUDLEY, 0, Text_1796E1, Text_179700
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_DUDLEY, 0, Text_1796E1, Text_179700
 	msgbox gUnknown_8179712, 6
 	end
 
 RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0
-	trainerbattle 0, TRAINER_HIKER_ALLEN, 0, Text_179829, Text_179856
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ALLEN, 0, Text_179829, Text_179856
 	msgbox gUnknown_817987A, 6
 	end
 
 RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7
-	trainerbattle 0, TRAINER_HIKER_ERIC, 0, Text_179916, Text_179932
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ERIC, 0, Text_179916, Text_179932
 	msgbox gUnknown_817993E, 6
 	end
 
 RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE
-	trainerbattle 0, TRAINER_POKEMANIAC_COOPER, 0, Text_17973A, Text_17975F
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_COOPER, 0, Text_17973A, Text_17975F
 	msgbox gUnknown_8179777, 6
 	end
 
 RockTunnel_B1F_EventScript_162F15:: @ 8162F15
-	trainerbattle 0, TRAINER_POKEMANIAC_STEVE, 0, Text_1797A4, Text_1797CB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_STEVE, 0, Text_1797A4, Text_1797CB
 	msgbox gUnknown_81797DE, 6
 	end
 
 RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C
-	trainerbattle 0, TRAINER_POKEMANIAC_WINSTON, 0, Text_179968, Text_179997
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_WINSTON, 0, Text_179968, Text_179997
 	msgbox gUnknown_81799AC, 6
 	end

data/maps/RocketHideout_B1F/scripts.inc

@@ -13,27 +13,27 @@ RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA
 	end
 
 RocketHideout_B1F_EventScript_1611AE:: @ 81611AE
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_8, 0, Text_174ECA, Text_174EED
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_8, 0, Text_174ECA, Text_174EED
 	msgbox gUnknown_8174EFA, 6
 	end
 
 RocketHideout_B1F_EventScript_1611C5:: @ 81611C5
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_9, 0, Text_174F2C, Text_174F60
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_9, 0, Text_174F2C, Text_174F60
 	msgbox gUnknown_8174F66, 6
 	end
 
 RocketHideout_B1F_EventScript_1611DC:: @ 81611DC
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_10, 0, Text_174F94, Text_174FA4
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_10, 0, Text_174F94, Text_174FA4
 	msgbox gUnknown_8174FB3, 6
 	end
 
 RocketHideout_B1F_EventScript_1611F3:: @ 81611F3
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_11, 0, Text_174FE1, Text_174FF8
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_11, 0, Text_174FE1, Text_174FF8
 	msgbox gUnknown_8175007, 6
 	end
 
 RocketHideout_B1F_EventScript_16120A:: @ 816120A
-	trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_12, 0, Text_17503A, Text_17505A, EventScript_161225
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_12, 0, Text_17503A, Text_17505A, EventScript_161225
 	msgbox gUnknown_8175060, 6
 	end
 

data/maps/RocketHideout_B2F/scripts.inc

@@ -2,6 +2,6 @@ RocketHideout_B2F_MapScripts:: @ 81612A1
 	.byte 0
 
 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_13, 0, Text_17508C, Text_1750BF
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_13, 0, Text_17508C, Text_1750BF
 	msgbox gUnknown_81750CC, 6
 	end

data/maps/RocketHideout_B3F/scripts.inc

@@ -2,11 +2,11 @@ RocketHideout_B3F_MapScripts:: @ 81612B9
 	.byte 0
 
 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_14, 0, Text_17511A, Text_17514A
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_14, 0, Text_17511A, Text_17514A
 	msgbox gUnknown_817515B, 6
 	end
 
 RocketHideout_B3F_EventScript_1612D1:: @ 81612D1
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_15, 0, Text_17519E, Text_1751CE
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_15, 0, Text_17519E, Text_1751CE
 	msgbox gUnknown_81751E0, 6
 	end

data/maps/RocketHideout_B4F/scripts.inc

@@ -24,7 +24,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317
 	waitmessage
 	playbgm MUS_ROCKET, 0
 	waitbuttonpress
-	trainerbattle 3, TRAINER_BOSS_GIOVANNI, 0, Text_175318
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI, 0, Text_175318
 	msgbox gUnknown_817532D
 	fadescreen 1
 	closemessage
@@ -48,7 +48,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363
 	end
 
 RocketHideout_B4F_EventScript_161381:: @ 8161381
-	trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_18, 0, Text_175488, Text_1754B9, EventScript_16139D
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_18, 0, Text_175488, Text_1754B9, EventScript_16139D
 	msgbox gUnknown_81754BD
 	release
 	end
@@ -72,7 +72,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD
 	end
 
 RocketHideout_B4F_EventScript_1613CE:: @ 81613CE
-	trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_16, 0, Text_1753D0, Text_1753FE, EventScript_1613E9
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_16, 0, Text_1753D0, Text_1753FE, EventScript_1613E9
 	msgbox gUnknown_817540C, 6
 	end
 
@@ -90,7 +90,7 @@ EventScript_1613E9:: @ 81613E9
 	end
 
 RocketHideout_B4F_EventScript_161418:: @ 8161418
-	trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_17, 0, Text_175437, Text_175463, EventScript_161433
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_17, 0, Text_175437, Text_175463, EventScript_161433
 	msgbox gUnknown_817546A, 6
 	end
 

data/maps/Route22/scripts.inc

@@ -73,15 +73,15 @@ EventScript_16835B:: @ 816835B
 	return
 
 EventScript_16836D:: @ 816836D
-	trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
+	trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
 	return
 
 EventScript_16837C:: @ 816837C
-	trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
+	trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
 	return
 
 EventScript_16838B:: @ 816838B
-	trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
+	trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
 	return
 
 EventScript_16839A:: @ 816839A
@@ -235,15 +235,15 @@ EventScript_1684A7:: @ 81684A7
 	return
 
 EventScript_1684B9:: @ 81684B9
-	trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, 0, Text_188B08
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, 0, Text_188B08
 	return
 
 EventScript_1684C4:: @ 81684C4
-	trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, 0, Text_188B08
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, 0, Text_188B08
 	return
 
 EventScript_1684CF:: @ 81684CF
-	trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, 0, Text_188B08
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, 0, Text_188B08
 	return
 
 Movement_1684DA:: @ 81684DA

data/maps/Route24/scripts.inc

@@ -60,7 +60,7 @@ EventScript_1686B9:: @ 81686B9
 	playbgm MUS_ROCKET, 0
 	waitbuttonpress
 	setvar VAR_LAST_TALKED, 1
-	trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_6, 0, Text_188DDC
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_6, 0, Text_188DDC
 	msgbox gUnknown_8188DF1
 	setvar VAR_MAP_SCENE_ROUTE24, 1
 	return

data/maps/SSAnne_1F_Room2/scripts.inc

@@ -6,11 +6,11 @@ SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6
 	end
 
 SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF
-	trainerbattle 0, TRAINER_LASS_ANN, 0, Text_173A1A, Text_173A4F
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ANN, 0, Text_173A1A, Text_173A4F
 	msgbox gUnknown_8173A7A, 6
 	end
 
 SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06
-	trainerbattle 0, TRAINER_YOUNGSTER_TYLER, 0, Text_173999, Text_1739B1
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_TYLER, 0, Text_173999, Text_1739B1
 	msgbox gUnknown_81739C5, 6
 	end

data/maps/SSAnne_1F_Room5/scripts.inc

@@ -2,6 +2,6 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66
 	.byte 0
 
 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67
-	trainerbattle 0, TRAINER_GENTLEMAN_ARTHUR, 0, Text_173BD1, Text_173BFA
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_ARTHUR, 0, Text_173BD1, Text_173BFA
 	msgbox gUnknown_8173C30, 6
 	end

data/maps/SSAnne_1F_Room7/scripts.inc

@@ -2,6 +2,6 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E
 	.byte 0
 
 SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F
-	trainerbattle 0, TRAINER_GENTLEMAN_THOMAS, 0, Text_173C52, Text_173CB4
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_THOMAS, 0, Text_173C52, Text_173CB4
 	msgbox gUnknown_8173CC4, 6
 	end

data/maps/SSAnne_2F_Corridor/scripts.inc

@@ -83,15 +83,15 @@ EventScript_1609CA:: @ 81609CA
 	return
 
 EventScript_1609DC:: @ 81609DC
-	trainerbattle 3, TRAINER_RIVAL_SS_ANNE_SQUIRTLE, 0, Text_173110
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_SQUIRTLE, 0, Text_173110
 	return
 
 EventScript_1609E7:: @ 81609E7
-	trainerbattle 3, TRAINER_RIVAL_SS_ANNE_BULBASAUR, 0, Text_173110
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_BULBASAUR, 0, Text_173110
 	return
 
 EventScript_1609F2:: @ 81609F2
-	trainerbattle 3, TRAINER_RIVAL_SS_ANNE_CHARMANDER, 0, Text_173110
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_CHARMANDER, 0, Text_173110
 	return
 
 EventScript_1609FD:: @ 81609FD

data/maps/SSAnne_2F_Room2/scripts.inc

@@ -2,11 +2,11 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0
 	.byte 0
 
 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1
-	trainerbattle 0, TRAINER_FISHERMAN_DALE, 0, Text_173DDB, Text_173DF7
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_DALE, 0, Text_173DDB, Text_173DF7
 	msgbox gUnknown_8173E04, 6
 	end
 
 SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8
-	trainerbattle 0, TRAINER_GENTLEMAN_BROOKS, 0, Text_173D63, Text_173D92
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_BROOKS, 0, Text_173D63, Text_173D92
 	msgbox gUnknown_8173DB6, 6
 	end

data/maps/SSAnne_2F_Room4/scripts.inc

@@ -2,11 +2,11 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2
 	.byte 0
 
 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3
-	trainerbattle 0, TRAINER_GENTLEMAN_LAMAR, 0, Text_173F07, Text_173F42
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_LAMAR, 0, Text_173F07, Text_173F42
 	msgbox gUnknown_8173F55, 6
 	end
 
 SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A
-	trainerbattle 0, TRAINER_LASS_DAWN, 0, Text_173F83, Text_173FAB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_DAWN, 0, Text_173F83, Text_173FAB
 	msgbox gUnknown_8173FB9, 6
 	end

data/maps/SSAnne_B1F_Room1/scripts.inc

@@ -2,11 +2,11 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47
 	.byte 0
 
 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48
-	trainerbattle 0, TRAINER_FISHERMAN_BARNY, 0, Text_174177, Text_1741EF
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_BARNY, 0, Text_174177, Text_1741EF
 	msgbox gUnknown_817420E, 6
 	end
 
 SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F
-	trainerbattle 0, TRAINER_SAILOR_PHILLIP, 0, Text_1740F6, Text_174123
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_PHILLIP, 0, Text_1740F6, Text_174123
 	msgbox gUnknown_817413A, 6
 	end

data/maps/SSAnne_B1F_Room2/scripts.inc

@@ -2,6 +2,6 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76
 	.byte 0
 
 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77
-	trainerbattle 0, TRAINER_SAILOR_HUEY, 0, Text_174239, Text_17425C
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_HUEY, 0, Text_174239, Text_17425C
 	msgbox gUnknown_8174272, 6
 	end

data/maps/SSAnne_B1F_Room3/scripts.inc

@@ -2,6 +2,6 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E
 	.byte 0
 
 SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F
-	trainerbattle 0, TRAINER_SAILOR_DYLAN, 0, Text_1742A6, Text_1742C3
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DYLAN, 0, Text_1742A6, Text_1742C3
 	msgbox gUnknown_81742D2, 6
 	end

data/maps/SSAnne_B1F_Room4/scripts.inc

@@ -2,11 +2,11 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6
 	.byte 0
 
 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7
-	trainerbattle 0, TRAINER_SAILOR_LEONARD, 0, Text_174315, Text_174348
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_LEONARD, 0, Text_174315, Text_174348
 	msgbox gUnknown_8174362, 6
 	end
 
 SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE
-	trainerbattle 0, TRAINER_SAILOR_DUNCAN, 0, Text_174385, Text_1743B3
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DUNCAN, 0, Text_174385, Text_1743B3
 	msgbox gUnknown_81743C8, 6
 	end

data/maps/SSAnne_Deck/scripts.inc

@@ -14,11 +14,11 @@ SSAnne_Deck_EventScript_160A7B:: @ 8160A7B
 	end
 
 SSAnne_Deck_EventScript_160A84:: @ 8160A84
-	trainerbattle 0, TRAINER_SAILOR_EDMOND, 0, Text_173308, Text_17332B
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_EDMOND, 0, Text_173308, Text_17332B
 	msgbox gUnknown_817333E, 6
 	end
 
 SSAnne_Deck_EventScript_160A9B:: @ 8160A9B
-	trainerbattle 0, TRAINER_SAILOR_TREVOR, 0, Text_173382, Text_1733A0
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_TREVOR, 0, Text_173382, Text_1733A0
 	msgbox gUnknown_81733B5, 6
 	end

data/maps/SaffronCity_Dojo/scripts.inc

@@ -123,27 +123,27 @@ SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D
 	end
 
 SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46
-	trainerbattle 0, TRAINER_BLACK_BELT_HITOSHI, 0, Text_19B3DF, Text_19B40F
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HITOSHI, 0, Text_19B3DF, Text_19B40F
 	msgbox gUnknown_819B41F, 6
 	end
 
 SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D
-	trainerbattle 0, TRAINER_BLACK_BELT_HIDEKI, 0, Text_19B2E0, Text_19B2FD
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HIDEKI, 0, Text_19B2E0, Text_19B2FD
 	msgbox gUnknown_819B30F, 6
 	end
 
 SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74
-	trainerbattle 0, TRAINER_BLACK_BELT_AARON, 0, Text_19B341, Text_19B396
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_AARON, 0, Text_19B341, Text_19B396
 	msgbox gUnknown_819B3AC, 6
 	end
 
 SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B
-	trainerbattle 0, TRAINER_BLACK_BELT_MIKE, 0, Text_19B275, Text_19B292
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_MIKE, 0, Text_19B275, Text_19B292
 	msgbox gUnknown_819B29D, 6
 	end
 
 SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2
-	trainerbattle 2, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0
 	checkflag FLAG_GOT_HITMON_FROM_DOJO
 	goto_if TRUE, EventScript_16EDC6
 	msgbox gUnknown_819B1A7, 6

data/maps/SaffronCity_Gym/scripts.inc

@@ -3,7 +3,7 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7
 
 SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
 	famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A
 	checkflag FLAG_GOT_TM04_FROM_SABRINA
 	goto_if FALSE, EventScript_16EE3D
 	msgbox gUnknown_819B7F2
@@ -38,38 +38,38 @@ EventScript_16EE7E:: @ 816EE7E
 	end
 
 SaffronCity_Gym_EventScript_16EE88:: @ 816EE88
-	trainerbattle 0, TRAINER_PSYCHIC_JOHAN, 0, Text_19B936, Text_19B957
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_JOHAN, 0, Text_19B936, Text_19B957
 	msgbox gUnknown_819B96D, 6
 	end
 
 SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F
-	trainerbattle 0, TRAINER_PSYCHIC_TYRON, 0, Text_19BA45, Text_19BA9E
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_TYRON, 0, Text_19BA45, Text_19BA9E
 	famechecker FAMECHECKER_SABRINA, 5
 	msgbox gUnknown_819BAB4, 6
 	end
 
 SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3
-	trainerbattle 0, TRAINER_PSYCHIC_CAMERON, 0, Text_19BB49, Text_19BBA1
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_CAMERON, 0, Text_19BB49, Text_19BBA1
 	msgbox gUnknown_819BBB3, 6
 	end
 
 SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA
-	trainerbattle 0, TRAINER_PSYCHIC_PRESTON, 0, Text_19BC57, Text_19BCBC
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_PRESTON, 0, Text_19BC57, Text_19BCBC
 	msgbox gUnknown_819BCC4, 6
 	end
 
 SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1
-	trainerbattle 0, TRAINER_CHANNELER_AMANDA, 0, Text_19B86A, Text_19B8A8
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_AMANDA, 0, Text_19B86A, Text_19B8A8
 	msgbox gUnknown_819B8B9, 6
 	end
 
 SaffronCity_Gym_EventScript_16EF08:: @ 816EF08
-	trainerbattle 0, TRAINER_CHANNELER_STACY, 0, Text_19B998, Text_19B9EC
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_STACY, 0, Text_19B998, Text_19B9EC
 	msgbox gUnknown_819B9F7, 6
 	end
 
 SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F
-	trainerbattle 0, TRAINER_CHANNELER_TASHA, 0, Text_19BAE8, Text_19BB0D
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_TASHA, 0, Text_19BAE8, Text_19BB0D
 	msgbox gUnknown_819BB1F, 6
 	end
 

data/maps/SilphCo_10F/scripts.inc

@@ -26,11 +26,11 @@ SilphCo_10F_EventScript_161DB7:: @ 8161DB7
 	end
 
 SilphCo_10F_EventScript_161DC0:: @ 8161DC0
-	trainerbattle 0, TRAINER_SCIENTIST_TRAVIS, 0, Text_176D57, Text_176D73
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TRAVIS, 0, Text_176D57, Text_176D73
 	msgbox gUnknown_8176D86, 6
 	end
 
 SilphCo_10F_EventScript_161DD7:: @ 8161DD7
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_39, 0, Text_176CED, Text_176D18
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_39, 0, Text_176CED, Text_176D18
 	msgbox gUnknown_8176D25, 6
 	end

data/maps/SilphCo_11F/scripts.inc

@@ -77,7 +77,7 @@ EventScript_161EA0:: @ 8161EA0
 	compare_var_to_value VAR_0x4001, 1
 	call_if eq, EventScript_161F12
 	setvar VAR_LAST_TALKED, 3
-	trainerbattle 3, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB
 	msgbox gUnknown_81771C2
 	closemessage
 	fadescreen 1
@@ -134,11 +134,11 @@ SilphCo_11F_EventScript_161F37:: @ 8161F37
 	end
 
 SilphCo_11F_EventScript_161F40:: @ 8161F40
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_40, 0, Text_1772B8, Text_1772E7
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_40, 0, Text_1772B8, Text_1772E7
 	msgbox gUnknown_81772F9, 6
 	end
 
 SilphCo_11F_EventScript_161F57:: @ 8161F57
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_41, 0, Text_17726A, Text_17728C
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_41, 0, Text_17726A, Text_17728C
 	msgbox gUnknown_817729B, 6
 	end

data/maps/SilphCo_2F/scripts.inc

@@ -20,21 +20,21 @@ SilphCo_2F_EventScript_161660:: @ 8161660
 	end
 
 SilphCo_2F_EventScript_161669:: @ 8161669
-	trainerbattle 0, TRAINER_SCIENTIST_CONNOR, 0, Text_175562, Text_17557E
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_CONNOR, 0, Text_175562, Text_17557E
 	msgbox gUnknown_817559F, 6
 	end
 
 SilphCo_2F_EventScript_161680:: @ 8161680
-	trainerbattle 0, TRAINER_SCIENTIST_JERRY, 0, Text_1755C6, Text_1755E5
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JERRY, 0, Text_1755C6, Text_1755E5
 	msgbox gUnknown_81755F2, 6
 	end
 
 SilphCo_2F_EventScript_161697:: @ 8161697
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_23, 0, Text_17562D, Text_17564A
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_23, 0, Text_17562D, Text_17564A
 	msgbox gUnknown_8175651, 6
 	end
 
 SilphCo_2F_EventScript_1616AE:: @ 81616AE
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_24, 0, Text_1756AD, Text_1756D8
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_24, 0, Text_1756AD, Text_1756D8
 	msgbox gUnknown_81756E2, 6
 	end

data/maps/SilphCo_3F/scripts.inc

@@ -28,11 +28,11 @@ SilphCo_3F_EventScript_1616FF:: @ 81616FF
 	end
 
 SilphCo_3F_EventScript_161708:: @ 8161708
-	trainerbattle 0, TRAINER_SCIENTIST_JOSE, 0, Text_175948, Text_17597D
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSE, 0, Text_175948, Text_17597D
 	msgbox gUnknown_8175990, 6
 	end
 
 SilphCo_3F_EventScript_16171F:: @ 816171F
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_25, 0, Text_1758F6, Text_175911
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_25, 0, Text_1758F6, Text_175911
 	msgbox gUnknown_817591C, 6
 	end

data/maps/SilphCo_4F/scripts.inc

@@ -28,16 +28,16 @@ SilphCo_4F_EventScript_161770:: @ 8161770
 	end
 
 SilphCo_4F_EventScript_161779:: @ 8161779
-	trainerbattle 0, TRAINER_SCIENTIST_RODNEY, 0, Text_175A90, Text_175AB0
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_RODNEY, 0, Text_175A90, Text_175AB0
 	msgbox gUnknown_8175AC8, 6
 	end
 
 SilphCo_4F_EventScript_161790:: @ 8161790
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_26, 0, Text_175A2F, Text_175A5B
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_26, 0, Text_175A2F, Text_175A5B
 	msgbox gUnknown_8175A62, 6
 	end
 
 SilphCo_4F_EventScript_1617A7:: @ 81617A7
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_27, 0, Text_175B19, Text_175B2B
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_27, 0, Text_175B19, Text_175B2B
 	msgbox gUnknown_8175B38, 6
 	end

data/maps/SilphCo_5F/scripts.inc

@@ -42,21 +42,21 @@ SilphCo_5F_EventScript_16181C:: @ 816181C
 	end
 
 SilphCo_5F_EventScript_161825:: @ 8161825
-	trainerbattle 0, TRAINER_SCIENTIST_BEAU, 0, Text_175C40, Text_175C6D
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_BEAU, 0, Text_175C40, Text_175C6D
 	msgbox gUnknown_8175C7D, 6
 	end
 
 SilphCo_5F_EventScript_16183C:: @ 816183C
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_28, 0, Text_175BE5, Text_175C09
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_28, 0, Text_175BE5, Text_175C09
 	msgbox gUnknown_8175C0F, 6
 	end
 
 SilphCo_5F_EventScript_161853:: @ 8161853
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_29, 0, Text_175D28, Text_175D4B
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_29, 0, Text_175D28, Text_175D4B
 	msgbox gUnknown_8175D59, 6
 	end
 
 SilphCo_5F_EventScript_16186A:: @ 816186A
-	trainerbattle 0, TRAINER_JUGGLER_DALTON, 0, Text_175CBD, Text_175CEB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_DALTON, 0, Text_175CBD, Text_175CEB
 	msgbox gUnknown_8175CF9, 6
 	end

data/maps/SilphCo_6F/scripts.inc

@@ -82,16 +82,16 @@ SilphCo_6F_EventScript_161936:: @ 8161936
 	end
 
 SilphCo_6F_EventScript_16193F:: @ 816193F
-	trainerbattle 0, TRAINER_SCIENTIST_TAYLOR, 0, Text_176136, Text_1761BD
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TAYLOR, 0, Text_176136, Text_1761BD
 	msgbox gUnknown_81761C4, 6
 	end
 
 SilphCo_6F_EventScript_161956:: @ 8161956
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_30, 0, Text_1760DE, Text_176104
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_30, 0, Text_1760DE, Text_176104
 	msgbox gUnknown_817610F, 6
 	end
 
 SilphCo_6F_EventScript_16196D:: @ 816196D
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_31, 0, Text_1761F1, Text_17620E
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_31, 0, Text_1761F1, Text_17620E
 	msgbox gUnknown_817621B, 6
 	end

data/maps/SilphCo_7F/scripts.inc

@@ -83,15 +83,15 @@ EventScript_161A7F:: @ 8161A7F
 	return
 
 EventScript_161A80:: @ 8161A80
-	trainerbattle 3, TRAINER_RIVAL_SILPH_SQUIRTLE, 0, Text_1767D0
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_SQUIRTLE, 0, Text_1767D0
 	return
 
 EventScript_161A8B:: @ 8161A8B
-	trainerbattle 3, TRAINER_RIVAL_SILPH_BULBASAUR, 0, Text_1767D0
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_BULBASAUR, 0, Text_1767D0
 	return
 
 EventScript_161A96:: @ 8161A96
-	trainerbattle 3, TRAINER_RIVAL_SILPH_CHARMANDER, 0, Text_1767D0
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_CHARMANDER, 0, Text_1767D0
 	return
 
 EventScript_161AA1:: @ 8161AA1
@@ -243,21 +243,21 @@ SilphCo_7F_EventScript_161BFA:: @ 8161BFA
 	end
 
 SilphCo_7F_EventScript_161C03:: @ 8161C03
-	trainerbattle 0, TRAINER_SCIENTIST_JOSHUA, 0, Text_1765E2, Text_17660C
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSHUA, 0, Text_1765E2, Text_17660C
 	msgbox gUnknown_8176616, 6
 	end
 
 SilphCo_7F_EventScript_161C1A:: @ 8161C1A
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_33, 0, Text_176643, Text_176669
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_33, 0, Text_176643, Text_176669
 	msgbox gUnknown_8176681, 6
 	end
 
 SilphCo_7F_EventScript_161C31:: @ 8161C31
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_34, 0, Text_1766B3, Text_1766D7
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_34, 0, Text_1766B3, Text_1766D7
 	msgbox gUnknown_81766E5, 6
 	end
 
 SilphCo_7F_EventScript_161C48:: @ 8161C48
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_35, 0, Text_176586, Text_1765A5
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_35, 0, Text_176586, Text_1765A5
 	msgbox gUnknown_81765B1, 6
 	end

data/maps/SilphCo_8F/scripts.inc

@@ -26,16 +26,16 @@ SilphCo_8F_EventScript_161C90:: @ 8161C90
 	end
 
 SilphCo_8F_EventScript_161C99:: @ 8161C99
-	trainerbattle 0, TRAINER_SCIENTIST_PARKER, 0, Text_1769FD, Text_176A19
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_PARKER, 0, Text_1769FD, Text_176A19
 	msgbox gUnknown_8176A26, 6
 	end
 
 SilphCo_8F_EventScript_161CB0:: @ 8161CB0
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_32, 0, Text_1769A2, Text_1769BE
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_32, 0, Text_1769A2, Text_1769BE
 	msgbox gUnknown_81769CF, 6
 	end
 
 SilphCo_8F_EventScript_161CC7:: @ 8161CC7
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_36, 0, Text_176A56, Text_176A7C
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_36, 0, Text_176A56, Text_176A7C
 	msgbox gUnknown_8176A90, 6
 	end

data/maps/SilphCo_9F/scripts.inc

@@ -35,16 +35,16 @@ SilphCo_9F_EventScript_161D38:: @ 8161D38
 	end
 
 SilphCo_9F_EventScript_161D41:: @ 8161D41
-	trainerbattle 0, TRAINER_SCIENTIST_ED, 0, Text_176BFB, Text_176C2B
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_ED, 0, Text_176BFB, Text_176C2B
 	msgbox gUnknown_8176C3C, 6
 	end
 
 SilphCo_9F_EventScript_161D58:: @ 8161D58
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_37, 0, Text_176BA3, Text_176BC8
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_37, 0, Text_176BA3, Text_176BC8
 	msgbox gUnknown_8176BD0, 6
 	end
 
 SilphCo_9F_EventScript_161D6F:: @ 8161D6F
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_38, 0, Text_176C7A, Text_176CA0
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_38, 0, Text_176C7A, Text_176CA0
 	msgbox gUnknown_8176CB8, 6
 	end

data/maps/SixIsland_OutcastIsland/scripts.inc

@@ -2,6 +2,6 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15
 	.byte 0
 
 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16
-	trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_46, 0, Text_18B35A, Text_18B3C2
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_46, 0, Text_18B35A, Text_18B3C2
 	msgbox gUnknown_818B3C8, 6
 	end

data/maps/SixIsland_PatternBush/scripts.inc

@@ -20,61 +20,61 @@ EventScript_164587:: @ 8164587
 	return
 
 SixIsland_PatternBush_EventScript_164590:: @ 8164590
-	trainerbattle 0, TRAINER_PKMN_BREEDER_BETHANY, 0, Text_17BF3A, Text_17BF66
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_BETHANY, 0, Text_17BF3A, Text_17BF66
 	msgbox gUnknown_817BF97, 6
 	end
 
 SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7
-	trainerbattle 0, TRAINER_PKMN_BREEDER_ALLISON, 0, Text_17BFEB, Text_17C028
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_ALLISON, 0, Text_17BFEB, Text_17C028
 	msgbox gUnknown_817C056, 6
 	end
 
 SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE
-	trainerbattle 0, TRAINER_BUG_CATCHER_GARRET, 0, Text_17C0BE, Text_17C0F2
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_GARRET, 0, Text_17C0BE, Text_17C0F2
 	msgbox gUnknown_817C113, 6
 	end
 
 SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5
-	trainerbattle 0, TRAINER_BUG_CATCHER_JONAH, 0, Text_17C155, Text_17C196
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_JONAH, 0, Text_17C155, Text_17C196
 	msgbox gUnknown_817C1D0, 6
 	end
 
 SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC
-	trainerbattle 0, TRAINER_BUG_CATCHER_VANCE, 0, Text_17C246, Text_17C275
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_VANCE, 0, Text_17C246, Text_17C275
 	msgbox gUnknown_817C2A4, 6
 	end
 
 SixIsland_PatternBush_EventScript_164603:: @ 8164603
-	trainerbattle 0, TRAINER_YOUNGSTER_NASH, 0, Text_17C2D9, Text_17C30D
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_NASH, 0, Text_17C2D9, Text_17C30D
 	msgbox gUnknown_817C31C, 6
 	end
 
 SixIsland_PatternBush_EventScript_16461A:: @ 816461A
-	trainerbattle 0, TRAINER_YOUNGSTER_CORDELL, 0, Text_17C373, Text_17C3A5
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CORDELL, 0, Text_17C373, Text_17C3A5
 	msgbox gUnknown_817C3CE, 6
 	end
 
 SixIsland_PatternBush_EventScript_164631:: @ 8164631
-	trainerbattle 0, TRAINER_LASS_DALIA, 0, Text_17C42B, Text_17C458
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_DALIA, 0, Text_17C42B, Text_17C458
 	msgbox gUnknown_817C490, 6
 	end
 
 SixIsland_PatternBush_EventScript_164648:: @ 8164648
-	trainerbattle 0, TRAINER_LASS_JOANA, 0, Text_17C4FE, Text_17C552
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JOANA, 0, Text_17C4FE, Text_17C552
 	msgbox gUnknown_817C590, 6
 	end
 
 SixIsland_PatternBush_EventScript_16465F:: @ 816465F
-	trainerbattle 0, TRAINER_CAMPER_RILEY, 0, Text_17C5DB, Text_17C609
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_RILEY, 0, Text_17C5DB, Text_17C609
 	msgbox gUnknown_817C615, 6
 	end
 
 SixIsland_PatternBush_EventScript_164676:: @ 8164676
-	trainerbattle 0, TRAINER_PICNICKER_MARCY, 0, Text_17C63E, Text_17C660
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MARCY, 0, Text_17C63E, Text_17C660
 	msgbox gUnknown_817C68E, 6
 	end
 
 SixIsland_PatternBush_EventScript_16468D:: @ 816468D
-	trainerbattle 0, TRAINER_RUIN_MANIAC_LAYTON, 0, Text_17C6C9, Text_17C6FB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAYTON, 0, Text_17C6C9, Text_17C6FB
 	msgbox gUnknown_817C728, 6
 	end

data/maps/ThreeIsland/scripts.inc

@@ -227,7 +227,7 @@ EventScript_167A59:: @ 8167A59
 	goto_if eq, EventScript_167C35
 	msgbox gUnknown_818247D
 	setvar VAR_LAST_TALKED, 5
-	trainerbattle 3, TRAINER_BIKER_GOON, 0, Text_1824B7
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON, 0, Text_1824B7
 	applymovement 5, Movement_167C5C
 	waitmovement 0
 	msgbox gUnknown_81824CF
@@ -237,7 +237,7 @@ EventScript_167A59:: @ 8167A59
 	playbgm MUS_SHOUNEN, 0
 	msgbox gUnknown_81824EF
 	setvar VAR_LAST_TALKED, 7
-	trainerbattle 3, TRAINER_BIKER_GOON_2, 0, Text_182521
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON_2, 0, Text_182521
 	applymovement 7, Movement_167C5C
 	waitmovement 0
 	msgbox gUnknown_8182536
@@ -247,7 +247,7 @@ EventScript_167A59:: @ 8167A59
 	playbgm MUS_SHOUNEN, 0
 	msgbox gUnknown_8182582
 	setvar VAR_LAST_TALKED, 4
-	trainerbattle 3, TRAINER_BIKER_GOON_3, 0, Text_1825D4
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON_3, 0, Text_1825D4
 	applymovement 4, Movement_1A75E7
 	waitmovement 0
 	applymovement 6, Movement_1A75ED
@@ -269,7 +269,7 @@ EventScript_167A59:: @ 8167A59
 	playbgm MUS_SHOUNEN, 0
 	msgbox gUnknown_8182623
 	setvar VAR_LAST_TALKED, 3
-	trainerbattle 3, TRAINER_CUE_BALL_PAXTON, 0, Text_1826B7
+	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CUE_BALL_PAXTON, 0, Text_1826B7
 	msgbox gUnknown_818271D
 	closemessage
 	fadescreen 1

data/maps/VermilionCity_Gym/scripts.inc

@@ -209,7 +209,7 @@ EventScript_16B8EF:: @ 816B8EF
 
 VermilionCity_Gym_EventScript_16B94A:: @ 816B94A
 	famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C
 	checkflag FLAG_GOT_TM34_FROM_SURGE
 	goto_if FALSE, EventScript_16B9AF
 	msgbox gUnknown_8194C8E
@@ -249,18 +249,18 @@ EventScript_16B9F0:: @ 816B9F0
 	end
 
 VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA
-	trainerbattle 0, TRAINER_SAILOR_DWAYNE, 0, Text_194FBD, Text_194FF1
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DWAYNE, 0, Text_194FBD, Text_194FF1
 	famechecker FAMECHECKER_LTSURGE, 4
 	msgbox gUnknown_8195004, 6
 	end
 
 VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E
-	trainerbattle 0, TRAINER_ENGINEER_BAILY, 0, Text_194F1F, Text_194F6F
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BAILY, 0, Text_194F1F, Text_194F6F
 	msgbox gUnknown_8194F76, 6
 	end
 
 VermilionCity_Gym_EventScript_16BA35:: @ 816BA35
-	trainerbattle 2, TRAINER_GENTLEMAN_TUCKER, 0, Text_194E57, Text_194EA5, EventScript_16BA5D
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GENTLEMAN_TUCKER, 0, Text_194E57, Text_194EA5, EventScript_16BA5D
 	famechecker FAMECHECKER_LTSURGE, 3
 	msgbox gUnknown_8194EBD, 6
 	end

data/maps/VictoryRoad_1F/scripts.inc

@@ -36,11 +36,11 @@ EventScript_160F62:: @ 8160F62
 	end
 
 VictoryRoad_1F_EventScript_160F64:: @ 8160F64
-	trainerbattle 0, TRAINER_COOLTRAINER_NAOMI, 0, Text_174710, Text_174738
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_NAOMI, 0, Text_174710, Text_174738
 	msgbox gUnknown_8174744, 6
 	end
 
 VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B
-	trainerbattle 0, TRAINER_COOLTRAINER_ROLANDO, 0, Text_174784, Text_1747B8
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_ROLANDO, 0, Text_174784, Text_1747B8
 	msgbox gUnknown_81747C8, 6
 	end

data/maps/VictoryRoad_2F/scripts.inc

@@ -56,26 +56,26 @@ EventScript_161035:: @ 8161035
 	end
 
 VictoryRoad_2F_EventScript_161037:: @ 8161037
-	trainerbattle 0, TRAINER_POKEMANIAC_DAWSON, 0, Text_1747EF, Text_17482C
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_DAWSON, 0, Text_1747EF, Text_17482C
 	msgbox gUnknown_817483E, 6
 	end
 
 VictoryRoad_2F_EventScript_16104E:: @ 816104E
-	trainerbattle 0, TRAINER_BLACK_BELT_DAISUKE, 0, Text_174877, Text_1748B4
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_DAISUKE, 0, Text_174877, Text_1748B4
 	msgbox gUnknown_81748BB, 6
 	end
 
 VictoryRoad_2F_EventScript_161065:: @ 8161065
-	trainerbattle 0, TRAINER_JUGGLER_NELSON, 0, Text_1748EE, Text_17491B
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NELSON, 0, Text_1748EE, Text_17491B
 	msgbox gUnknown_8174927, 6
 	end
 
 VictoryRoad_2F_EventScript_16107C:: @ 816107C
-	trainerbattle 0, TRAINER_JUGGLER_GREGORY, 0, Text_174995, Text_1749B0
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_GREGORY, 0, Text_174995, Text_1749B0
 	msgbox gUnknown_81749BB, 6
 	end
 
 VictoryRoad_2F_EventScript_161093:: @ 8161093
-	trainerbattle 0, TRAINER_TAMER_VINCENT, 0, Text_174942, Text_17495A
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_VINCENT, 0, Text_174942, Text_17495A
 	msgbox gUnknown_8174969, 6
 	end

data/maps/VictoryRoad_3F/scripts.inc

@@ -32,31 +32,31 @@ EventScript_161101:: @ 8161101
 	end
 
 VictoryRoad_3F_EventScript_161103:: @ 8161103
-	trainerbattle 0, TRAINER_COOLTRAINER_GEORGE, 0, Text_174B60, Text_174B83
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_GEORGE, 0, Text_174B60, Text_174B83
 	msgbox gUnknown_8174B99, 6
 	end
 
 VictoryRoad_3F_EventScript_16111A:: @ 816111A
-	trainerbattle 0, TRAINER_COOLTRAINER_COLBY, 0, Text_174C8A, Text_174CA9
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_COLBY, 0, Text_174C8A, Text_174CA9
 	msgbox gUnknown_8174CBD, 6
 	end
 
 VictoryRoad_3F_EventScript_161131:: @ 8161131
-	trainerbattle 0, TRAINER_COOLTRAINER_CAROLINE, 0, Text_174C30, Text_174C5A
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_CAROLINE, 0, Text_174C30, Text_174C5A
 	msgbox gUnknown_8174C67, 6
 	end
 
 VictoryRoad_3F_EventScript_161148:: @ 8161148
-	trainerbattle 0, TRAINER_COOLTRAINER_ALEXA, 0, Text_174BCA, Text_174BF4
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_ALEXA, 0, Text_174BCA, Text_174BF4
 	msgbox gUnknown_8174C03, 6
 	end
 
 VictoryRoad_3F_EventScript_16115F:: @ 816115F
-	trainerbattle 4, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174D0C, Text_174D45, Text_174D96
+	trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174D0C, Text_174D45, Text_174D96
 	msgbox gUnknown_8174D64, 6
 	end
 
 VictoryRoad_3F_EventScript_16117A:: @ 816117A
-	trainerbattle 4, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174E08, Text_174E39, Text_174E8D
+	trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174E08, Text_174E39, Text_174E8D
 	msgbox gUnknown_8174E48, 6
 	end

data/maps/ViridianCity_Gym/scripts.inc

@@ -3,7 +3,7 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9
 
 ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
 	famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle 1, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04
 	checkflag FLAG_GOT_TM26_FROM_GIOVANNI
 	goto_if FALSE, EventScript_169F2F
 	msgbox gUnknown_818F4A2
@@ -42,42 +42,42 @@ EventScript_169F70:: @ 8169F70
 	end
 
 ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A
-	trainerbattle 0, TRAINER_TAMER_JASON, 0, Text_18F7F3, Text_18F824
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_JASON, 0, Text_18F7F3, Text_18F824
 	msgbox gUnknown_818F840, 6
 	end
 
 ViridianCity_Gym_EventScript_169F91:: @ 8169F91
-	trainerbattle 0, TRAINER_TAMER_COLE, 0, Text_18F98A, Text_18F9BB
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_COLE, 0, Text_18F98A, Text_18F9BB
 	msgbox gUnknown_818F9CC, 6
 	end
 
 ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8
-	trainerbattle 0, TRAINER_BLACK_BELT_ATSUSHI, 0, Text_18F7AD, Text_18F7D6
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_ATSUSHI, 0, Text_18F7AD, Text_18F7D6
 	msgbox gUnknown_818F7DD, 6
 	end
 
 ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF
-	trainerbattle 0, TRAINER_BLACK_BELT_KIYO, 0, Text_18F86C, Text_18F899
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_KIYO, 0, Text_18F86C, Text_18F899
 	msgbox gUnknown_818F8A0, 6
 	end
 
 ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6
-	trainerbattle 0, TRAINER_BLACK_BELT_TAKASHI, 0, Text_18F92C, Text_18F95A
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_TAKASHI, 0, Text_18F92C, Text_18F95A
 	msgbox gUnknown_818F960, 6
 	end
 
 ViridianCity_Gym_EventScript_169FED:: @ 8169FED
-	trainerbattle 0, TRAINER_COOLTRAINER_SAMUEL, 0, Text_18F9E7, Text_18FA2D
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_SAMUEL, 0, Text_18F9E7, Text_18FA2D
 	msgbox gUnknown_818FA3B, 6
 	end
 
 ViridianCity_Gym_EventScript_16A004:: @ 816A004
-	trainerbattle 0, TRAINER_COOLTRAINER_YUJI, 0, Text_18F73B, Text_18F769
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_YUJI, 0, Text_18F73B, Text_18F769
 	msgbox gUnknown_818F77B, 6
 	end
 
 ViridianCity_Gym_EventScript_16A01B:: @ 816A01B
-	trainerbattle 0, TRAINER_COOLTRAINER_WARREN, 0, Text_18F8CB, Text_18F8EE
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_WARREN, 0, Text_18F8CB, Text_18F8EE
 	msgbox gUnknown_818F8FE, 6
 	end
 

data/maps/ViridianForest/scripts.inc

@@ -39,26 +39,26 @@ ViridianForest_EventScript_160568:: @ 8160568
 	end
 
 ViridianForest_EventScript_160571:: @ 8160571
-	trainerbattle 0, TRAINER_BUG_CATCHER_RICK, 0, Text_1722C7, Text_1722F9
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_RICK, 0, Text_1722C7, Text_1722F9
 	msgbox gUnknown_8172315, 6
 	end
 
 ViridianForest_EventScript_160588:: @ 8160588
-	trainerbattle 0, TRAINER_BUG_CATCHER_DOUG, 0, Text_17234A, Text_17237D
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_DOUG, 0, Text_17234A, Text_17237D
 	msgbox gUnknown_8172398, 6
 	end
 
 ViridianForest_EventScript_16059F:: @ 816059F
-	trainerbattle 0, TRAINER_BUG_CATCHER_SAMMY, 0, Text_1723D4, Text_172402
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_SAMMY, 0, Text_1723D4, Text_172402
 	msgbox gUnknown_817241F, 6
 	end
 
 ViridianForest_EventScript_1605B6:: @ 81605B6
-	trainerbattle 0, TRAINER_BUG_CATCHER_ANTHONY, 0, Text_172482, Text_1724BF
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ANTHONY, 0, Text_172482, Text_1724BF
 	msgbox gUnknown_81724DC, 6
 	end
 
 ViridianForest_EventScript_1605CD:: @ 81605CD
-	trainerbattle 0, TRAINER_BUG_CATCHER_CHARLIE, 0, Text_1724F9, Text_17251B
+	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CHARLIE, 0, Text_1724F9, Text_17251B
 	msgbox gUnknown_8172527, 6
 	end

include/constants/battle_anim.h

@@ -377,7 +377,6 @@
 #define B_ANIM_SWITCH_OUT_PLAYER_MON    0x1
 #define B_ANIM_SWITCH_OUT_OPPONENT_MON  0x2
 #define B_ANIM_BALL_THROW               0x3
-#define B_ANIM_SP_4                     0x4 // this one is used in battle_controller_oak_old_man
 #define B_ANIM_SAFARI_BALL_THROW        0x4
 #define B_ANIM_SUBSTITUTE_TO_MON        0x5
 #define B_ANIM_MON_TO_SUBSTITUTE        0x6

include/constants/map_types.h

@@ -12,17 +12,4 @@
 #define MAP_TYPE_INDOOR      8
 #define MAP_TYPE_SECRET_BASE 9
 
-enum
-{
-    MAP_BATTLE_SCENE_NORMAL,       // 0
-    MAP_BATTLE_SCENE_GYM,          // 1
-    MAP_BATTLE_SCENE_MAGMA,        // 2
-    MAP_BATTLE_SCENE_AQUA,         // 3
-    MAP_BATTLE_SCENE_SIDNEY,       // 4
-    MAP_BATTLE_SCENE_PHOEBE,       // 5
-    MAP_BATTLE_SCENE_GLACIA,       // 6
-    MAP_BATTLE_SCENE_DRAKE,        // 7
-    MAP_BATTLE_SCENE_BATTLE_TOWER, // 8
-};
-
 #endif  // GUARD_CONSTANTS_MAP_TYPES_H

src/battle_controller_oak_old_man.c

@@ -1663,7 +1663,7 @@ static void OakOldManHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SP_4);
+    InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
     gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
 }
 
@@ -1673,7 +1673,7 @@ static void OakOldManHandleBallThrowAnim(void)
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SP_4);
+    InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
     gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
 }
 

src/fame_checker.c

@@ -26,6 +26,7 @@
 #include "menu_indicators.h"
 #include "text_window.h"
 #include "fame_checker.h"
+#include "constants/trainers.h"
 
 #define SPRITETAG_SELECTOR_CURSOR 1000
 #define SPRITETAG_QUESTION_MARK 1001
@@ -878,7 +879,7 @@ static void FC_DestroyWindow(u8 windowId)
 
 static u8 AdjustGiovanniIndexIfBeatenInGym(u8 a0)
 {
-    if (HasTrainerBeenFought(0x15e) == TRUE)
+    if (HasTrainerBeenFought(TRAINER_LEADER_GIOVANNI) == TRUE)
     {
         if (a0 == 9)
             return FAMECHECKER_GIOVANNI;

src/item.c

@@ -73,7 +73,7 @@ void CopyItemName(u16 itemId, u8 * dest)
 {
     if (itemId == ITEM_ENIGMA_BERRY)
     {
-        StringCopy(dest, GetBerryInfo(43)->name);
+        StringCopy(dest, GetBerryInfo(ITEM_TO_BERRY(ITEM_ENIGMA_BERRY))->name);
         StringAppend(dest, gUnknown_84162BD);
     }
     else