summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom_80B5054.s16
-rw-r--r--asm/rom_81258BC.s54
-rw-r--r--data/data2.s13
-rw-r--r--include/global.h14
-rw-r--r--sym_ewram.txt4
5 files changed, 62 insertions, 39 deletions
diff --git a/asm/rom_80B5054.s b/asm/rom_80B5054.s
index a973e7899..c4f61606e 100644
--- a/asm/rom_80B5054.s
+++ b/asm/rom_80B5054.s
@@ -151110,7 +151110,7 @@ sub_80FE470: @ 80FE470
movs r0, 0xBA
strb r0, [r7]
adds r7, 0x1
- ldr r0, _080FE524 @ =gUnknown_08402E40
+ ldr r0, _080FE524 @ =gDecorationInventories
lsls r4, 3
adds r4, r0
ldrb r1, [r4, 0x4]
@@ -151140,7 +151140,7 @@ sub_80FE470: @ 80FE470
.align 2, 0
_080FE51C: .4byte gStringVar4
_080FE520: .4byte gUnknown_083EC5E4
-_080FE524: .4byte gUnknown_08402E40
+_080FE524: .4byte gDecorationInventories
thumb_func_end sub_80FE470
thumb_func_start sub_80FE528
@@ -151318,7 +151318,7 @@ _080FE656:
ldrb r0, [r4]
bl sub_8134104
ldr r2, _080FE6C8 @ =gUnknown_020388D0
- ldr r1, _080FE6CC @ =gUnknown_08402E40
+ ldr r1, _080FE6CC @ =gDecorationInventories
ldrb r0, [r4]
lsls r0, 3
adds r0, r1
@@ -151343,7 +151343,7 @@ _080FE656:
_080FE6C0: .4byte gUnknown_020388F6
_080FE6C4: .4byte gUnknown_020388D5
_080FE6C8: .4byte gUnknown_020388D0
-_080FE6CC: .4byte gUnknown_08402E40
+_080FE6CC: .4byte gDecorationInventories
_080FE6D0: .4byte gUnknown_020388F7
_080FE6D4: .4byte gTasks
_080FE6D8: .4byte sub_80FE868
@@ -152224,7 +152224,7 @@ _080FEDB0:
movs r3, 0
ldr r0, _080FEE38 @ =gSaveBlock1 + 0x1A1A
mov r10, r0
- ldr r1, _080FEE3C @ =gUnknown_08402E40
+ ldr r1, _080FEE3C @ =gDecorationInventories
mov r9, r1
ldr r2, _080FEE40 @ =gUnknown_020388F6
mov r8, r2
@@ -152287,7 +152287,7 @@ _080FEE1E:
_080FEE30: .4byte gUnknown_020388D6
_080FEE34: .4byte gUnknown_020388E6
_080FEE38: .4byte gSaveBlock1 + 0x1A1A
-_080FEE3C: .4byte gUnknown_08402E40
+_080FEE3C: .4byte gDecorationInventories
_080FEE40: .4byte gUnknown_020388F6
_080FEE44: .4byte gUnknown_020388D0
_080FEE48:
@@ -152308,7 +152308,7 @@ _080FEE5A:
bls _080FEDC8
movs r6, 0
movs r3, 0
- ldr r0, _080FEEE4 @ =gUnknown_08402E40
+ ldr r0, _080FEEE4 @ =gDecorationInventories
mov r8, r0
_080FEE6C:
ldr r0, _080FEEE8 @ =gSaveBlock1
@@ -152373,7 +152373,7 @@ _080FEED0:
lsrs r6, r0, 16
b _080FEF0E
.align 2, 0
-_080FEEE4: .4byte gUnknown_08402E40
+_080FEEE4: .4byte gDecorationInventories
_080FEEE8: .4byte gSaveBlock1
_080FEEEC: .4byte 0x00002688
_080FEEF0: .4byte gUnknown_020388F6
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s
index 1467e60c4..351a38932 100644
--- a/asm/rom_81258BC.s
+++ b/asm/rom_81258BC.s
@@ -18551,7 +18551,7 @@ sub_8133F4C: @ 8133F4C
push {r4,r5,lr}
lsls r0, 24
movs r3, 0
- ldr r1, _08133F7C @ =gUnknown_08402E40
+ ldr r1, _08133F7C @ =gDecorationInventories
lsrs r2, r0, 21
adds r0, r2, r1
ldrb r0, [r0, 0x4]
@@ -18575,7 +18575,7 @@ _08133F76:
pop {r0}
bx r0
.align 2, 0
-_08133F7C: .4byte gUnknown_08402E40
+_08133F7C: .4byte gDecorationInventories
thumb_func_end sub_8133F4C
thumb_func_start sub_8133F80
@@ -18600,7 +18600,7 @@ sub_8133F9C: @ 8133F9C
push {r4,lr}
lsls r0, 24
movs r2, 0
- ldr r1, _08133FC8 @ =gUnknown_08402E40
+ ldr r1, _08133FC8 @ =gDecorationInventories
lsrs r0, 21
adds r0, r1
movs r1, 0x4
@@ -18620,7 +18620,7 @@ _08133FB4:
adds r0, r1, 0
b _08133FDC
.align 2, 0
-_08133FC8: .4byte gUnknown_08402E40
+_08133FC8: .4byte gDecorationInventories
_08133FCC:
adds r0, r1, 0x1
lsls r0, 24
@@ -18647,7 +18647,7 @@ sub_8133FE4: @ 8133FE4
adds r0, r1
ldrb r0, [r0, 0x13]
movs r2, 0
- ldr r1, _08134014 @ =gUnknown_08402E40
+ ldr r1, _08134014 @ =gDecorationInventories
lsls r0, 3
adds r0, r1
ldrb r1, [r0, 0x4]
@@ -18663,7 +18663,7 @@ _08134002:
b _08134024
.align 2, 0
_08134010: .4byte gDecorations
-_08134014: .4byte gUnknown_08402E40
+_08134014: .4byte gDecorationInventories
_08134018:
adds r0, r2, 0x1
lsls r0, 24
@@ -18698,7 +18698,7 @@ IsThereStorageSpaceForDecoration: @ 813402C
negs r0, r0
cmp r2, r0
beq _0813406C
- ldr r0, _08134068 @ =gUnknown_08402E40
+ ldr r0, _08134068 @ =gDecorationInventories
lsls r1, r5, 3
adds r1, r0
ldr r0, [r1]
@@ -18708,7 +18708,7 @@ IsThereStorageSpaceForDecoration: @ 813402C
b _0813406E
.align 2, 0
_08134064: .4byte gDecorations
-_08134068: .4byte gUnknown_08402E40
+_08134068: .4byte gDecorationInventories
_0813406C:
movs r0, 0
_0813406E:
@@ -18763,7 +18763,7 @@ _081340B6:
movs r0, 0x1
b _081340F4
_081340C4:
- ldr r2, _081340FC @ =gUnknown_08402E40
+ ldr r2, _081340FC @ =gDecorationInventories
ldr r1, _08134100 @ =gDecorations
lsls r0, r5, 5
adds r0, r1
@@ -18794,7 +18794,7 @@ _081340F4:
pop {r1}
bx r1
.align 2, 0
-_081340FC: .4byte gUnknown_08402E40
+_081340FC: .4byte gDecorationInventories
_08134100: .4byte gDecorations
thumb_func_end sub_81340A8
@@ -18808,7 +18808,7 @@ sub_8134104: @ 8134104
sub sp, 0x4
lsls r0, 24
movs r6, 0
- ldr r2, _08134190 @ =gUnknown_08402E40
+ ldr r2, _08134190 @ =gDecorationInventories
lsrs r1, r0, 21
adds r0, r1, r2
ldrb r0, [r0, 0x4]
@@ -18825,7 +18825,7 @@ _08134126:
mov r12, r1
cmp r3, r8
bcs _08134174
- ldr r1, _08134190 @ =gUnknown_08402E40
+ ldr r1, _08134190 @ =gDecorationInventories
mov r10, r1
adds r0, r1, 0
mov r9, r0
@@ -18877,7 +18877,7 @@ _08134180:
pop {r0}
bx r0
.align 2, 0
-_08134190: .4byte gUnknown_08402E40
+_08134190: .4byte gDecorationInventories
thumb_func_end sub_8134104
thumb_func_start sub_8134194
@@ -18886,7 +18886,7 @@ sub_8134194: @ 8134194
lsls r0, 24
movs r4, 0
movs r3, 0
- ldr r2, _081341D0 @ =gUnknown_08402E40
+ ldr r2, _081341D0 @ =gDecorationInventories
lsrs r1, r0, 21
adds r0, r1, r2
ldrb r0, [r0, 0x4]
@@ -18916,7 +18916,7 @@ _081341C8:
pop {r1}
bx r1
.align 2, 0
-_081341D0: .4byte gUnknown_08402E40
+_081341D0: .4byte gDecorationInventories
thumb_func_end sub_8134194
thumb_func_start sub_81341D4
@@ -18958,7 +18958,7 @@ _08134208: .4byte gSaveBlock1 + 0x3144
sub_813420C: @ 813420C
push {r4-r6,lr}
movs r2, 0
- ldr r6, _08134238 @ =gUnknown_02039302
+ ldr r6, _08134238 @ =gRoamerLocation
ldr r4, _0813423C @ =gUnknown_020392FC
movs r3, 0
adds r5, r4, 0x1
@@ -18980,7 +18980,7 @@ _08134218:
pop {r0}
bx r0
.align 2, 0
-_08134238: .4byte gUnknown_02039302
+_08134238: .4byte gRoamerLocation
_0813423C: .4byte gUnknown_020392FC
thumb_func_end sub_813420C
@@ -19049,7 +19049,7 @@ sub_8134240: @ 8134240
movs r1, 0x2F
bl GetMonData
strb r0, [r4, 0x12]
- ldr r4, _08134304 @ =gUnknown_02039302
+ ldr r4, _08134304 @ =gRoamerLocation
mov r0, r8
strb r0, [r4]
bl Random
@@ -19078,7 +19078,7 @@ _081342FC: .4byte gEnemyParty
_sub_8134240_Latias: .4byte 407
.endif
_08134300: .4byte gSaveBlock1 + 0x3144
-_08134304: .4byte gUnknown_02039302
+_08134304: .4byte gRoamerLocation
_08134308: .4byte gUnknown_08402E80
thumb_func_end sub_8134240
@@ -19122,7 +19122,7 @@ sub_8134348: @ 8134348
ldrb r0, [r0, 0x13]
cmp r0, 0
beq _08134380
- ldr r0, _0813438C @ =gUnknown_02039302
+ ldr r0, _0813438C @ =gRoamerLocation
strb r1, [r0]
ldr r5, _08134390 @ =gUnknown_08402E80
adds r4, r0, 0
@@ -19149,7 +19149,7 @@ _08134380:
bx r0
.align 2, 0
_08134388: .4byte gSaveBlock1 + 0x3144
-_0813438C: .4byte gUnknown_02039302
+_0813438C: .4byte gRoamerLocation
_08134390: .4byte gUnknown_08402E80
thumb_func_end sub_8134348
@@ -19171,7 +19171,7 @@ _081343AE:
ldrb r0, [r0, 0x13]
cmp r0, 0
beq _08134416
- ldr r7, _08134400 @ =gUnknown_02039302
+ ldr r7, _08134400 @ =gRoamerLocation
ldr r3, _08134404 @ =gUnknown_08402E80
_081343BA:
lsls r0, r4, 1
@@ -19209,7 +19209,7 @@ _081343F4:
b _08134416
.align 2, 0
_081343FC: .4byte gSaveBlock1 + 0x3144
-_08134400: .4byte gUnknown_02039302
+_08134400: .4byte gRoamerLocation
_08134404: .4byte gUnknown_08402E80
_08134408: .4byte gUnknown_020392FC
_0813440C:
@@ -19235,7 +19235,7 @@ sub_813441C: @ 813441C
ldrb r0, [r0, 0x13]
cmp r0, 0
beq _08134448
- ldr r0, _08134444 @ =gUnknown_02039302
+ ldr r0, _08134444 @ =gRoamerLocation
ldrb r3, [r0]
cmp r2, r3
bne _08134448
@@ -19246,7 +19246,7 @@ sub_813441C: @ 813441C
b _0813444A
.align 2, 0
_08134440: .4byte gSaveBlock1 + 0x3144
-_08134444: .4byte gUnknown_02039302
+_08134444: .4byte gRoamerLocation
_08134448:
movs r0, 0
_0813444A:
@@ -19373,14 +19373,14 @@ _08134534: .4byte gSaveBlock1 + 0x3144
thumb_func_start sub_8134538
sub_8134538: @ 8134538
- ldr r3, _08134544 @ =gUnknown_02039302
+ ldr r3, _08134544 @ =gRoamerLocation
ldrb r2, [r3]
strb r2, [r0]
ldrb r0, [r3, 0x1]
strb r0, [r1]
bx lr
.align 2, 0
-_08134544: .4byte gUnknown_02039302
+_08134544: .4byte gRoamerLocation
thumb_func_end sub_8134538
thumb_func_start sub_8134548
diff --git a/data/data2.s b/data/data2.s
index 5af21c211..6d4e3998d 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -26875,8 +26875,17 @@ gUnknown_08402E39:: @ 8402E39
gUnknown_08402E3D:: @ 8402E3D
.byte 4, 5, 6
-gUnknown_08402E40:: @ 8402E40
- .incbin "baserom.gba", 0x00402e40, 0x40
+@ pointer to decorations, capacity
+ .align 2
+gDecorationInventories:: @ 8402E40
+ .4byte gSaveBlock1 + 0x26A0, 10 @ DESK
+ .4byte gSaveBlock1 + 0x26AA, 10 @ CHAIR
+ .4byte gSaveBlock1 + 0x26B4, 10 @ PLANT
+ .4byte gSaveBlock1 + 0x26BE, 30 @ ORNAMENT
+ .4byte gSaveBlock1 + 0x26DC, 30 @ MAT
+ .4byte gSaveBlock1 + 0x26FA, 10 @ POSTER
+ .4byte gSaveBlock1 + 0x2704, 40 @ DOLL
+ .4byte gSaveBlock1 + 0x272C, 10 @ CUSHION
gUnknown_08402E80:: @ 8402E80
.incbin "baserom.gba", 0x00402e80, 0x80
diff --git a/include/global.h b/include/global.h
index 48da0a306..f4a4bb96a 100644
--- a/include/global.h
+++ b/include/global.h
@@ -181,7 +181,19 @@ struct SaveBlock1
u16 vars[0x100];
u32 gameStats[NUM_GAME_STATS];
struct BerryTree berryTrees[128];
- u8 filler_1A08[0x14F4];
+ u8 secretBases[20][160]; // TODO: secret base struct
+ u8 filler_2688[0x18];
+ u8 decorDesk[10];
+ u8 decorChair[10];
+ u8 decorPlant[10];
+ u8 decorOrnament[30];
+ u8 decorMat[30];
+ u8 decorPoster[10];
+ u8 decorDoll[40];
+ u8 decorCushion[10];
+ u8 padding_2736[2];
+ u8 tvShows[24][36]; // TODO: TV show struct
+ u8 filler_2A98[0x464];
struct SB1_2EFC_Struct sb1_2EFC_struct[5];
u8 filler_2F9C[0x1C4];
struct EnigmaBerry enigmaBerry;
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 0be152dcf..cf1d64fc3 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1082,7 +1082,9 @@ gUnknown_02039288: @ 2039288
gUnknown_020392FC: @ 20392FC
.space 0x6
-gUnknown_02039302: @ 2039302
+@ Latios/Latias location
+@ map group, map num.
+gRoamerLocation: @ 2039302
.space 0x2
gUnknown_02039304: @ 2039304
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-13 14:59:46 +0000