summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/mystery_event_script.s4
-rw-r--r--asm/party_menu.s28
-rw-r--r--asm/rom_800D42C.s52
-rw-r--r--asm/rom_80859BC.s4
-rw-r--r--asm/trade.s16
-rw-r--r--sym_common.txt31
6 files changed, 54 insertions, 81 deletions
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s
index 5107e301d..4799f6e7d 100644
--- a/asm/mystery_event_script.s
+++ b/asm/mystery_event_script.s
@@ -822,7 +822,7 @@ _08126680: .4byte gPlayerPartyCount
_08126684: .4byte gStringVar4
_08126688: .4byte gOtherText_PartyIsFull
_0812668C:
- ldr r7, _08126708 @ =gUnknown_03004554
+ ldr r7, _08126708 @ =gPlayerParty + 5 * 0x64
adds r0, r7, 0
adds r1, r5, 0
movs r2, 0x64
@@ -876,7 +876,7 @@ _081266F6:
pop {r1}
bx r1
.align 2, 0
-_08126708: .4byte gUnknown_03004554
+_08126708: .4byte gPlayerParty + 5 * 0x64
_0812670C: .4byte gStringVar4
_08126710: .4byte gOtherText_PokeWasSentOver
thumb_func_end sub_8126608
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 232dc0019..26eab6b57 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -982,7 +982,7 @@ _0806B6C2:
lsrs r0, 24
cmp r0, 0x1
bne _0806B6F6
- ldr r0, _0806B6EC @ =gUnknown_03004428
+ ldr r0, _0806B6EC @ =gPlayerParty + 2 * 0x64
movs r1, 0xB
bl GetMonData
cmp r0, 0
@@ -996,7 +996,7 @@ _0806B6C2:
movs r1, 0x2
b _0806B8A8
.align 2, 0
-_0806B6EC: .4byte gUnknown_03004428
+_0806B6EC: .4byte gPlayerParty + 2 * 0x64
_0806B6F0:
ldrb r0, [r4, 0x4]
ldrb r1, [r4, 0x5]
@@ -1049,7 +1049,7 @@ _0806B74A:
lsrs r0, 24
cmp r0, 0x1
bne _0806B77E
- ldr r0, _0806B774 @ =gUnknown_0300448C
+ ldr r0, _0806B774 @ =gPlayerParty + 3 * 0x64
movs r1, 0xB
bl GetMonData
cmp r0, 0
@@ -1063,7 +1063,7 @@ _0806B74A:
movs r1, 0x3
b _0806B8A8
.align 2, 0
-_0806B774: .4byte gUnknown_0300448C
+_0806B774: .4byte gPlayerParty + 3 * 0x64
_0806B778:
ldrb r0, [r4, 0x6]
ldrb r1, [r4, 0x7]
@@ -1117,7 +1117,7 @@ _0806B7D2:
lsrs r0, 24
cmp r0, 0x1
bne _0806B80A
- ldr r0, _0806B800 @ =gUnknown_030044F0
+ ldr r0, _0806B800 @ =gPlayerParty + 4 * 0x64
movs r1, 0xB
bl GetMonData
cmp r0, 0
@@ -1133,7 +1133,7 @@ _0806B7D2:
movs r2, 0x4
b _0806B8AA
.align 2, 0
-_0806B800: .4byte gUnknown_030044F0
+_0806B800: .4byte gPlayerParty + 4 * 0x64
_0806B804:
ldrb r0, [r4, 0x8]
ldrb r1, [r4, 0x9]
@@ -1176,7 +1176,7 @@ _0806B84C:
lsrs r0, 24
cmp r0, 0x1
bne _0806B88E
- ldr r0, _0806B87C @ =gUnknown_03004554
+ ldr r0, _0806B87C @ =gPlayerParty + 5 * 0x64
movs r1, 0xB
bl GetMonData
cmp r0, 0
@@ -1192,7 +1192,7 @@ _0806B84C:
movs r2, 0x4
b _0806B8AA
.align 2, 0
-_0806B87C: .4byte gUnknown_03004554
+_0806B87C: .4byte gPlayerParty + 5 * 0x64
_0806B880:
ldrb r0, [r4, 0xA]
ldrb r1, [r4, 0xB]
@@ -1280,7 +1280,7 @@ sub_806B908: @ 806B908
ldr r0, _0806B950 @ =gUnknown_083769A8
adds r4, r0, 0
adds r4, 0x24
- ldr r5, _0806B954 @ =gUnknown_030043C4
+ ldr r5, _0806B954 @ =gPlayerParty + 1 * 0x64
ldrb r0, [r4]
ldrb r1, [r4, 0x1]
movs r2, 0x3
@@ -1300,7 +1300,7 @@ sub_806B908: @ 806B908
_0806B948: .4byte gBG2TilemapBuffer
_0806B94C: .4byte gUnknown_0202E8FA
_0806B950: .4byte gUnknown_083769A8
-_0806B954: .4byte gUnknown_030043C4
+_0806B954: .4byte gPlayerParty + 1 * 0x64
_0806B958:
ldrb r0, [r4, 0x4]
ldrb r1, [r4, 0x5]
@@ -2957,7 +2957,7 @@ _0806C57C:
lsrs r0, 16
cmp r0, 0x1
bls _0806C5E2
- ldr r5, _0806C5B0 @ =gUnknown_03004428
+ ldr r5, _0806C5B0 @ =gPlayerParty + 2 * 0x64
adds r0, r5, 0
movs r1, 0xB
bl GetMonData
@@ -2968,7 +2968,7 @@ _0806C57C:
b _0806C64E
.align 2, 0
_0806C5AC: .4byte gSprites
-_0806C5B0: .4byte gUnknown_03004428
+_0806C5B0: .4byte gPlayerParty + 2 * 0x64
_0806C5B4:
adds r0, r5, 0
adds r0, 0x64
@@ -2999,7 +2999,7 @@ _0806C5E2:
.align 2, 0
_0806C5E8: .4byte gSprites
_0806C5EC:
- ldr r5, _0806C600 @ =gUnknown_030044F0
+ ldr r5, _0806C600 @ =gPlayerParty + 4 * 0x64
adds r0, r5, 0
movs r1, 0xB
bl GetMonData
@@ -3009,7 +3009,7 @@ _0806C5EC:
strh r0, [r4, 0x2E]
b _0806C64E
.align 2, 0
-_0806C600: .4byte gUnknown_030044F0
+_0806C600: .4byte gPlayerParty + 4 * 0x64
_0806C604:
adds r0, r5, 0
adds r0, 0x64
diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s
index 6c2a1d58b..fca2788e0 100644
--- a/asm/rom_800D42C.s
+++ b/asm/rom_800D42C.s
@@ -3227,12 +3227,12 @@ _0800EEE4:
bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
- ldr r1, _0800EEF8 @ =gUnknown_03004428
+ ldr r1, _0800EEF8 @ =gPlayerParty + 2 * 0x64
movs r2, 0xC8
bl SendBlock
b _0800EF96
.align 2, 0
-_0800EEF8: .4byte gUnknown_03004428
+_0800EEF8: .4byte gPlayerParty + 2 * 0x64
_0800EEFC:
bl GetBlockReceivedStatus
movs r1, 0x3
@@ -3242,7 +3242,7 @@ _0800EEFC:
b _0800F008
_0800EF0A:
bl ResetBlockReceivedFlags
- ldr r0, _0800EF20 @ =gUnknown_03004688
+ ldr r0, _0800EF20 @ =gEnemyParty + 2 * 0x64
lsls r1, r5, 8
ldr r2, _0800EF24 @ =gBlockRecvBuffer
adds r1, r2
@@ -3250,7 +3250,7 @@ _0800EF0A:
bl memcpy
b _0800EF96
.align 2, 0
-_0800EF20: .4byte gUnknown_03004688
+_0800EF20: .4byte gEnemyParty + 2 * 0x64
_0800EF24: .4byte gBlockRecvBuffer
_0800EF28:
bl sub_8007ECC
@@ -3260,12 +3260,12 @@ _0800EF28:
bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
- ldr r1, _0800EF44 @ =gUnknown_030044F0
+ ldr r1, _0800EF44 @ =gPlayerParty + 4 * 0x64
movs r2, 0xC8
bl SendBlock
b _0800EF96
.align 2, 0
-_0800EF44: .4byte gUnknown_030044F0
+_0800EF44: .4byte gPlayerParty + 4 * 0x64
_0800EF48:
bl GetBlockReceivedStatus
movs r1, 0x3
@@ -3273,7 +3273,7 @@ _0800EF48:
cmp r1, 0x3
bne _0800F008
bl ResetBlockReceivedFlags
- ldr r4, _0800EFA0 @ =gUnknown_03004750
+ ldr r4, _0800EFA0 @ =gEnemyParty + 4 * 0x64
lsls r1, r5, 8
ldr r0, _0800EFA4 @ =gBlockRecvBuffer
adds r1, r0
@@ -3304,7 +3304,7 @@ _0800EF96:
strb r0, [r1]
b _0800F008
.align 2, 0
-_0800EFA0: .4byte gUnknown_03004750
+_0800EFA0: .4byte gEnemyParty + 4 * 0x64
_0800EFA4: .4byte gBlockRecvBuffer
_0800EFA8: .4byte 0xfffffe70
_0800EFAC: .4byte 0xfffffed4
@@ -3996,10 +3996,10 @@ _0800F548:
.align 2, 0
_0800F54C: .4byte gPlayerParty
_0800F550:
- ldr r0, _0800F554 @ =gUnknown_0300448C
+ ldr r0, _0800F554 @ =gPlayerParty + 3 * 0x64
b _0800F5C8
.align 2, 0
-_0800F554: .4byte gUnknown_0300448C
+_0800F554: .4byte gPlayerParty + 3 * 0x64
_0800F558:
ldr r2, _0800F578 @ =gLinkPlayers
adds r0, r7, r2
@@ -4046,10 +4046,10 @@ _0800F5A0:
.align 2, 0
_0800F5A4: .4byte gPlayerParty
_0800F5A8:
- ldr r0, _0800F5AC @ =gUnknown_0300448C
+ ldr r0, _0800F5AC @ =gPlayerParty + 3 * 0x64
b _0800F5C8
.align 2, 0
-_0800F5AC: .4byte gUnknown_0300448C
+_0800F5AC: .4byte gPlayerParty + 3 * 0x64
_0800F5B0:
adds r0, r7, r2
ldrh r2, [r0, 0x18]
@@ -4073,7 +4073,7 @@ _0800F5C8:
.align 2, 0
_0800F5D4: .4byte gEnemyParty
_0800F5D8:
- ldr r0, _0800F5F4 @ =gUnknown_030046EC
+ ldr r0, _0800F5F4 @ =gEnemyParty + 3 * 0x64
adds r1, r5, 0
movs r2, 0xC8
bl memcpy
@@ -4087,7 +4087,7 @@ _0800F5E2:
ble _0800F524
b _0800F770
.align 2, 0
-_0800F5F4: .4byte gUnknown_030046EC
+_0800F5F4: .4byte gEnemyParty + 3 * 0x64
_0800F5F8:
bl sub_8007ECC
lsls r0, 24
@@ -4140,15 +4140,15 @@ _0800F65C:
cmp r0, 0x3
bne _0800F6FA
_0800F660:
- ldr r0, _0800F664 @ =gUnknown_03004428
+ ldr r0, _0800F664 @ =gPlayerParty + 2 * 0x64
b _0800F6E0
.align 2, 0
-_0800F664: .4byte gUnknown_03004428
+_0800F664: .4byte gPlayerParty + 2 * 0x64
_0800F668:
- ldr r0, _0800F66C @ =gUnknown_03004554
+ ldr r0, _0800F66C @ =gPlayerParty + 5 * 0x64
b _0800F6E0
.align 2, 0
-_0800F66C: .4byte gUnknown_03004554
+_0800F66C: .4byte gPlayerParty + 5 * 0x64
_0800F670:
ldr r2, _0800F690 @ =gLinkPlayers
adds r0, r7, r2
@@ -4190,15 +4190,15 @@ _0800F6B4:
cmp r2, 0x3
bne _0800F6FA
_0800F6B8:
- ldr r0, _0800F6BC @ =gUnknown_03004428
+ ldr r0, _0800F6BC @ =gPlayerParty + 2 * 0x64
b _0800F6E0
.align 2, 0
-_0800F6BC: .4byte gUnknown_03004428
+_0800F6BC: .4byte gPlayerParty + 2 * 0x64
_0800F6C0:
- ldr r0, _0800F6C4 @ =gUnknown_03004554
+ ldr r0, _0800F6C4 @ =gPlayerParty + 5 * 0x64
b _0800F6E0
.align 2, 0
-_0800F6C4: .4byte gUnknown_03004554
+_0800F6C4: .4byte gPlayerParty + 5 * 0x64
_0800F6C8:
adds r0, r7, r2
ldrh r2, [r0, 0x18]
@@ -4213,16 +4213,16 @@ _0800F6DA:
cmp r2, 0x3
bne _0800F6FA
_0800F6DE:
- ldr r0, _0800F6EC @ =gUnknown_03004688
+ ldr r0, _0800F6EC @ =gEnemyParty + 2 * 0x64
_0800F6E0:
adds r1, r5, 0
movs r2, 0x64
bl memcpy
b _0800F6FA
.align 2, 0
-_0800F6EC: .4byte gUnknown_03004688
+_0800F6EC: .4byte gEnemyParty + 2 * 0x64
_0800F6F0:
- ldr r0, _0800F77C @ =gUnknown_030047B4
+ ldr r0, _0800F77C @ =gEnemyParty + 5 * 0x64
adds r1, r5, 0
movs r2, 0x64
bl memcpy
@@ -4281,7 +4281,7 @@ _0800F770:
strb r0, [r1]
b _0800F7E0
.align 2, 0
-_0800F77C: .4byte gUnknown_030047B4
+_0800F77C: .4byte gEnemyParty + 5 * 0x64
_0800F780: .4byte gPlayerParty
_0800F784: .4byte gEnemyParty
_0800F788: .4byte gUnknown_02024D1E
diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s
index 0366bf499..b584e32ba 100644
--- a/asm/rom_80859BC.s
+++ b/asm/rom_80859BC.s
@@ -8486,7 +8486,7 @@ _08089B48:
adds r1, r5, 0
movs r2, 0
bl AppendToList
- ldr r6, _08089BAC @ =gUnknown_030043C4
+ ldr r6, _08089BAC @ =gPlayerParty + 1 * 0x64
adds r0, r6, 0
movs r1, 0xB
bl GetMonData
@@ -8520,7 +8520,7 @@ _08089B76:
.align 2, 0
_08089BA4: .4byte gUnknown_0202FFAA
_08089BA8: .4byte gUnknown_0202FFA9
-_08089BAC: .4byte gUnknown_030043C4
+_08089BAC: .4byte gPlayerParty + 1 * 0x64
_08089BB0: .4byte gUnknown_03005CE0
_08089BB4:
adds r0, r4, 0
diff --git a/asm/trade.s b/asm/trade.s
index 078273d4c..f1a195c5e 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -2063,7 +2063,7 @@ _08048E6C: .4byte gBlockRecvBuffer
_08048E70: .4byte gUnknown_03004824
_08048E74:
ldr r0, _08048E84 @ =gBlockSendBuffer
- ldr r1, _08048E88 @ =gUnknown_03004428
+ ldr r1, _08048E88 @ =gPlayerParty + 2 * 0x64
movs r2, 0xC8
bl sub_8048D24
ldr r0, _08048E8C @ =gUnknown_03004824
@@ -2071,7 +2071,7 @@ _08048E74:
b _08049006
.align 2, 0
_08048E84: .4byte gBlockSendBuffer
-_08048E88: .4byte gUnknown_03004428
+_08048E88: .4byte gPlayerParty + 2 * 0x64
_08048E8C: .4byte gUnknown_03004824
_08048E90:
cmp r7, 0
@@ -2092,7 +2092,7 @@ _08048EA4:
beq _08048EB2
b _0804907C
_08048EB2:
- ldr r0, _08048ED0 @ =gUnknown_03004688
+ ldr r0, _08048ED0 @ =gEnemyParty + 2 * 0x64
movs r2, 0x1
adds r1, r7, 0
eors r1, r2
@@ -2106,12 +2106,12 @@ _08048EB2:
ldr r1, [r0]
b _08049006
.align 2, 0
-_08048ED0: .4byte gUnknown_03004688
+_08048ED0: .4byte gEnemyParty + 2 * 0x64
_08048ED4: .4byte gBlockRecvBuffer
_08048ED8: .4byte gUnknown_03004824
_08048EDC:
ldr r0, _08048EEC @ =gBlockSendBuffer
- ldr r1, _08048EF0 @ =gUnknown_030044F0
+ ldr r1, _08048EF0 @ =gPlayerParty + 4 * 0x64
movs r2, 0xC8
bl sub_8048D24
ldr r0, _08048EF4 @ =gUnknown_03004824
@@ -2119,7 +2119,7 @@ _08048EDC:
b _08049006
.align 2, 0
_08048EEC: .4byte gBlockSendBuffer
-_08048EF0: .4byte gUnknown_030044F0
+_08048EF0: .4byte gPlayerParty + 4 * 0x64
_08048EF4: .4byte gUnknown_03004824
_08048EF8:
cmp r7, 0
@@ -2140,7 +2140,7 @@ _08048F0C:
beq _08048F1A
b _0804907C
_08048F1A:
- ldr r0, _08048F38 @ =gUnknown_03004750
+ ldr r0, _08048F38 @ =gEnemyParty + 4 * 0x64
movs r2, 0x1
adds r1, r7, 0
eors r1, r2
@@ -2154,7 +2154,7 @@ _08048F1A:
ldr r1, [r0]
b _08049006
.align 2, 0
-_08048F38: .4byte gUnknown_03004750
+_08048F38: .4byte gEnemyParty + 4 * 0x64
_08048F3C: .4byte gBlockRecvBuffer
_08048F40: .4byte gUnknown_03004824
_08048F44:
diff --git a/sym_common.txt b/sym_common.txt
index b05688d89..252bcbfbc 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -108,40 +108,13 @@ gPlayerPartyCount: @ 3004350
.space 0x10
gPlayerParty: @ 3004360
- .space 0x64
-
-gUnknown_030043C4: @ 30043C4
- .space 0x64
-
-gUnknown_03004428: @ 3004428
- .space 0x64
-
-gUnknown_0300448C: @ 300448C
- .space 0x64
-
-gUnknown_030044F0: @ 30044F0
- .space 0x64
-
-gUnknown_03004554: @ 3004554
- .space 0x64
+ .space 0x258
gEnemyPartyCount: @ 30045B8
.space 0x8
gEnemyParty: @ 30045C0
- .space 0xC8
-
-gUnknown_03004688: @ 3004688
- .space 0x64
-
-gUnknown_030046EC: @ 30046EC
- .space 0x64
-
-gUnknown_03004750: @ 3004750
- .space 0x64
-
-gUnknown_030047B4: @ 30047B4
- .space 0x64
+ .space 0x258
.include "rng.o"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 04:24:36 +0000