summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom3.s10
-rw-r--r--asm/rom_8040EB4.s14
-rw-r--r--data/data2.s173
-rw-r--r--graphics/trade/moves_box_map.binbin0 -> 510 bytes
-rw-r--r--graphics/trade/party_box_map.binbin0 -> 510 bytes
-rw-r--r--graphics/unused/dakuten.pngbin0 -> 102 bytes
6 files changed, 162 insertions, 35 deletions
diff --git a/asm/rom3.s b/asm/rom3.s
index 735e17338..862a7bc0f 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -53644,7 +53644,7 @@ _080249A4: .4byte gUnknown_0840165C
_080249A8: .4byte 0x02000000
_080249AC: .4byte 0x00016018
_080249B0: .4byte 0x03004360
-_080249B4: .4byte gUnknown_081FACEF
+_080249B4: .4byte gLevelUpStatBoxStats
_080249B8: .4byte _080249BC
.align 2, 0
_080249BC:
@@ -53883,7 +53883,7 @@ _08024B9C: .4byte gUnknown_08400D9F
_08024BA0: .4byte 0x00016018
_08024BA4: .4byte gUnknown_0840165C
_08024BA8: .4byte 0x03004360
-_08024BAC: .4byte gUnknown_081FACEF
+_08024BAC: .4byte gLevelUpStatBoxStats
_08024BB0:
strb r6, [r5]
movs r0, 0x11
@@ -54689,7 +54689,7 @@ _08025200: .4byte 0x02024c07
_08025204: .4byte 0x02024ca8
_08025208: .4byte 0x02024a7e
_0802520C: .4byte 0x02024a68
-_08025210: .4byte gUnknown_081FACF6
+_08025210: .4byte gProtectSuccessRates
_08025214: .4byte gBattleMoves
_08025218: .4byte 0x02024be6
_0802521C: .4byte 0x02024d28
@@ -67010,7 +67010,7 @@ atkEB_settypetoterrain: @ 802B330
.align 2, 0
_0802B3A0: .4byte 0x02024a80
_0802B3A4: .4byte 0x02024c07
-_0802B3A8: .4byte gUnknown_081FAD86
+_0802B3A8: .4byte gTerrainToType
_0802B3AC: .4byte 0x0300428c
_0802B3B0: .4byte 0x030041c0
_0802B3B4: .4byte 0x02024c10
@@ -67532,7 +67532,7 @@ _0802B7DC:
strb r1, [r0, 0x5]
b _0802B81C
.align 2, 0
-_0802B7F4: .4byte gUnknown_081FAD90
+_0802B7F4: .4byte gBallCatchBonuses
_0802B7F8: .4byte 0x02024a80
_0802B7FC: .4byte 0x02024c08
_0802B800: .4byte 0x02024c04
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index d9a718337..43a72f84f 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -5102,7 +5102,7 @@ sub_80435FC: @ 80435FC
pop {r0}
bx r0
.align 2, 0
-_0804364C: .4byte gUnknown_0820A430
+_0804364C: .4byte gEggShardVelocities
_08043650: .4byte 0x0300481c
thumb_func_end sub_80435FC
@@ -15873,7 +15873,7 @@ _08048B7A:
b _08048C3A
.align 2, 0
_08048BA0: .4byte gUnknown_08EA0348
-_08048BA4: .4byte gUnknown_0820AFEC
+_08048BA4: .4byte gTradeStripesBG2Tilemap
_08048BA8: .4byte gUnknown_08EA02C8
_08048BAC: .4byte 0x0202eec8
_08048BB0: .4byte 0x0202eac8
@@ -15940,7 +15940,7 @@ _08048C3A:
pop {r0}
bx r0
.align 2, 0
-_08048C40: .4byte gUnknown_0820B7EC
+_08048C40: .4byte gTradeStripesBG3Tilemap
_08048C44: .4byte 0x06003800
_08048C48: .4byte 0x040000d4
_08048C4C: .4byte 0x80000400
@@ -18507,7 +18507,7 @@ _0804A098: .4byte gUnknown_0820C29C
_0804A09C: .4byte 0x03004824
_0804A0A0: .4byte sub_809D62C
_0804A0A4: .4byte gUnknown_0820C330
-_0804A0A8: .4byte gUnknown_0820ADEE
+_0804A0A8: .4byte gTradePartyBoxTilemap
_0804A0AC:
ldr r2, _0804A0DC
ldr r1, [sp, 0x6C]
@@ -18694,7 +18694,7 @@ _0804A0E4:
ldr r1, [r2]
b _0804A28A
.align 2, 0
-_0804A228: .4byte gUnknown_0820ABF0
+_0804A228: .4byte gTradeMovesBoxTilemap
_0804A22C: .4byte 0x03004824
_0804A230: .4byte 0x02020004
_0804A234: .4byte gUnknown_0820C29C
@@ -19506,7 +19506,7 @@ sub_804A840: @ 804A840
.align 2, 0
_0804A89C: .4byte 0x03004824
_0804A8A0: .4byte gUnknown_0820C330
-_0804A8A4: .4byte gUnknown_0820ADEE
+_0804A8A4: .4byte gTradePartyBoxTilemap
_0804A8A8:
bl sub_8072DEC
ldr r4, _0804A924
@@ -19566,7 +19566,7 @@ _0804A8FA:
.align 2, 0
_0804A924: .4byte 0x03004824
_0804A928: .4byte gUnknown_0820C330
-_0804A92C: .4byte gUnknown_0820ADEE
+_0804A92C: .4byte gTradePartyBoxTilemap
_0804A930: .4byte gUnknown_0820C14C
_0804A934: .4byte 0x06010000
thumb_func_end sub_804A840
diff --git a/data/data2.s b/data/data2.s
index e98f96690..c5f814566 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1361,7 +1361,66 @@ gCriticalHitChance:: @ 81FAB50
.align 2
gUnknown_081FAB5C:: @ 81FAB5C
- .incbin "baserom.gba", 0x001fab5c, 0xf0
+ .4byte 0x00000000
+ .4byte 0x00000007
+ .4byte 0x00000008
+ .4byte 0x00000010
+ .4byte 0x00000020
+ .4byte 0x00000040
+ .4byte 0x00000080
+ .4byte 0x00000007
+ .4byte 0x00000008
+ .4byte 0x00000000
+ .4byte 0x00000070
+ .4byte 0x00000000
+ .4byte 0x00001000
+ .4byte 0x0000E000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00400000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x04000000
+ .4byte 0x08000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000C00
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .4byte 0x00000000
.align 2
gUnknown_081FAC4C:: @ 81FAC4C
@@ -1405,13 +1464,20 @@ gUnknown_081FAC4C:: @ 81FAC4C
.4byte BattleScript_1D963E
.4byte BattleScript_1D96C8
- .incbin "baserom.gba", 0x001face8, 0x7
+@ unreferenced bit masks
+ .byte 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F
-gUnknown_081FACEF:: @ 81FACEF
- .incbin "baserom.gba", 0x001facef, 0x7
+gLevelUpStatBoxStats:: @ 81FACEF
+ .byte 0x3A @ HP
+ .byte 0x3E @ Sp. Attack
+ .byte 0x3B @ Attack
+ .byte 0x3F @ Sp. Defense
+ .byte 0x3C @ Defense
+ .byte 0x3D @ Speed
-gUnknown_081FACF6:: @ 81FACF6
- .incbin "baserom.gba", 0x001facf6, 0x8
+ .align 1
+gProtectSuccessRates:: @ 81FACF6
+ .2byte 0xFFFF, 0x7FFF, 0x3FFF, 0x1FFF
.align 1
gUnknown_081FACFE:: @ 81FACFE
@@ -1482,11 +1548,25 @@ gPickupItems:: @ 81FAD5E
.2byte ITEM_PP_UP, 99
.2byte ITEM_KINGS_ROCK, 1
-gUnknown_081FAD86:: @ 81FAD86
- .incbin "baserom.gba", 0x001fad86, 0xa
+gTerrainToType:: @ 81FAD86
+ .byte TYPE_GRASS @ tall grass
+ .byte TYPE_GRASS @ long grass
+ .byte TYPE_GROUND @ sand
+ .byte TYPE_WATER @ underwater
+ .byte TYPE_WATER @ water
+ .byte TYPE_WATER @ pond water
+ .byte TYPE_ROCK @ rock
+ .byte TYPE_ROCK @ cave
+ .byte TYPE_NORMAL @ building
+ .byte TYPE_NORMAL @ plain
+
+gBallCatchBonuses:: @ 81FAD90
+ .byte 20 @ Ultra Ball
+ .byte 15 @ Great Ball
+ .byte 10 @ Poké Ball
+ .byte 15 @ Safari Ball
-gUnknown_081FAD90:: @ 81FAD90
- .incbin "baserom.gba", 0x001fad90, 0x8
+ .string "ターン$" @ "turn"
.align 2
gUnknown_081FAD98:: @ 81FAD98
@@ -1704,7 +1784,8 @@ gUnknown_081FAF5C:: @ 81FAF5C
.4byte sub_8035FA4
.4byte nullsub_46
- .incbin "baserom.gba", 0x001fb040, 0x8
+@ unreferenced unknown values
+ .byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20
.align 2
gUnknown_081FB048:: @ 81FB048
@@ -1952,8 +2033,26 @@ gBitTable:: @ 820872C
gSpriteTemplate_82087AC:: @ 82087AC
spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+@ sprite dimensions
+ .align 2
gUnknown_082087C4:: @ 82087C4
- .incbin "baserom.gba", 0x002087c4, 0x18
+ @ square
+ .byte 1, 1
+ .byte 2, 2
+ .byte 4, 4
+ .byte 8, 8
+
+ @ horizontal rectangle
+ .byte 2, 1
+ .byte 4, 1
+ .byte 4, 2
+ .byte 8, 4
+
+ @ vertical rectangle
+ .byte 1, 2
+ .byte 1, 4
+ .byte 2, 4
+ .byte 4, 8
@ 82087DC
.include "data/crc16_table.s"
@@ -2070,8 +2169,28 @@ gSpriteAnimTable_820A408:: @ 820A408
gSpriteTemplate_820A418:: @ 820A418
spr_template 23456, 54321, gOamData_820A3E0, gSpriteAnimTable_820A408, NULL, gDummySpriteAffineAnimTable, sub_80435A4
-gUnknown_0820A430:: @ 820A430
- .incbin "baserom.gba", 0x0020a430, 0x4c
+@ The values are Q8.8 fixed-point numbers.
+ .align 1
+gEggShardVelocities:: @ 820A430
+ .2byte 0xFE80, 0xFC40 @ (-1.5, -3.75)
+ .2byte 0xFB00, 0xFD00 @ (-5, -3)
+ .2byte 0x0380, 0xFD00 @ (3.5, -3)
+ .2byte 0xFC00, 0xFC40 @ (-4, -3.75)
+ .2byte 0x0200, 0xFE80 @ (2, -1.5)
+ .2byte 0xFF80, 0xF940 @ (-0.5, -6.75)
+ .2byte 0x0500, 0xFDC0 @ (5, -2.25)
+ .2byte 0xFE80, 0xFC40 @ (-1.5, -3.75)
+ .2byte 0x0480, 0xFE80 @ (4.5, -1.5)
+ .2byte 0xFF00, 0xF940 @ (-1, -6.75)
+ .2byte 0x0400, 0xFDC0 @ (4, -2.25)
+ .2byte 0xFC80, 0xFC40 @ (-3.5, -3.75)
+ .2byte 0x0100, 0xFE80 @ (1, -1.5)
+ .2byte 0xFC7C, 0xF940 @ (-3.515625, -6.75)
+ .2byte 0x0480, 0xFDC0 @ (4.5, -2.25)
+ .2byte 0xFF80, 0xF880 @ (-0.5, -7.5)
+ .2byte 0x0100, 0xFB80 @ (1, -4.5)
+ .2byte 0xFD80, 0xFDC0 @ (-2.5, -2.25)
+ .2byte 0x0280, 0xF880 @ (2.5, -7.5)
.align 2
gUnknown_0820A47C:: @ 820A47C
@@ -2234,8 +2353,8 @@ gSubspriteTables_820A6E4:: @ 820A6E4
gSubspriteTables_820A6EC:: @ 820A6EC
.4byte 6, gSubspriteTable_820A6B4
-@ unreferenced; possibly tiles
- .incbin "baserom.gba", 0x0020a6f4, 0x60
+@ unused dakuten/handakuten tiles
+ .incbin "graphics/unused/dakuten.4bpp"
.align 2
gUnknown_0820A754:: @ 820A754
@@ -2521,20 +2640,28 @@ gSpriteTemplate_820AAB4:: @ 820AAB4
spr_template 55011, 55011, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
.align 2
- .incbin "baserom.gba", 0x0020abd4, 0x1c
+ .byte 0x90, 0x08, 0x00, 0x00
+ .byte 0xC0, 0x3A, 0x00, 0x00
+ .byte 0x1C, 0x00, 0x00, 0x00
+ .byte 0x30, 0x05, 0x00, 0x00
+ .byte 0x24, 0x00, 0x00, 0x00
+ .byte 0x64, 0x00, 0x00, 0x00
+ .byte 0xD8, 0x04, 0x00, 0x00
-gUnknown_0820ABF0:: @ 820ABF0
- .incbin "baserom.gba", 0x0020abf0, 0x1fe
+ .align 1
+gTradeMovesBoxTilemap:: @ 820ABF0
+ .incbin "graphics/trade/moves_box_map.bin"
-gUnknown_0820ADEE:: @ 820ADEE
- .incbin "baserom.gba", 0x0020adee, 0x1fe
+ .align 1
+gTradePartyBoxTilemap:: @ 820ADEE
+ .incbin "graphics/trade/party_box_map.bin"
.align 2
-gUnknown_0820AFEC:: @ 820AFEC
+gTradeStripesBG2Tilemap:: @ 820AFEC
.incbin "graphics/trade/stripes_bg2_map.bin"
.align 2
-gUnknown_0820B7EC:: @ 820B7EC
+gTradeStripesBG3Tilemap:: @ 820B7EC
.incbin "graphics/trade/stripes_bg3_map.bin"
.align 2
diff --git a/graphics/trade/moves_box_map.bin b/graphics/trade/moves_box_map.bin
new file mode 100644
index 000000000..123abf716
--- /dev/null
+++ b/graphics/trade/moves_box_map.bin
Binary files differ
diff --git a/graphics/trade/party_box_map.bin b/graphics/trade/party_box_map.bin
new file mode 100644
index 000000000..69304c5cb
--- /dev/null
+++ b/graphics/trade/party_box_map.bin
Binary files differ
diff --git a/graphics/unused/dakuten.png b/graphics/unused/dakuten.png
new file mode 100644
index 000000000..8672ac614
--- /dev/null
+++ b/graphics/unused/dakuten.png
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 13:31:30 +0000