summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/pokemon_storage_system.s60
-rw-r--r--asm/pokenav.s32
-rw-r--r--asm/rom_810CBB4.s4
-rw-r--r--include/pokemon.h2
-rw-r--r--sym_ewram.txt8
5 files changed, 51 insertions, 55 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index c24d18711..801c941d1 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -270,7 +270,7 @@ _08095AF0:
lsls r0, r4, 2
adds r0, r4
lsls r0, 4
- ldr r1, _08095B20 @ =gUnknown_020300A4
+ ldr r1, _08095B20 @ =gPokemonStorage + 0x4
adds r0, r1
adds r0, r6, r0
movs r1, 0xB
@@ -292,7 +292,7 @@ _08095B0C:
pop {r1}
bx r1
.align 2, 0
-_08095B20: .4byte gUnknown_020300A4
+_08095B20: .4byte gPokemonStorage + 0x4
thumb_func_end sub_8095ADC
thumb_func_start sub_8095B24
@@ -310,7 +310,7 @@ _08095B36:
lsls r0, r4, 2
adds r0, r4
lsls r0, 4
- ldr r1, _08095B54 @ =gUnknown_020300A4
+ ldr r1, _08095B54 @ =gPokemonStorage + 0x4
adds r0, r1
adds r0, r5, r0
movs r1, 0xB
@@ -321,7 +321,7 @@ _08095B36:
asrs r0, 16
b _08095B66
.align 2, 0
-_08095B54: .4byte gUnknown_020300A4
+_08095B54: .4byte gPokemonStorage + 0x4
_08095B58:
adds r0, r4, 0x1
lsls r0, 16
@@ -1222,7 +1222,7 @@ _080961F0:
_08096214:
lsls r0, r5, 3
adds r0, r5
- ldr r6, _0809625C @ =gUnknown_020383E4
+ ldr r6, _0809625C @ =gPokemonStorage + 0x8344
adds r0, r6
ldr r1, _08096260 @ =gPCText_BOX
bl StringCopy
@@ -1254,7 +1254,7 @@ _0809623E:
bx r0
.align 2, 0
_08096258: .4byte gPokemonStorage
-_0809625C: .4byte gUnknown_020383E4
+_0809625C: .4byte gPokemonStorage + 0x8344
_08096260: .4byte gPCText_BOX
thumb_func_end sub_80961D8
@@ -1802,7 +1802,7 @@ sub_809665C: @ 809665C
ldrb r0, [r0]
lsls r1, r0, 3
adds r1, r0
- ldr r0, _080966BC @ =gUnknown_020383E4
+ ldr r0, _080966BC @ =gPokemonStorage + 0x8344
adds r1, r0
adds r0, r2, 0
bl StringCopy
@@ -1819,7 +1819,7 @@ sub_809665C: @ 809665C
.align 2, 0
_080966B4: .4byte gUnknown_02038478
_080966B8: .4byte gStringVar1
-_080966BC: .4byte gUnknown_020383E4
+_080966BC: .4byte gPokemonStorage + 0x8344
_080966C0:
movs r0, 0x22
_080966C2:
@@ -6352,7 +6352,7 @@ sub_8098C48: @ 8098C48
lsls r0, r1, 4
subs r0, r1
lsls r0, 5
- ldr r1, _08098CCC @ =gUnknown_020300A4
+ ldr r1, _08098CCC @ =gPokemonStorage + 0x4
adds r6, r0, r1
movs r0, 0
mov r8, r0
@@ -6406,7 +6406,7 @@ _08098C70:
str r0, [r1]
b _08098CE8
.align 2, 0
-_08098CCC: .4byte gUnknown_020300A4
+_08098CCC: .4byte gPokemonStorage + 0x4
_08098CD0: .4byte gUnknown_083B6DB4
_08098CD4: .4byte 0x00001050
_08098CD8:
@@ -6468,7 +6468,7 @@ sub_8098D20: @ 8098D20
mov r9, r0
adds r0, r4
lsls r0, 4
- ldr r1, _08098DD4 @ =gUnknown_020300A4
+ ldr r1, _08098DD4 @ =gPokemonStorage + 0x4
adds r0, r1
adds r7, r2, r0
adds r0, r7, 0
@@ -6534,7 +6534,7 @@ _08098DC4:
pop {r0}
bx r0
.align 2, 0
-_08098DD4: .4byte gUnknown_020300A4
+_08098DD4: .4byte gPokemonStorage + 0x4
_08098DD8: .4byte gUnknown_083B6DB4
_08098DDC: .4byte 0x00001050
thumb_func_end sub_8098D20
@@ -6746,7 +6746,7 @@ _08098F42:
lsls r7, r6, 2
adds r1, r7, r6
lsls r1, 4
- ldr r2, _08099004 @ =gUnknown_020300A4
+ ldr r2, _08099004 @ =gPokemonStorage + 0x4
adds r4, r1, r2
adds r0, r4
movs r1, 0x41
@@ -6829,7 +6829,7 @@ _08098FC8:
_08098FF8: .4byte gUnknown_083B6DB4
_08098FFC: .4byte 0x0000117d
_08099000: .4byte 0x00001050
-_08099004: .4byte gUnknown_020300A4
+_08099004: .4byte gPokemonStorage + 0x4
_08099008: .4byte sub_8098E24
thumb_func_end sub_8098EE0
@@ -9494,7 +9494,7 @@ _0809A478:
ldr r1, [sp, 0x28]
lsls r5, r1, 3
adds r5, r1
- ldr r4, _0809A57C @ =gUnknown_020383E4
+ ldr r4, _0809A57C @ =gPokemonStorage + 0x8344
adds r5, r4
adds r1, r5, 0
bl sub_809A1BC
@@ -9610,7 +9610,7 @@ _0809A4DE:
_0809A570: .4byte 0x00000cec
_0809A574: .4byte 0x0000dac9
_0809A578: .4byte 0x000008ca
-_0809A57C: .4byte gUnknown_020383E4
+_0809A57C: .4byte gPokemonStorage + 0x8344
_0809A580: .4byte gUnknown_083BB0A8
_0809A584: .4byte gUnknown_083B6DB4
_0809A588: .4byte 0x00000cf8
@@ -10452,7 +10452,7 @@ _0809ABC0:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _0809ABF4 @ =gUnknown_020300A4
+ ldr r2, _0809ABF4 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0xB
@@ -10463,7 +10463,7 @@ _0809ABEA:
b _0809ABFA
.align 2, 0
_0809ABF0: .4byte gUnknown_020384E5
-_0809ABF4: .4byte gUnknown_020300A4
+_0809ABF4: .4byte gPokemonStorage + 0x4
_0809ABF8:
movs r0, 0
_0809ABFA:
@@ -11603,7 +11603,7 @@ _0809B488:
lsls r1, r5, 2
adds r1, r5
lsls r1, 4
- ldr r2, _0809B4C0 @ =gUnknown_020300A4
+ ldr r2, _0809B4C0 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
ldr r1, _0809B4C4 @ =gUnknown_083B6DB4
@@ -11623,7 +11623,7 @@ _0809B4AA:
pop {r0}
bx r0
.align 2, 0
-_0809B4C0: .4byte gUnknown_020300A4
+_0809B4C0: .4byte gPokemonStorage + 0x4
_0809B4C4: .4byte gUnknown_083B6DB4
_0809B4C8: .4byte 0x000025b4
_0809B4CC: .4byte gUnknown_020384E7
@@ -11712,7 +11712,7 @@ _0809B568:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _0809B588 @ =gUnknown_020300A4
+ ldr r2, _0809B588 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
bl ZeroBoxMonData
@@ -11720,7 +11720,7 @@ _0809B582:
pop {r0}
bx r0
.align 2, 0
-_0809B588: .4byte gUnknown_020300A4
+_0809B588: .4byte gPokemonStorage + 0x4
thumb_func_end sub_809B548
thumb_func_start diegohint1
@@ -11756,7 +11756,7 @@ _0809B5C0:
lsls r1, r6, 2
adds r1, r6
lsls r1, 4
- ldr r2, _0809B614 @ =gUnknown_020300A4
+ ldr r2, _0809B614 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
ldr r1, _0809B618 @ =gUnknown_083B6DB4
@@ -11788,7 +11788,7 @@ _0809B5E2:
pop {r0}
bx r0
.align 2, 0
-_0809B614: .4byte gUnknown_020300A4
+_0809B614: .4byte gPokemonStorage + 0x4
_0809B618: .4byte gUnknown_083B6DB4
_0809B61C: .4byte 0x00002618
_0809B620: .4byte 0x000025b4
@@ -12362,7 +12362,7 @@ _0809BA9A:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _0809BB78 @ =gUnknown_020300A4
+ ldr r2, _0809BB78 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0x50
@@ -12462,7 +12462,7 @@ _0809BB5C:
_0809BB6C: .4byte 0x0000267f
_0809BB70: .4byte 0x0000ffff
_0809BB74: .4byte 0x00002681
-_0809BB78: .4byte gUnknown_020300A4
+_0809BB78: .4byte gPokemonStorage + 0x4
_0809BB7C: .4byte 0x00002686
_0809BB80: .4byte 0x00002682
_0809BB84: .4byte 0x0000267e
@@ -12817,7 +12817,7 @@ _0809BE34:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _0809BE7C @ =gUnknown_020300A4
+ ldr r2, _0809BE7C @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0x8
@@ -12832,7 +12832,7 @@ _0809BE68:
_0809BE70: .4byte gUnknown_020384E4
_0809BE74: .4byte gUnknown_020384E5
_0809BE78: .4byte gPlayerParty
-_0809BE7C: .4byte gUnknown_020300A4
+_0809BE7C: .4byte gPokemonStorage + 0x4
thumb_func_end sub_809BDD8
thumb_func_start sub_809BE80
@@ -13045,7 +13045,7 @@ _0809BFEE:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _0809C024 @ =gUnknown_020300A4
+ ldr r2, _0809C024 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0x1
@@ -13056,7 +13056,7 @@ _0809C018:
bx r0
.align 2, 0
_0809C020: .4byte gUnknown_020384E5
-_0809C024: .4byte gUnknown_020300A4
+_0809C024: .4byte gPokemonStorage + 0x4
thumb_func_end sub_809BF74
thumb_func_start sub_809C028
diff --git a/asm/pokenav.s b/asm/pokenav.s
index d86790b71..49d627336 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -17339,7 +17339,7 @@ _080F44FC:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _080F451C @ =gUnknown_020300A4
+ ldr r2, _080F451C @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
adds r1, r4, 0
@@ -17347,7 +17347,7 @@ _080F44FC:
bl GetBoxMonData
b _080F453C
.align 2, 0
-_080F451C: .4byte gUnknown_020300A4
+_080F451C: .4byte gPokemonStorage + 0x4
_080F4520:
lsls r1, r0, 2
adds r1, r0
@@ -17357,7 +17357,7 @@ _080F4520:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _080F4544 @ =gUnknown_020300A4
+ ldr r2, _080F4544 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
adds r1, r4, 0
@@ -17367,7 +17367,7 @@ _080F453C:
pop {r1}
bx r1
.align 2, 0
-_080F4544: .4byte gUnknown_020300A4
+_080F4544: .4byte gPokemonStorage + 0x4
thumb_func_end sub_80F44B0
thumb_func_start sub_80F4548
@@ -17401,7 +17401,7 @@ _080F4574:
lsls r1, r4, 2
adds r1, r4
lsls r1, 4
- ldr r2, _080F459C @ =gUnknown_020300A4
+ ldr r2, _080F459C @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0x8
@@ -17413,7 +17413,7 @@ _080F4592:
pop {r0}
bx r0
.align 2, 0
-_080F459C: .4byte gUnknown_020300A4
+_080F459C: .4byte gPokemonStorage + 0x4
thumb_func_end sub_80F4548
thumb_func_start sub_80F45A0
@@ -17472,7 +17472,7 @@ _080F4608:
adds r0, r5, r0
lsls r1, r2, 3
adds r1, r2
- ldr r2, _080F4638 @ =gUnknown_020383E4
+ ldr r2, _080F4638 @ =gPokemonStorage + 0x8344
adds r1, r2
movs r2, 0x40
movs r3, 0
@@ -17488,7 +17488,7 @@ _080F4624:
b _080F4676
.align 2, 0
_080F4634: .4byte 0x000088e9
-_080F4638: .4byte gUnknown_020383E4
+_080F4638: .4byte gPokemonStorage + 0x8344
_080F463C: .4byte gUnknown_083DFEC4
_080F4640: .4byte 0x00008937
_080F4644:
@@ -18432,7 +18432,7 @@ _080F4DAA:
ldr r0, _080F4EA4 @ =0x000087d8
adds r0, r4
mov r9, r0
- ldr r1, _080F4EA8 @ =gUnknown_020300A4
+ ldr r1, _080F4EA8 @ =gPokemonStorage + 0x4
mov r8, r1
_080F4DCA:
ldrb r0, [r6]
@@ -18541,7 +18541,7 @@ _080F4E98: .4byte gUnknown_083DFEC4
_080F4E9C: .4byte 0x00008fe6
_080F4EA0: .4byte 0x00008fe7
_080F4EA4: .4byte 0x000087d8
-_080F4EA8: .4byte gUnknown_020300A4
+_080F4EA8: .4byte gPokemonStorage + 0x4
_080F4EAC: .4byte 0xffff00ff
_080F4EB0: .4byte 0xffe0ffff
_080F4EB4: .4byte 0xffffff00
@@ -21141,7 +21141,7 @@ _080F6278:
adds r5, r7, r1
ldr r0, _080F6310 @ =0x00008fe7
adds r4, r7, r0
- ldr r1, _080F6314 @ =gUnknown_020300A4
+ ldr r1, _080F6314 @ =gPokemonStorage + 0x4
mov r8, r1
ldr r0, _080F6318 @ =0x000041a0
add r0, r8
@@ -21205,7 +21205,7 @@ _080F62FE:
.align 2, 0
_080F630C: .4byte 0x00008fe6
_080F6310: .4byte 0x00008fe7
-_080F6314: .4byte gUnknown_020300A4
+_080F6314: .4byte gPokemonStorage + 0x4
_080F6318: .4byte 0x000041a0
_080F631C:
movs r0, 0
@@ -21336,7 +21336,7 @@ _080F63FC:
lsls r1, r2, 2
adds r1, r2
lsls r1, 4
- ldr r2, _080F6488 @ =gUnknown_020300A4
+ ldr r2, _080F6488 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
movs r1, 0x51
@@ -21393,7 +21393,7 @@ _080F646E:
_080F647C: .4byte gUnknown_083DFEC4
_080F6480: .4byte 0x00008fe6
_080F6484: .4byte 0x00008fe7
-_080F6488: .4byte gUnknown_020300A4
+_080F6488: .4byte gPokemonStorage + 0x4
_080F648C: .4byte 0xffff00ff
_080F6490: .4byte 0xffe0ffff
_080F6494: .4byte 0xffffff00
@@ -21544,7 +21544,7 @@ _080F65B4:
lsls r1, r7, 2
adds r1, r7
lsls r1, 4
- ldr r2, _080F6620 @ =gUnknown_020300A4
+ ldr r2, _080F6620 @ =gPokemonStorage + 0x4
adds r1, r2
adds r0, r1
bl GetLevelFromBoxMonExp
@@ -21587,7 +21587,7 @@ _080F65FC:
beq _080F663C
b _080F6656
.align 2, 0
-_080F6620: .4byte gUnknown_020300A4
+_080F6620: .4byte gPokemonStorage + 0x4
_080F6624:
strb r1, [r5]
movs r0, 0x1
diff --git a/asm/rom_810CBB4.s b/asm/rom_810CBB4.s
index a29775d72..78fb7e6ac 100644
--- a/asm/rom_810CBB4.s
+++ b/asm/rom_810CBB4.s
@@ -5616,7 +5616,7 @@ _0810F6FC:
lsls r0, r4, 2
adds r0, r4
lsls r0, 4
- ldr r1, _0810F718 @ =gUnknown_020300A4
+ ldr r1, _0810F718 @ =gPokemonStorage + 0x4
adds r0, r1
adds r0, r6, r0
movs r1, 0xB
@@ -5627,7 +5627,7 @@ _0810F6FC:
movs r0, 0x1
b _0810F732
.align 2, 0
-_0810F718: .4byte gUnknown_020300A4
+_0810F718: .4byte gPokemonStorage + 0x4
_0810F71C:
adds r0, r4, 0x1
lsls r0, 16
diff --git a/include/pokemon.h b/include/pokemon.h
index b705ab6a1..10eb05757 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -372,6 +372,8 @@ struct PokemonStorage
{
u8 currentBox;
struct BoxPokemon boxes[14][30];
+ u8 boxNames[14][9];
+ u8 unkArray[14];
};
extern struct Pokemon gPlayerParty[6];
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 638a61a7f..97b099d65 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -606,13 +606,7 @@ gTrainerCards: @ 202FFC0
.space 0xE0
gPokemonStorage: @ 20300A0
- .space 0x4
-
-gUnknown_020300A4: @ 20300A4
- .space 0x8340
-
-gUnknown_020383E4: @ 20383E4
- .space 0x8C
+ .space 0x83D0
gUnknown_02038470: @ 2038470
.space 0x3
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 18:38:53 +0000