revert gBufferedMoves to gSelectedOrderFromParty

4 files changed, 23 insertions, 23 deletions

diff --git a/asm/battle_message.s b/asm/battle_message.s
index 414213737..badbf2b7d 100644
--- a/asm/battle_message.s
+++ b/asm/battle_message.s
@@ -16,7 +16,7 @@ BufferStringBattle: @ 8120AA8
 	lsls r0, 16
 	lsrs r7, r0, 16
 	movs r6, 0
-	ldr r5, _08120B70 @ =gBufferedMoves
+	ldr r5, _08120B70 @ =gSelectedOrderFromParty
 	ldr r4, _08120B74 @ =gActiveBank
 	ldrb r1, [r4]
 	lsls r1, 9
@@ -73,7 +73,7 @@ _08120B10:
 	movs r2, 0
 	ldr r0, _08120B9C @ =gBattleTextBuff1
 	mov r8, r0
-	ldr r3, _08120B70 @ =gBufferedMoves
+	ldr r3, _08120B70 @ =gSelectedOrderFromParty
 	ldr r1, _08120BA4 @ =gBattleTextBuff2
 	mov r12, r1
 	ldr r5, _08120BA8 @ =gBattleTextBuff3
@@ -111,7 +111,7 @@ _08120B64:
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
-_08120B70: .4byte gBufferedMoves
+_08120B70: .4byte gSelectedOrderFromParty
 _08120B74: .4byte gActiveBank
 _08120B78: .4byte gUnknown_02023A64
 _08120B7C: .4byte gLastUsedItem
@@ -414,7 +414,7 @@ _08120DE4: .4byte gUnknown_08400622
 _08120DE8:
 	mov r0, r10
 	bl sub_8121D1C
-	ldr r0, _08120E14 @ =gBufferedMoves
+	ldr r0, _08120E14 @ =gSelectedOrderFromParty
 	ldr r2, [r0]
 	ldrh r1, [r2]
 	movs r0, 0xB1
@@ -433,7 +433,7 @@ _08120DE8:
 	bl StringCopy
 	b _08120E38
 	.align 2, 0
-_08120E14: .4byte gBufferedMoves
+_08120E14: .4byte gSelectedOrderFromParty
 _08120E18: .4byte gBattleTextBuff2
 _08120E1C: .4byte gUnknown_08401674
 _08120E20: .4byte 0x02000000
@@ -1368,7 +1368,7 @@ _081215E8:
 	.align 2, 0
 _081215F4: .4byte gBattlePartyID
 _081215F8:
-	ldr r0, _08121610 @ =gBufferedMoves
+	ldr r0, _08121610 @ =gSelectedOrderFromParty
 	ldr r2, [r0]
 	ldrh r1, [r2]
 	movs r0, 0xB1
@@ -1380,14 +1380,14 @@ _081215F8:
 	adds r0, r2
 	b _08121634
 	.align 2, 0
-_08121610: .4byte gBufferedMoves
+_08121610: .4byte gSelectedOrderFromParty
 _08121614: .4byte 0x02000000
 _08121618: .4byte 0x000160a0
 _0812161C:
 	ldrh r1, [r2]
 	b _08121652
 _08121620:
-	ldr r0, _08121640 @ =gBufferedMoves
+	ldr r0, _08121640 @ =gSelectedOrderFromParty
 	ldr r2, [r0]
 	ldrh r1, [r2, 0x2]
 	movs r0, 0xB1
@@ -1404,7 +1404,7 @@ _08121634:
 	adds r4, r0, r1
 	b _081219E6
 	.align 2, 0
-_08121640: .4byte gBufferedMoves
+_08121640: .4byte gSelectedOrderFromParty
 _08121644: .4byte 0x02000000
 _08121648: .4byte 0x000160a0
 _0812164C: .4byte gUnknown_08401674
@@ -2274,7 +2274,7 @@ sub_8121D1C: @ 8121D1C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r2, 0
-	ldr r5, _08121D50 @ =gBufferedMoves
+	ldr r5, _08121D50 @ =gSelectedOrderFromParty
 	ldr r3, _08121D54 @ =gUnknown_084016BC
 _08121D26:
 	cmp r2, 0x4
@@ -2299,7 +2299,7 @@ _08121D3C:
 	bl StringCopy
 	b _08121D68
 	.align 2, 0
-_08121D50: .4byte gBufferedMoves
+_08121D50: .4byte gSelectedOrderFromParty
 _08121D54: .4byte gUnknown_084016BC
 _08121D58: .4byte gUnknown_08400E5E
 _08121D5C:
@@ -2329,7 +2329,7 @@ _08121D7E:
 	cmp r0, 0xFF
 	bne _08121D7C
 	ldr r1, _08121DB4 @ =gUnknown_084016BC
-	ldr r5, _08121DB8 @ =gBufferedMoves
+	ldr r5, _08121DB8 @ =gSelectedOrderFromParty
 	movs r0, 0
 	lsls r0, 1
 	adds r2, r0, r1
@@ -2356,7 +2356,7 @@ _08121DA8:
 	mov pc, r0
 	.align 2, 0
 _08121DB4: .4byte gUnknown_084016BC
-_08121DB8: .4byte gBufferedMoves
+_08121DB8: .4byte gSelectedOrderFromParty
 _08121DBC: .4byte _08121DC0
 	.align 2, 0
 _08121DC0:
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index ee8e18198..a8305b2b1 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -2324,7 +2324,7 @@ _08135750: .4byte 0x00000564
 _08135754:
 	movs r2, 0
 	ldr r4, _0813576C @ =gSaveBlock2 + 0x565
-	ldr r3, _08135770 @ =gBufferedMoves
+	ldr r3, _08135770 @ =gSelectedOrderFromParty
 _0813575A:
 	adds r0, r2, r4
 	adds r1, r2, r3
@@ -2336,7 +2336,7 @@ _0813575A:
 	b _0813589A
 	.align 2, 0
 _0813576C: .4byte gSaveBlock2 + 0x565
-_08135770: .4byte gBufferedMoves
+_08135770: .4byte gSelectedOrderFromParty
 _08135774:
 	ldr r3, _081357C0 @ =0x00000564
 	adds r0, r5, r3
@@ -2665,7 +2665,7 @@ _08135A10: .4byte 0x00000554
 sub_8135A14: @ 8135A14
 	push {r4,lr}
 	movs r2, 0
-	ldr r4, _08135A34 @ =gBufferedMoves
+	ldr r4, _08135A34 @ =gSelectedOrderFromParty
 	ldr r3, _08135A38 @ =gSaveBlock2 + 0x565
 _08135A1C:
 	adds r0, r2, r4
@@ -2680,7 +2680,7 @@ _08135A1C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08135A34: .4byte gBufferedMoves
+_08135A34: .4byte gSelectedOrderFromParty
 _08135A38: .4byte gSaveBlock2 + 0x565
 	thumb_func_end sub_8135A14
 
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index fb72be527..c8171db52 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -31,7 +31,7 @@ extern struct SpriteTemplate gUnknown_02024E8C;
 extern u8 gContestPlayerMonIndex;
 extern u8 gIsLinkContest;
 extern u8 gPlayerPartyCount;
-extern u8 gBufferedMoves[];
+extern u8 gSelectedOrderFromParty[];
 
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
@@ -648,7 +648,7 @@ void sub_80C5568(void)
 
 void sub_80C5580(void)
 {
-    u8 var = gBufferedMoves[0];
+    u8 var = gSelectedOrderFromParty[0];
 
     switch(var)
     {
@@ -671,7 +671,7 @@ void ChooseBattleTowerPlayerParty(void)
 
 void SetBattleTowerPlayerParty(void)
 {
-    u8 var = gBufferedMoves[0];
+    u8 var = gSelectedOrderFromParty[0];
 
     switch(var)
     {
@@ -697,8 +697,8 @@ void ReducePlayerPartyToThree(void)
 
     // copy the selected pokemon according to the order.
     for(i = 0; i < 3; i++)
-        if(gBufferedMoves[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop
-            party[i] = gPlayerParty[gBufferedMoves[i] - 1]; // index is 0 based, not literal
+        if(gSelectedOrderFromParty[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop
+            party[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1]; // index is 0 based, not literal
 
     // delete the last 3 pokemon
     CpuFill32(0, gPlayerParty, sizeof gPlayerParty);
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 9f810eba7..42b0982ab 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -928,7 +928,7 @@ gUnknown_0203926A: @ 203926A
 gAbilitiesPerBank: @ 203926C
 	.space 0x4
 
-gBufferedMoves: @ 2039270
+gSelectedOrderFromParty: @ 2039270
 	.space 0x4
 
 gUnknown_02039274: @ 2039274