progress #1 on porting battle_util

asm/battle_2.s

@@ -4849,7 +4849,7 @@ sub_8012434: @ 8012434
 	mov r12, r1
 	ldr r0, _080126D4 @ =gUnknown_2023DA0
 	mov r9, r0
-	ldr r1, _080126D8 @ =gLastUsedMove
+	ldr r1, _080126D8 @ =gLastMoves
 	mov r8, r1
 	ldr r4, _080126DC @ =gDisableStructs
 	movs r5, 0
@@ -5174,7 +5174,7 @@ _080126AE:
 _080126CC: .4byte gUnknown_2023DB0
 _080126D0: .4byte gUnknown_2023DA8
 _080126D4: .4byte gUnknown_2023DA0
-_080126D8: .4byte gLastUsedMove
+_080126D8: .4byte gLastMoves
 _080126DC: .4byte gDisableStructs
 _080126E0: .4byte gUnknown_2023D90
 _080126E4: .4byte gUnknown_2023DB8
@@ -5579,7 +5579,7 @@ _08012A1A:
 	mov r1, r12
 	ldrb r0, [r1]
 	lsls r0, 1
-	ldr r3, _08012BAC @ =gLastUsedMove
+	ldr r3, _08012BAC @ =gLastMoves
 	adds r0, r3
 	movs r3, 0
 	strh r2, [r0]
@@ -5757,7 +5757,7 @@ _08012B9C: .4byte gMoveSelectionCursor
 _08012BA0: .4byte gCurrentMove
 _08012BA4: .4byte gBattleMoves
 _08012BA8: .4byte gMoveResultFlags
-_08012BAC: .4byte gLastUsedMove
+_08012BAC: .4byte gLastMoves
 _08012BB0: .4byte gUnknown_2023DA0
 _08012BB4: .4byte gUnknown_2023DA8
 _08012BB8: .4byte gUnknown_2023DB0
@@ -6047,7 +6047,7 @@ _08012CA8:
 	strb r1, [r0, 0x16]
 	ldrb r0, [r7]
 	lsls r0, 1
-	ldr r1, _08012F8C @ =gLastUsedMove
+	ldr r1, _08012F8C @ =gLastMoves
 	adds r0, r1
 	movs r3, 0
 	strh r2, [r0]
@@ -6249,7 +6249,7 @@ _08012F7C: .4byte gDisableStructs
 _08012F80: .4byte 0xfbffffff
 _08012F84: .4byte gBattleStruct
 _08012F88: .4byte 0xffff1fff
-_08012F8C: .4byte gLastUsedMove
+_08012F8C: .4byte gLastMoves
 _08012F90: .4byte gUnknown_2023DA0
 _08012F94: .4byte gUnknown_2023DA8
 _08012F98: .4byte gUnknown_2023DB0

asm/battle_script_commands.s

@@ -12270,7 +12270,7 @@ _080238E8:
 	ands r0, r1
 	cmp r0, 0
 	beq _0802394C
-	ldr r0, _08023940 @ =gLastUsedMove
+	ldr r0, _08023940 @ =gLastMoves
 	lsls r1, r4, 1
 	adds r1, r0
 	ldr r0, _0802392C @ =gChosenMove
@@ -12297,11 +12297,11 @@ _08023930: .4byte gAbsentBattlerFlags
 _08023934: .4byte gBitTable
 _08023938: .4byte gBattleStruct
 _0802393C: .4byte gBattleMoves
-_08023940: .4byte gLastUsedMove
+_08023940: .4byte gLastMoves
 _08023944: .4byte gUnknown_2023DB0
 _08023948: .4byte gCurrentMove
 _0802394C:
-	ldr r1, _080239B4 @ =gLastUsedMove
+	ldr r1, _080239B4 @ =gLastMoves
 	lsls r0, r4, 1
 	adds r0, r1
 	ldr r1, _080239B8 @ =0x0000ffff
@@ -12355,7 +12355,7 @@ _08023984:
 	strh r3, [r0]
 	b _08023A2C
 	.align 2, 0
-_080239B4: .4byte gLastUsedMove
+_080239B4: .4byte gLastMoves
 _080239B8: .4byte 0x0000ffff
 _080239BC: .4byte gUnknown_2023DB0
 _080239C0: .4byte gBattlerTarget
@@ -23783,7 +23783,7 @@ atk9D_mimicattackcopy: @ 8029578
 	ldr r1, _080295F4 @ =0x0000ffff
 	adds r7, r1, 0
 	strh r7, [r0]
-	ldr r5, _080295F8 @ =gLastUsedMove
+	ldr r5, _080295F8 @ =gLastMoves
 	ldr r6, _080295FC @ =gBattlerTarget
 	ldrb r0, [r6]
 	lsls r0, 1
@@ -23836,7 +23836,7 @@ _080295D2:
 	.align 2, 0
 _080295F0: .4byte gChosenMove
 _080295F4: .4byte 0x0000ffff
-_080295F8: .4byte gLastUsedMove
+_080295F8: .4byte gLastMoves
 _080295FC: .4byte gBattlerTarget
 _08029600: .4byte gBattleMons
 _08029604: .4byte gBattlerAttacker
@@ -23886,7 +23886,7 @@ _08029646:
 	mov r0, r12
 	adds r0, 0xC
 	adds r1, r0
-	ldr r2, _080296A4 @ =gLastUsedMove
+	ldr r2, _080296A4 @ =gLastMoves
 	ldr r3, _080296A8 @ =gBattlerTarget
 	ldrb r0, [r3]
 	lsls r0, 1
@@ -23918,7 +23918,7 @@ _08029646:
 	.align 2, 0
 _0802969C: .4byte gBattlescriptCurrInstr
 _080296A0: .4byte gUnknown_2023D48
-_080296A4: .4byte gLastUsedMove
+_080296A4: .4byte gLastMoves
 _080296A8: .4byte gBattlerTarget
 _080296AC: .4byte gBattleMoves
 _080296B0:
@@ -24402,7 +24402,7 @@ atkA3_disablelastusedattack: @ 8029A70
 	adds r7, r2, 0
 	adds r7, 0xC
 	adds r0, r7
-	ldr r5, _08029B78 @ =gLastUsedMove
+	ldr r5, _08029B78 @ =gLastMoves
 	lsls r1, 1
 	adds r1, r5
 	ldrh r0, [r0]
@@ -24521,7 +24521,7 @@ _08029AC4:
 	.align 2, 0
 _08029B70: .4byte gBattleMons
 _08029B74: .4byte gBattlerTarget
-_08029B78: .4byte gLastUsedMove
+_08029B78: .4byte gLastMoves
 _08029B7C: .4byte gDisableStructs
 _08029B80: .4byte gBattleTextBuff1
 _08029B84: .4byte gBattlescriptCurrInstr
@@ -24566,7 +24566,7 @@ atkA4_trysetencore: @ 8029BB4
 	adds r6, r3, 0
 	adds r6, 0xC
 	adds r0, r6
-	ldr r2, _08029CB0 @ =gLastUsedMove
+	ldr r2, _08029CB0 @ =gLastMoves
 	lsls r1, 1
 	adds r1, r2
 	ldrh r0, [r0]
@@ -24680,7 +24680,7 @@ _08029C24:
 	.align 2, 0
 _08029CA8: .4byte gBattleMons
 _08029CAC: .4byte gBattlerTarget
-_08029CB0: .4byte gLastUsedMove
+_08029CB0: .4byte gLastMoves
 _08029CB4: .4byte gDisableStructs
 _08029CB8: .4byte gBattlescriptCurrInstr
 _08029CBC:
@@ -25745,7 +25745,7 @@ atkAD_tryspiteppreduce: @ 802A4D8
 	mov r5, r8
 	push {r5-r7}
 	sub sp, 0x4
-	ldr r4, _0802A658 @ =gLastUsedMove
+	ldr r4, _0802A658 @ =gLastMoves
 	ldr r1, _0802A65C @ =gBattlerTarget
 	ldrb r3, [r1]
 	lsls r0, r3, 1
@@ -25832,7 +25832,7 @@ _0802A57C:
 	strb r5, [r1]
 	movs r0, 0x2
 	strb r0, [r1, 0x1]
-	ldr r2, _0802A658 @ =gLastUsedMove
+	ldr r2, _0802A658 @ =gLastMoves
 	mov r3, r8
 	ldrb r0, [r3]
 	lsls r0, 1
@@ -25934,7 +25934,7 @@ _0802A630:
 	bl CancelMultiTurnMoves
 	b _0802A69A
 	.align 2, 0
-_0802A658: .4byte gLastUsedMove
+_0802A658: .4byte gLastMoves
 _0802A65C: .4byte gBattlerTarget
 _0802A660: .4byte 0x0000ffff
 _0802A664: .4byte gBattleMons
@@ -30155,7 +30155,7 @@ _0802C7BC:
 	lsrs r0, 24
 	mov r8, r0
 	ldrb r0, [r4]
-	bl PressurePPLoseOnUsingImprision
+	bl PressurePPLoseOnUsingImprison
 	movs r6, 0
 	b _0802C82E
 _0802C7D2: