summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data2.s180
-rw-r--r--data/mon_pokeblock_anims.s133
2 files changed, 285 insertions, 28 deletions
diff --git a/data/data2.s b/data/data2.s
index e98f96690..0fc3a1109 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
@@ -29993,11 +30120,8 @@ gUnknown_08411960:: @ 8411960
gUnknown_08411980:: @ 8411980
.incbin "graphics/misc/clock_small.4bpp.lz"
-gUnknown_08411A10:: @ 8411A10
- .incbin "baserom.gba", 0x00411a10, 0x32
-
-gUnknown_08411A42:: @ 8411A42
- .incbin "baserom.gba", 0x00411A42, 0x44c
+@ 8411A10
+ .include "data/mon_pokeblock_anims.s"
.align 2
gSpriteAffineAnim_8411E90:: @ 8411E90
diff --git a/data/mon_pokeblock_anims.s b/data/mon_pokeblock_anims.s
new file mode 100644
index 000000000..d8df29c1d
--- /dev/null
+++ b/data/mon_pokeblock_anims.s
@@ -0,0 +1,133 @@
+gNatureToMonPokeblockAnim:: @ 8411A10
+ .byte 0, 0 @ HARDY
+ .byte 3, 0 @ LONELY
+ .byte 4, 1 @ BRAVE
+ .byte 5, 0 @ ADAMANT
+ .byte 10, 0 @ NAUGHTY
+ .byte 13, 0 @ BOLD
+ .byte 15, 0 @ DOCILE
+ .byte 16, 2 @ RELAXED
+ .byte 18, 0 @ IMPISH
+ .byte 19, 0 @ LAX
+ .byte 20, 0 @ TIMID
+ .byte 25, 0 @ HASTY
+ .byte 27, 3 @ SERIOUS
+ .byte 28, 0 @ JOLLY
+ .byte 29, 0 @ NAIVE
+ .byte 33, 4 @ MODEST
+ .byte 36, 0 @ MILD
+ .byte 37, 0 @ QUIET
+ .byte 39, 0 @ BASHFUL
+ .byte 42, 0 @ RASH
+ .byte 45, 0 @ CALM
+ .byte 46, 5 @ GENTLE
+ .byte 47, 6 @ SASSY
+ .byte 48, 0 @ CAREFUL
+ .byte 53, 0 @ QUIRKY
+
+ .align 1
+gMonPokeblockAnims:: @ 8411A42
+ @ HARDY
+ .2byte 0, 4, 0, 8, 24, 0, 0, 0, 12, 0
+ .2byte 0, 4, 0, 16, 24, 0, 0, 0, 12, 0
+ .2byte 0, 4, 0, 32, 32, 0, 0, 0, 16, 1
+
+ @ LONELY
+ .2byte 0, 3, 6, 0, 48, 0, 0, 0, 24, 1
+
+ @ BRAVE
+ .2byte 64, 16, -24, 0, 32, 0, 0, 0, 0, 1
+
+ @ ADAMANT
+ .2byte 0, 4, 8, 0, 16, 0, -8, 0, 0, 0
+ .2byte 0, 0, 0, 0, 16, 0, 0, 0, 0, 0
+ .2byte 0, 4, 8, 0, 16, 0, -8, 0, 0, 0
+ .2byte 0, 0, 0, 0, 16, 0, 0, 0, 0, 0
+ .2byte 0, 4, -16, 0, 4, 0, 16, 0, 0, 1
+
+ @ NAUGHTY
+ .2byte 0, 3, 6, 0, 12, 0, 0, 0, 6, 0
+ .2byte 0, 3, -6, 0, 12, 0, 0, 0, 6, 0
+ .2byte 0, 16, 16, 0, 45, 1, 0, 0, 0, 1
+
+ @ BOLD
+ .2byte 0, 16, 0, 24, 32, 0, 0, 0, 16, 0
+ .2byte 0, 16, 0, 23, 32, 0, 0, 0, 16, 1
+
+ @ DOCILE
+ .2byte 0, 0, 0, 0, 80, 0, 0, 0, 0, 1
+
+ @ RELAXED
+ .2byte 0, 2, 8, 0, 32, 0, 0, 0, 0, 0
+ .2byte 0, 2, -8, 0, 32, 0, 0, 0, 0, 1
+
+ @ IMPISH
+ .2byte 0, 32, 2, 1, 48, 1, 0, 0, 24, 1
+
+ @ LAX
+ .2byte 0, 2, 16, 16, 128, 0, 0, 0, 0, 1
+
+ @ TIMID
+ .2byte 0, 2, -8, 0, 48, 0, -24, 0, 0, 0
+ .2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 0
+ .2byte 64, 32, 2, 0, 36, 0, 0, 0, 0, 0
+ .2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 0
+ .2byte 0, 2, 8, 0, 48, 0, 24, 0, 0, 1
+
+ @ HASTY
+ .2byte 64, 24, 16, 0, 32, 0, 0, 0, 0, 0
+ .2byte 0, 28, 2, 1, 32, 1, 0, 0, 16, 1
+
+ @ SERIOUS
+ .2byte 0, 0, 0, 0, 32, 0, 0, 0, 0, 1
+
+ @ JOLLY
+ .2byte 64, 16, -16, 2, 48, 0, 0, 0, 32, 1
+
+ @ NAIVE
+ .2byte 0, 12, -8, 4, 24, 0, 8, 0, 12, 0
+ .2byte 0, 12, 8, 8, 24, 0, -16, 0, 12, 0
+ .2byte 0, 12, -8, 16, 24, 0, 16, 0, 12, 0
+ .2byte 0, 12, 8, 28, 24, 0, -8, 0, 12, 1
+
+ @ MODEST
+ .2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 0
+ .2byte 64, 16, -4, 0, 32, 0, 0, 0, 0, 0
+ .2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 1
+
+ @ MILD
+ .2byte 128, 4, 0, 8, 64, 0, 0, 0, 0, 1
+
+ @ QUIET
+ .2byte 0, 2, 16, 0, 48, 0, 0, 0, 0, 0
+ .2byte 128, 2, 16, 0, 48, 0, 0, 0, 0, 1
+
+ @ BASHFUL
+ .2byte 0, 2, -4, 0, 48, 0, -48, 0, 0, 0
+ .2byte 0, 0, 0, 0, 80, 0, 0, 0, 0, 0
+ .2byte 0, 2, 8, 0, 24, 0, 48, 0, 0, 1
+
+ @ RASH
+ .2byte 64, 4, 64, 58, 52, 0, -88, 0, 0, 0
+ .2byte 0, 0, 0, 0, 80, 0, 0, 0, 0, 0
+ .2byte 0, 24, 80, 0, 32, 0, 88, 0, 0, 1
+
+ @ CALM
+ .2byte 0, 2, 16, 4, 64, 0, 0, 0, 0, 1
+
+ @ GENTLE
+ .2byte 0, 0, 0, 0, 32, 0, 0, 0, 0, 1
+
+ @ SASSY
+ .2byte 0, 0, 0, 0, 42, 0, 0, 0, 0, 1
+
+ @ CAREFUL
+ .2byte 0, 4, 0, 8, 24, 0, 0, 0, 12, 0
+ .2byte 0, 0, 0, 0, 12, 0, 0, 0, 0, 0
+ .2byte 0, 4, 0, 12, 24, 0, 0, 0, 12, 0
+ .2byte 0, 0, 0, 0, 12, 0, 0, 0, 0, 0
+ .2byte 0, 4, 0, 4, 24, 0, 0, 0, 12, 1
+
+ @ QUIRKY
+ .2byte 0, 4, 16, 12, 64, 0, 0, 0, 0, 0
+ .2byte 0, -4, 16, 12, 64, 0, 0, 0, 0, 1
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 07:16:41 +0000