summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-11-27 17:32:09 -0500
committerGitHub <noreply@github.com>2019-11-27 17:32:09 -0500
commit40d09c24e3b4360c2dcdc17763eaf2e589bc8c6a (patch)
tree0aaca7e29853230aee83810dfa8bb892a6bdfd56
parentd141445d2c7b7f820e025c1f949ddcda96baf749 (diff)
parent230561db662887d914075ec699b5bcae9c5c7cee (diff)
Merge pull request #171 from PikalaxALT/dism_pokesummary
Dism pokesummary
-rw-r--r--asm/battle_interface.s4
-rw-r--r--asm/pokemon_summary_screen.s8
-rw-r--r--baserom.ipsbin168030 -> 158660 bytes
-rw-r--r--data/field_effect.s469
-rw-r--r--data/pokemon_summary_screen.s395
-rw-r--r--graphics/field_effects/unk_83CA770.pngbin0 -> 789 bytes
-rw-r--r--graphics/field_effects/unk_83CAF70.pal19
-rw-r--r--graphics/field_effects/unk_83CAF90.pngbin0 -> 168 bytes
-rw-r--r--graphics/field_effects/unk_83CAFB0.pal19
-rw-r--r--graphics/field_effects/unk_83CAFD0.pngbin0 -> 244 bytes
-rw-r--r--graphics/field_effects/unk_83CB3D0.pal19
-rw-r--r--graphics/field_effects/unk_83CB3F0.pngbin0 -> 298 bytes
-rw-r--r--graphics/field_effects/unk_83CB5F0.pngbin0 -> 171 bytes
-rw-r--r--graphics/field_effects/unk_83CB7F0.pal19
-rw-r--r--graphics/field_effects/unk_83CB810.binbin0 -> 640 bytes
-rw-r--r--graphics/field_effects/unk_83CBA90.pngbin0 -> 153 bytes
-rw-r--r--graphics/field_effects/unk_83CBB10.pal19
-rw-r--r--graphics/field_effects/unk_83CBB30.binbin0 -> 768 bytes
-rw-r--r--graphics/interface/pokesummary_unk_84636C0.pal19
-rw-r--r--graphics/interface/pokesummary_unk_84636E0.pal19
-rw-r--r--graphics/interface/pokesummary_unk_8463700.pal19
-rw-r--r--graphics/interface/pokesummary_unk_8463720.pal19
-rw-r--r--graphics/interface/pokesummary_unk_8463740.pngbin0 -> 202 bytes
-rw-r--r--graphics/interface/pokesummary_unk_846386C.pngbin0 -> 202 bytes
-rw-r--r--graphics/interface/pokesummary_unk_8463AAC.pal19
-rw-r--r--graphics/interface/pokesummary_unk_8463ACC.pal19
-rw-r--r--graphics/interface/pokesummary_unk_8463B00.pal19
-rw-r--r--graphics/interface/pokesummary_unk_8463B20.pngbin0 -> 147 bytes
-rw-r--r--graphics/interface/pokesummary_unk_8463B44.pal19
-rw-r--r--graphics/interface/pokesummary_unk_8463B64.pngbin0 -> 164 bytes
-rw-r--r--graphics/interface/pokesummary_unk_8463B88.binbin0 -> 1280 bytes
-rw-r--r--graphics/interface/pokesummary_unk_8463C80.binbin0 -> 2048 bytes
32 files changed, 977 insertions, 146 deletions
diff --git a/asm/battle_interface.s b/asm/battle_interface.s
index 671487d57..7a0e37966 100644
--- a/asm/battle_interface.s
+++ b/asm/battle_interface.s
@@ -1701,7 +1701,7 @@ sub_80487F8: @ 80487F8
lsls r0, 24
mov r4, sp
adds r4, 0x16
- ldr r1, _080488B8 @ =gUnknown_8463E60
+ ldr r1, _080488B8 @ =gNatureNames
lsrs r0, 22
adds r0, r1
ldr r1, [r0]
@@ -1746,7 +1746,7 @@ _080488A8:
_080488AC: .4byte gUnknown_826052C
_080488B0: .4byte gSprites
_080488B4: .4byte gMonSpritesGfxPtr
-_080488B8: .4byte gUnknown_8463E60
+_080488B8: .4byte gNatureNames
_080488BC:
adds r0, r1, 0
subs r0, 0x4B
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index b345231f3..f0f13f561 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -5755,7 +5755,7 @@ sub_8137578: @ 8137578
bl GetNature
lsls r0, 24
lsrs r6, r0, 24
- ldr r1, _081375F0 @ =gUnknown_8463E60
+ ldr r1, _081375F0 @ =gNatureNames
lsls r0, r6, 2
adds r0, r1
ldr r1, [r0]
@@ -5796,7 +5796,7 @@ _081375B2:
.align 2, 0
_081375E8: .4byte gUnknown_203B140
_081375EC: .4byte 0x00003290
-_081375F0: .4byte gUnknown_8463E60
+_081375F0: .4byte gNatureNames
_081375F4:
ldr r0, [r7]
ldr r1, _08137614 @ =0x00003024
@@ -5952,7 +5952,7 @@ sub_8137724: @ 8137724
bl GetNature
lsls r0, 24
lsrs r6, r0, 24
- ldr r1, _081377A8 @ =gUnknown_8463E60
+ ldr r1, _081377A8 @ =gNatureNames
lsls r0, r6, 2
adds r0, r1
ldr r1, [r0]
@@ -5997,7 +5997,7 @@ _08137790:
.align 2, 0
_081377A0: .4byte gUnknown_203B140
_081377A4: .4byte 0x00003290
-_081377A8: .4byte gUnknown_8463E60
+_081377A8: .4byte gNatureNames
_081377AC:
cmp r5, 0xFF
bne _081377D0
diff --git a/baserom.ips b/baserom.ips
index f73209cd4..c9e739d73 100644
--- a/baserom.ips
+++ b/baserom.ips
Binary files differ
diff --git a/data/field_effect.s b/data/field_effect.s
index 1a38abf94..c6affccd2 100644
--- a/data/field_effect.s
+++ b/data/field_effect.s
@@ -6,145 +6,424 @@
.section .rodata
.align 2
- .incbin "baserom.gba", 0x3CA770, 0xE80
+gUnknown_83CA770:: @ 3CA770 4bpp
+ .incbin "graphics/field_effects/unk_83CA770.4bpp"
-gUnknown_83CB5F0:: @ 83CB5F0
- .incbin "baserom.gba", 0x3CB5F0, 0x200
+gUnknown_83CAF70:: @ 83CAF70 gbapal
+ .incbin "graphics/field_effects/unk_83CAF70.gbapal"
-gUnknown_83CB7F0:: @ 83CB7F0
- .incbin "baserom.gba", 0x3CB7F0, 0x20
+gUnknown_83CAF90:: @ 83CAF90 4bpp
+ .incbin "graphics/field_effects/unk_83CAF90.4bpp"
-gUnknown_83CB810:: @ 83CB810
- .incbin "baserom.gba", 0x3CB810, 0x280
+gUnknown_83CAFB0:: @ 83CAFB0 gbapal
+ .incbin "graphics/field_effects/unk_83CAFB0.gbapal"
-gUnknown_83CBA90:: @ 83CBA90
- .incbin "baserom.gba", 0x3CBA90, 0x80
+gUnknown_83CAFD0:: @ 83CAFD0 4bpp
+ .incbin "graphics/field_effects/unk_83CAFD0.4bpp"
-gUnknown_83CBB10:: @ 83CBB10
- .incbin "baserom.gba", 0x3CBB10, 0x20
+gUnknown_83CB3D0:: @ 83CB3D0 gbapal
+ .incbin "graphics/field_effects/unk_83CB3D0.gbapal"
-gUnknown_83CBB30:: @ 83CBB30
- .incbin "baserom.gba", 0x3CBB30, 0x300
+gUnknown_83CB3F0:: @ 83CB3F0 4bpp
+ .incbin "graphics/field_effects/unk_83CB3F0.4bpp"
-gUnknown_83CBE30:: @ 83CBE30
- .incbin "baserom.gba", 0x3CBE30, 0x20
+gUnknown_83CB5F0:: @ 83CB5F0 4bpp
+ .incbin "graphics/field_effects/unk_83CB5F0.4bpp"
-gUnknown_83CBE50:: @ 83CBE50
- .incbin "baserom.gba", 0x3CBE50, 0x20
+gUnknown_83CB7F0:: @ 83CB7F0 gbapal gUnknown_83CB5F0
+ .incbin "graphics/field_effects/unk_83CB7F0.gbapal"
-gUnknown_83CBE70:: @ 83CBE70
- .incbin "baserom.gba", 0x3CBE70, 0x14
+gUnknown_83CB810:: @ 83CB810 4bpp
+ .incbin "graphics/field_effects/unk_83CB810.bin"
-gUnknown_83CBE84:: @ 83CBE84
- .incbin "baserom.gba", 0x3CBE84, 0x18
+gUnknown_83CBA90:: @ 83CBA90 4bpp
+ .incbin "graphics/field_effects/unk_83CBA90.4bpp"
-gUnknown_83CBE9C::
- .incbin "baserom.gba", 0x3CBE9C, 0x8
+gUnknown_83CBB10:: @ 83CBB10 gbapal gUnknown_83CBA90
+ .incbin "graphics/field_effects/unk_83CBB10.gbapal"
-gUnknown_83CBEA4::
- .incbin "baserom.gba", 0x3CBEA4, 0xE4
+gUnknown_83CBB30:: @ 83CBB30 4bpp
+ .incbin "graphics/field_effects/unk_83CBB30.bin"
-gUnknown_83CBF88:: @ 83CBF88
- .incbin "baserom.gba", 0x3CBF88, 0x18
+ .align 2
+gUnknown_83CBE30:: @ 83CBE30 dataptr
+ .4byte FieldEffectCmd_loadtiles
+ .4byte FieldEffectCmd_loadfadedpal
+ .4byte FieldEffectCmd_loadpal
+ .4byte FieldEffectCmd_callnative
+ .4byte sub_80834DC
+ .4byte FieldEffectCmd_loadgfx_callnative
+ .4byte FieldEffectCmd_loadtiles_callnative
+ .4byte FieldEffectCmd_loadfadedpal_callnative
+
+gUnknown_83CBE50:: @ 83CBE50 oamdata
+ .4byte 0xc0000000, 0x00000000
+
+gOamData_83CBE58:: @ 83CBE58 oamdata
+ .4byte 0x00000000, 0x00000000
+
+gOamData_83CBE60:: @ 83CBE60 oamdata
+ .4byte 0x40000000, 0x00000000
-gUnknown_83CBFA0:: @ 83CBFA0
- .incbin "baserom.gba", 0x3CBFA0, 0x18
+gUnknown_83CBE68:: @ 83CBE68 sprite_frames
+ obj_frame_tiles gUnknown_83CA770, 0x0800
+
+gUnknown_83CBE70:: @ 83CBE70 sprite_palette
+ obj_pal gUnknown_83CAF70, 4102
+
+gUnknown_83CBE78:: @ 83CBE78
+ obj_image_anim_frame 0x0000, 1
+ obj_image_anim_end
+
+ .align 2
+gUnknown_83CBE80:: @ 83CBE80 dataptr
+ .4byte gUnknown_83CBE78
+
+gUnknown_83CBE84:: @ 83CBE84 spr_template
+ spr_template 65535, 4102, gUnknown_83CBE50, gUnknown_83CBE80, gUnknown_83CBE68, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_83CBE9C:: @ 83CBE9C sprite_palette
+ obj_pal gUnknown_83CAFB0, 4103
+
+gUnknown_83CBEA4:: @ 83CBEA4 sprite_palette
+ obj_pal gUnknown_83CB3D0, 4112
+
+gOamData_83CBEAC:: @ 83CBEAC oam_data
+ .4byte 0x80004000, 0x00000000
+
+gUnknown_83CBEB4:: @ 83CBEB4 sprite_frames
+ obj_frame_tiles gUnknown_83CAF90, 0x0020
+
+gUnknown_83CBEBC:: @ 83CBEBC sprite_frames
+ obj_frame_tiles gUnknown_83CAFD0 + 0x000, 0x0100
+ obj_frame_tiles gUnknown_83CAFD0 + 0x100, 0x0100
+ obj_frame_tiles gUnknown_83CAFD0 + 0x200, 0x0100
+ obj_frame_tiles gUnknown_83CAFD0 + 0x300, 0x0100
+
+gUnknown_83CBEDC:: @ 83CBEDC sprite_frames
+ obj_frame_tiles gUnknown_83CB3F0 + 0x000, 0x0080
+ obj_frame_tiles gUnknown_83CB3F0 + 0x080, 0x0080
+ obj_frame_tiles gUnknown_83CB3F0 + 0x100, 0x0080
+ obj_frame_tiles gUnknown_83CB3F0 + 0x180, 0x0080
+
+gUnknown_83CBEFC:: @ 83CBEFC unknown
+ .byte 0xf4, 0xf8, 0x01, 0x80
+ .byte 0x04, 0xf8, 0x20, 0x80
+ .byte 0xf4, 0x00, 0x31, 0x80
+ .byte 0x04, 0x00, 0x50, 0x80
+ .byte 0x04, 0x00, 0x00, 0x00
+
+gUnknown_83CBF10:: @ 83CBF10 dataptr
+ .4byte gUnknown_83CBEFC
+
+gUnknown_83CBF14:: @ 83CBF14 unknown
+ .byte 0xe0, 0xf8, 0x05, 0x80
+ .byte 0x00, 0xf8, 0x45, 0x80
+ .byte 0xe0, 0x00, 0x85, 0x80
+ .byte 0x00, 0x00, 0xc5, 0x80
+ .byte 0x04, 0x00, 0x00, 0x00
+
+gUnknown_83CBF28:: @ 83CBE28 dataptr
+ .4byte gUnknown_83CBF14
+
+gUnknown_83CBF2C:: @ 83CBF2C animcmd
+ obj_image_anim_frame 0x0000, 1
+ obj_image_anim_jump 0
+
+gUnknown_83CBF34:: @ 83CBF34 animcmd
+ obj_image_anim_frame 0x0001, 5
+ obj_image_anim_frame 0x0002, 5
+ obj_image_anim_frame 0x0003, 7
+ obj_image_anim_frame 0x0002, 5
+ obj_image_anim_frame 0x0001, 5
+ obj_image_anim_frame 0x0000, 5
+ obj_image_anim_loop 3
+ obj_image_anim_end
-gUnknown_83CBFB8:: @ 83CBFB8
- .incbin "baserom.gba", 0x3CBFB8, 0x18
+ .align 2
+gUnknown_83CBF54:: @ 83CBF54 dataptr
+ .4byte gUnknown_83CBF2C
+ .4byte gUnknown_83CBF34
+
+gUnknown_83CBF5C:: @ 83CBF5C animcmd
+ obj_image_anim_frame 0x0003, 8
+ obj_image_anim_frame 0x0002, 8
+ obj_image_anim_frame 0x0001, 8
+ obj_image_anim_frame 0x0000, 8
+ obj_image_anim_frame 0x0001, 8
+ obj_image_anim_frame 0x0002, 8
+ obj_image_anim_loop 2
+ obj_image_anim_frame 0x0001, 8
+ obj_image_anim_frame 0x0000, 8
+ obj_image_anim_end
-gUnknown_83CBFD0:: @ 83CBFD0
- .incbin "baserom.gba", 0x3CBFD0, 0x10
+ .align 2
+gUnknown_83CBF84:: @ 83CBF84 dataptr
+ .4byte gUnknown_83CBF5C
-gUnknown_83CBFE0:: @ 83CBFE0
- .incbin "baserom.gba", 0x3CBFE0, 0x10
+gUnknown_83CBF88:: @ 83CBF88 spr_template
+ spr_template 65535, 4103, gOamData_83CBE58, gUnknown_83CBF54, gUnknown_83CBEB4, gDummySpriteAffineAnimTable, SpriteCB_PokeballGlow
-gUnknown_83CBFF0:: @ 83CBFF0
- .incbin "baserom.gba", 0x3CBFF0, 0x20
+gUnknown_83CBFA0:: @ 83CBFA0 spr_template
+ spr_template 65535, 4103, gOamData_83CBEAC, gUnknown_83CBF54, gUnknown_83CBEBC, gDummySpriteAffineAnimTable, sub_808424C
-gUnknown_83CC010:: @ 83CC010
- .incbin "baserom.gba", 0x3CC010, 0x18
+gUnknown_83CBFB8:: @ 83CBFB8 spr_template
+ spr_template 65535, 4112, gOamData_83CBE60, gUnknown_83CBF84, gUnknown_83CBEDC, gDummySpriteAffineAnimTable, sub_80842AC
-gUnknown_83CC028:: @ 83CC028
- .incbin "baserom.gba", 0x3CC028, 0x4
+ .align 2
+gUnknown_83CBFD0:: @ 83CBFD0 dataptr
+ .4byte PokecenterHealEffect_0
+ .4byte PokecenterHealEffect_1
+ .4byte sub_8083C78
+ .4byte PokecenterHealEffect_3
-gUnknown_83CC02C:: @ 83CC02C
- .incbin "baserom.gba", 0x3CC02C, 0x4
+ .align 2
+gUnknown_83CBFE0:: @ 83CBFE0 dataptr
+ .4byte HallOfFameRecordEffect_0
+ .4byte sub_8083D74
+ .4byte sub_8083DAC
+ .4byte sub_8083DD4
-gUnknown_83CC030:: @ 83CC030
- .incbin "baserom.gba", 0x3CC030, 0x4
+ .align 2
+gUnknown_83CBFF0:: @ 83CBFF0 dataptr
+ .4byte PokeballGlowEffect_0
+ .4byte PokeballGlowEffect_1
+ .4byte PokeballGlowEffect_2
+ .4byte PokeballGlowEffect_3
+ .4byte PokeballGlowEffect_4
+ .4byte PokeballGlowEffect_5
+ .4byte PokeballGlowEffect_6
+ .4byte nullsub_50
-gUnknown_83CC034:: @ 83CC034
- .incbin "baserom.gba", 0x3CC034, 0x1C
+gUnknown_83CC010:: @ 83CC010 data16
+ .2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008
-gUnknown_83CC050:: @ 83CC050
- .incbin "baserom.gba", 0x3CC050, 0x18
+gUnknown_83CC028:: @ 83CC028 data8
+ .byte 0x10, 0x0c, 0x08, 0x00
-gUnknown_83CC068:: @ 83CC068
- .incbin "baserom.gba", 0x3CC068, 0x1C
+gUnknown_83CC02C:: @ 83CC02C data8
+ .byte 0x10, 0x0c, 0x08, 0x00
-gUnknown_83CC084:: @ 83CC084
- .incbin "baserom.gba", 0x3CC084, 0x14
+gUnknown_83CC030:: @ 83CC030 data8
+ .byte 0x00, 0x00, 0x00, 0x00
-gUnknown_83CC098:: @ 83CC098
- .incbin "baserom.gba", 0x3CC098, 0xC
+ .align 2
+gUnknown_83CC034:: @ 83CC034 dataptr
+ .4byte sub_80844BC
+ .4byte sub_8084564
+ .4byte sub_8084580
+ .4byte sub_80845F4
+ .4byte sub_80846AC
+ .4byte sub_80846C8
+ .4byte sub_8084708
-gUnknown_83CC0A4:: @ 83CC0A4
- .incbin "baserom.gba", 0x3CC0A4, 0x18
+ .align 2
+gUnknown_83CC050:: @ 83CC050 dataptr
+ .4byte sub_80847F8
+ .4byte sub_8084820
+ .4byte sub_8084890
+ .4byte sub_80848B4
+ .4byte sub_80848C4
+ .4byte sub_80848E8
-gUnknown_83CC0BC:: @ 83CC0BC
- .incbin "baserom.gba", 0x3CC0BC, 0x10
+ .align 2
+gUnknown_83CC068:: @ 83CC068 dataptr
+ .4byte sub_8084A5C
+ .4byte sub_8084AD8
+ .4byte sub_8084B18
+ .4byte sub_8084B78
+ .4byte sub_8084BB8
+ .4byte sub_8084C18
+ .4byte sub_8084C3C
-gUnknown_83CC0CC:: @ 83CC0CC
- .incbin "baserom.gba", 0x3CC0CC, 0x14
+ .align 2
+gUnknown_83CC084:: @ 83CC084 dataptr
+ .4byte sub_8084D24
+ .4byte waterfall_1_do_anim_probably
+ .4byte waterfall_2_wait_anim_finish_probably
+ .4byte sub_8084DA4
+ .4byte sub_8084DCC
-gUnknown_83CC0E0:: @ 83CC0E0
- .incbin "baserom.gba", 0x3CC0E0, 0x8
+ .align 2
+gUnknown_83CC098:: @ 83CC098 dataptr
+ .4byte dive_1_lock
+ .4byte dive_2_unknown
+ .4byte dive_3_unknown
-gUnknown_83CC0E8:: @ 83CC0E8
- .incbin "baserom.gba", 0x3CC0E8, 0x8
+ .align 2
+gUnknown_83CC0A4:: @ 83CC0A4 dataptr
+ .4byte sub_8084FA0
+ .4byte sub_8084FD8
+ .4byte sub_808500C
+ .4byte sub_8085058
+ .4byte sub_808514C
+ .4byte sub_8085168
-gUnknown_83CC0F0:: @ 83CC0F0
- .incbin "baserom.gba", 0x3CC0F0, 0x8
+ .align 2
+gUnknown_83CC0BC:: @ 83CC0BC dataptr
+ .4byte sub_8085244
+ .4byte sub_8085274
+ .4byte sub_80852C0
+ .4byte sub_8085314
-gUnknown_83CC0F8:: @ 83CC0F8
- .incbin "baserom.gba", 0x3CC0F8, 0x10
+ .align 2
+gUnknown_83CC0CC:: @ 83CC0CC dataptr
+ .4byte sub_8085440
+ .4byte sub_8085470
+ .4byte sub_80854EC
+ .4byte sub_8085524
+ .4byte sub_808554C
-gUnknown_83CC108:: @ 83CC108
- .incbin "baserom.gba", 0x3CC108, 0x8
+ .align 2
+gUnknown_83CC0E0:: @ 83CC0E0 dataptr
+ .4byte sub_808566C
+ .4byte sub_8085690
-gUnknown_83CC110:: @ 83CC110
- .incbin "baserom.gba", 0x3CC110, 0xC
+gUnknown_83CC0E8:: @ 83CC0E8 data8
+ .byte 0x01, 0x03, 0x04, 0x02, 0x01
-gUnknown_83CC11C:: @ 83CC11C
- .incbin "baserom.gba", 0x3CC11C, 0x1C
+ .align 2
+gUnknown_83CC0F0:: @ 83CC0F0 dataptr
+ .4byte sub_8085A54
+ .4byte sub_8085A80
-gUnknown_83CC138:: @ 83CC138
- .incbin "baserom.gba", 0x3CC138, 0x1C
+ .align 2
+gUnknown_83CC0F8:: @ 83CC0F8 dataptr
+ .4byte sub_8085BA8
+ .4byte sub_8085BD0
+ .4byte sub_8085C60
+ .4byte sub_8085D34
-gUnknown_83CC154:: @ 83CC154
- .incbin "baserom.gba", 0x3CC154, 0x14
+gUnknown_83CC108:: @ 83CC108 data8
+ .byte 0x01, 0x03, 0x04, 0x02, 0x01
-gUnknown_83CC168:: @ 83CC168
- .incbin "baserom.gba", 0x3CC168, 0x10
+ .align 2
+gUnknown_83CC110:: @ 83CC110 dataptr
+ .4byte sub_8085E0C
+ .4byte sub_8085E98
+ .4byte sub_8085F9C
-gUnknown_83CC178:: @ 83CC178
- .incbin "baserom.gba", 0x3CC178, 0x54
+ .align 2
+gUnknown_83CC11C:: @ 83CC11C dataptr
+ .4byte sub_8086110
+ .4byte sub_8086180
+ .4byte sub_80861FC
+ .4byte sub_8086288
+ .4byte sub_80862B8
+ .4byte sub_808630C
+ .4byte sub_8086358
-gUnknown_83CC1CC:: @ 83CC1CC
- .incbin "baserom.gba", 0x3CC1CC, 0x8
+ .align 2
+gUnknown_83CC138:: @ 83CC138 dataptr
+ .4byte sub_8086498
+ .4byte sub_80864D4
+ .4byte sub_8086554
+ .4byte sub_80865C0
+ .4byte sub_80865F0
+ .4byte sub_8086630
+ .4byte sub_8086650
-gUnknown_83CC1D4:: @ 83CC1D4
- .incbin "baserom.gba", 0x3CC1D4, 0x1C
+ .align 2
+gUnknown_83CC154:: @ 83CC154 dataptr
+ .4byte sub_80869C0
+ .4byte sub_8086A20
+ .4byte sub_8086A6C
+ .4byte sub_8086AB4
+ .4byte sub_8086B30
-gUnknown_83CC1F0:: @ 83CC1F0
- .incbin "baserom.gba", 0x3CC1F0, 0x4C
+ .align 2
+gUnknown_83CC168:: @ 83CC168 dataptr
+ .4byte sub_8086C00
+ .4byte sub_8086C24
+ .4byte sub_8086C70
+ .4byte sub_8086CF4
+
+gUnknown_83CC178:: @ 83CC178 dataptr (incomplete)
+ .4byte sub_8086E70
+ .4byte sub_8086EC8
+ .4byte sub_8086F0C
+ .4byte sub_8086F64
+ .4byte sub_8086FA8
+ .4byte sub_8086FFC
+ .4byte sub_808706C
+ .4byte sub_8087118
+ .4byte sub_8087138
+
+gUnknown_83CC19C:: @ 83CC19C affineanimcmd
+ obj_rot_scal_anim_frame 8, 8, 226, 0
+ obj_rot_scal_anim_frame 28, 28, 0, 30
+ obj_rot_scal_anim_end
+
+gUnknown_83CC1B4:: @ 83CC1B4 affineanimcmd
+ obj_rot_scal_anim_frame 256, 256, 64, 0
+ obj_rot_scal_anim_frame -10, -10, 0, 22
+ obj_rot_scal_anim_end
-gUnknown_83CC23C:: @ 83CC23C
- .incbin "baserom.gba", 0x3CC23C, 0x8
+ .align 2
+gUnknown_83CC1CC:: @ 83CC1CC dataptr
+ .4byte gUnknown_83CC19C
+ .4byte gUnknown_83CC1B4
-gUnknown_83CC244:: @ 83CC244
- .incbin "baserom.gba", 0x3CC244, 0x5C
+ .align 2
+gUnknown_83CC1D4:: @ 83CC1D4 dataptr
+ .4byte sub_80874C8
+ .4byte sub_80875C8
+ .4byte sub_8087644
+ .4byte sub_8087698
+ .4byte sub_8087710
+ .4byte sub_8087748
+ .4byte fishE
+
+gUnknown_83CC1F0:: @ 83CC1F0 data16
+ .2byte 0xfffe, 0xfffc, 0xfffb, 0xfffa, 0xfff9, 0xfff8, 0xfff8, 0xfff8, 0xfff9, 0xfff9, 0xfffa, 0xfffb, 0xfffd, 0xfffe, 0x0000, 0x0002
+ .2byte 0x0004, 0x0008
+
+gUnknown_83CC214:: @ 83CC214 affineanimcmd
+ obj_rot_scal_anim_frame 24, 24, 0, 1
+ obj_rot_scal_anim_jump 0
+
+gUnknown_83CC224:: @ 83CC224 affineanimcmd
+ obj_rot_scal_anim_frame 512, 512, 0, 1
+ obj_rot_scal_anim_frame -16, -16, 0, 1
+ obj_rot_scal_anim_jump 1
-gUnknown_83CC2A0:: @ 83CC2A0
- .incbin "baserom.gba", 0x3CC2A0, 0x18
+ .align 2
+gUnknown_83CC23C:: @ 83CC23C dataptr
+ .4byte gUnknown_83CC214
+ .4byte gUnknown_83CC224
+
+gUnknown_83CC244:: @ 83CC244 dataptr
+ .4byte sub_8087C00
+ .4byte sub_8087C2C
+ .4byte sub_8087CB4
+
+gUnknown_83CC250:: @ 83CC250 sprite_frames
+ obj_frame_tiles 0x083cbdb0, 0x0020
+ obj_frame_tiles 0x083cbdd0, 0x0020
+ obj_frame_tiles 0x083cbdf0, 0x0020
+ obj_frame_tiles 0x083cbe10, 0x0020
+
+gUnknown_83CC270:: @ 83CC270 animcmd
+ obj_image_anim_frame 0x0000, 0
+ obj_image_anim_end
+
+gUnknown_83CC278:: @ 83CC278 animcmd
+ obj_image_anim_frame 0x0001, 0
+ obj_image_anim_end
+
+gUnknown_83CC280:: @ 83CC280 animcmd
+ obj_image_anim_frame 0x0002, 0
+ obj_image_anim_end
+
+gUnknown_83CC288:: @ 83CC288 animcmd
+ obj_image_anim_frame 0x0003, 0
+ obj_image_anim_end
+
+gUnknown_83CC290:: @ 83CC290 dataptr
+ .4byte gUnknown_83CC270
+ .4byte gUnknown_83CC278
+ .4byte gUnknown_83CC280
+ .4byte gUnknown_83CC288
+
+gUnknown_83CC2A0:: @ 83CC2A0 spr_template
+ spr_template 65535, 4371, gOamData_83CBE58, gUnknown_83CC290, gUnknown_83CC250, gDummySpriteAffineAnimTable, sub_8087D90
diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s
index be7c0de93..ff732f5ae 100644
--- a/data/pokemon_summary_screen.s
+++ b/data/pokemon_summary_screen.s
@@ -1,134 +1,439 @@
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_84636C0:: @ 84636C0
- .incbin "baserom.gba", 0x4636C0, 0x20
+ .incbin "graphics/interface/pokesummary_unk_84636C0.gbapal"
gUnknown_84636E0:: @ 84636E0
- .incbin "baserom.gba", 0x4636E0, 0x20
+ .incbin "graphics/interface/pokesummary_unk_84636E0.gbapal"
gUnknown_8463700:: @ 8463700
- .incbin "baserom.gba", 0x463700, 0x20
+ .incbin "graphics/interface/pokesummary_unk_8463700.gbapal"
gUnknown_8463720:: @ 8463720
- .incbin "baserom.gba", 0x463720, 0x20
+ .incbin "graphics/interface/pokesummary_unk_8463720.gbapal"
gUnknown_8463740:: @ 8463740
- .incbin "baserom.gba", 0x463740, 0x12C
+ .incbin "graphics/interface/pokesummary_unk_8463740.4bpp.lz"
gUnknown_846386C:: @ 846386C
- .incbin "baserom.gba", 0x46386C, 0x120
+ .incbin "graphics/interface/pokesummary_unk_846386C.4bpp.lz"
gUnknown_846398C:: @ 846398C
- .incbin "baserom.gba", 0x46398C, 0x18
+ .4byte 0xc0004000, 0x00000000
+
+gUnknown_8463994:: @ 8463994
+ obj_image_anim_frame 0x0000, 20
+ obj_image_anim_jump 0
+
+gUnknown_846399C:: @ 846399C
+ obj_image_anim_frame 0x0020, 20
+ obj_image_anim_jump 0
gUnknown_84639A4:: @ 84639A4
- .incbin "baserom.gba", 0x4639A4, 0x8
+ .4byte gUnknown_8463994
+ .4byte gUnknown_846399C
gUnknown_84639AC:: @ 84639AC
- .incbin "baserom.gba", 0x4639AC, 0x48
+ .4byte 0x40004000, 0x00000000
+
+gUnknown_84639B4:: @ 84639B4
+ obj_image_anim_frame 0x0000, 20
+ obj_image_anim_jump 0
+
+gUnknown_84639BC:: @ 84639BC
+ obj_image_anim_frame 0x0004, 20
+ obj_image_anim_jump 0
+
+gUnknown_84639C4:: @ 84639C4
+ obj_image_anim_frame 0x0008, 20
+ obj_image_anim_jump 0
+
+gUnknown_84639CC:: @ 84639CC
+ obj_image_anim_frame 0x000c, 20
+ obj_image_anim_jump 0
+
+gUnknown_84639D4:: @ 84639D4
+ obj_image_anim_frame 0x0010, 20
+ obj_image_anim_jump 0
+
+gUnknown_84639DC:: @ 84639DC
+ obj_image_anim_frame 0x0014, 20
+ obj_image_anim_jump 0
+
+gUnknown_84639E4:: @ 84639E4
+ obj_image_anim_frame 0x0018, 20
+ obj_image_anim_jump 0
+
+gUnknown_84639EC:: @ 84639EC
+ obj_image_anim_frame 0x001c, 20
+ obj_image_anim_jump 0
gUnknown_84639F4:: @ 84639F4
- .incbin "baserom.gba", 0x4639F4, 0x20
+ .4byte gUnknown_84639B4
+ .4byte gUnknown_84639BC
+ .4byte gUnknown_84639C4
+ .4byte gUnknown_84639CC
+ .4byte gUnknown_84639D4
+ .4byte gUnknown_84639DC
+ .4byte gUnknown_84639E4
+ .4byte gUnknown_84639EC
gUnknown_8463A14:: @ 8463A14
- .incbin "baserom.gba", 0x463A14, 0x68
+ .4byte 0x00000000, 0x00000000
+
+gUnknown_8463A1C:: @ 8463A1C
+ obj_image_anim_frame 0x0000, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A24:: @ 8463A24
+ obj_image_anim_frame 0x0001, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A2C:: @ 8463A2C
+ obj_image_anim_frame 0x0002, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A34:: @ 8463A34
+ obj_image_anim_frame 0x0003, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A3C:: @ 8463A3C
+ obj_image_anim_frame 0x0004, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A44:: @ 8463A44
+ obj_image_anim_frame 0x0005, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A4C:: @ 8463A4C
+ obj_image_anim_frame 0x0006, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A54:: @ 8463A54
+ obj_image_anim_frame 0x0007, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A5C:: @ 8463A5C
+ obj_image_anim_frame 0x0008, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A64:: @ 8463A64
+ obj_image_anim_frame 0x0009, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A6C:: @ 8463A6C
+ obj_image_anim_frame 0x000a, 20
+ obj_image_anim_jump 0
+
+gUnknown_8463A74:: @ 8463A74
+ obj_image_anim_frame 0x000b, 20
+ obj_image_anim_jump 0
gUnknown_8463A7C:: @ 8463A7C
- .incbin "baserom.gba", 0x463A7C, 0x70
+ .4byte gUnknown_8463A1C
+ .4byte gUnknown_8463A24
+ .4byte gUnknown_8463A2C
+ .4byte gUnknown_8463A34
+ .4byte gUnknown_8463A3C
+ .4byte gUnknown_8463A44
+ .4byte gUnknown_8463A4C
+ .4byte gUnknown_8463A54
+ .4byte gUnknown_8463A5C
+ .4byte gUnknown_8463A64
+ .4byte gUnknown_8463A6C
+ .4byte gUnknown_8463A74
+
+gUnknown_8463AAC:: @ 8463AAC
+ .incbin "graphics/interface/pokesummary_unk_8463AAC.gbapal"
+
+gUnknown_8463ACC:: @ 8463ACC
+ .incbin "graphics/interface/pokesummary_unk_8463ACC.gbapal"
gUnknown_8463AEC:: @ 8463AEC
- .incbin "baserom.gba", 0x463AEC, 0x10
+ .4byte 0x00000000, 0x00000000
+
+gUnknown_8463AF4:: @ 8463AF4
+ obj_image_anim_frame 0x0000, 20
+ obj_image_anim_jump 0
gUnknown_8463AFC:: @ 8463AFC
- .incbin "baserom.gba", 0x463AFC, 0x4
+ .4byte gUnknown_8463AF4
gUnknown_8463B00:: @ 8463B00
- .incbin "baserom.gba", 0x463B00, 0x20
+ .incbin "graphics/interface/pokesummary_unk_8463B00.gbapal"
gUnknown_8463B20:: @ 8463B20
- .incbin "baserom.gba", 0x463B20, 0x10
+ .incbin "graphics/interface/pokesummary_unk_8463B20.4bpp.lz"
gUnknown_8463B30:: @ 8463B30
- .incbin "baserom.gba", 0x463B30, 0x10
+ .4byte 0x00000000, 0x00000000
+
+gUnknown_8463B38:: @ 8463B38
+ obj_image_anim_frame 0x0001, 20
+ obj_image_anim_jump 0
gUnknown_8463B40:: @ 8463B40
- .incbin "baserom.gba", 0x463B40, 0x4
+ .4byte gUnknown_8463B38
gUnknown_8463B44:: @ 8463B44
- .incbin "baserom.gba", 0x463B44, 0x20
+ .incbin "graphics/interface/pokesummary_unk_8463B44.gbapal"
gUnknown_8463B64:: @ 8463B64
- .incbin "baserom.gba", 0x463B64, 0x24
+ .incbin "graphics/interface/pokesummary_unk_8463B64.4bpp.lz"
gUnknown_8463B88:: @ 8463B88
- .incbin "baserom.gba", 0x463B88, 0xF8
+ .incbin "graphics/interface/pokesummary_unk_8463B88.bin.lz"
gUnknown_8463C80:: @ 8463C80
- .incbin "baserom.gba", 0x463C80, 0x1E0
+ .incbin "graphics/interface/pokesummary_unk_8463C80.bin.lz"
+
+gUnknown_8463DBC:: @ 8463DBC
+ .string "HARDY$"
-gUnknown_8463E60:: @ 8463E60
- .incbin "baserom.gba", 0x463E60, 0x64
+gUnknown_8463DC2:: @ 8463DC2
+ .string "LONELY$"
+
+gUnknown_8463DC9:: @ 8463DC9
+ .string "BRAVE$"
+
+gUnknown_8463DCF:: @ 8463DCF
+ .string "ADAMANT$"
+
+gUnknown_8463DD7:: @ 8463DD7
+ .string "NAUGHTY$"
+
+gUnknown_8463DDF:: @ 8463DDF
+ .string "BOLD$"
+
+gUnknown_8463DE4:: @ 8463DE4
+ .string "DOCILE$"
+
+gUnknown_8463DEB:: @ 8463DEB
+ .string "RELAXED$"
+
+gUnknown_8463DF3:: @ 8463DF3
+ .string "IMPISH$"
+
+gUnknown_8463DFA:: @ 8463DFA
+ .string "LAX$"
+
+gUnknown_8463DFE:: @ 8463DFE
+ .string "TIMID$"
+
+gUnknown_8463E04:: @ 8463E04
+ .string "HASTY$"
+
+gUnknown_8463E0A:: @ 8463E0A
+ .string "SERIOUS$"
+
+gUnknown_8463E12:: @ 8463E12
+ .string "JOLLY$"
+
+gUnknown_8463E18:: @ 8463E18
+ .string "NAIVE$"
+
+gUnknown_8463E1E:: @ 8463E1E
+ .string "MODEST$"
+
+gUnknown_8463E25:: @ 8463E25
+ .string "MILD$"
+
+gUnknown_8463E2A:: @ 8463E2A
+ .string "QUIET$"
+
+gUnknown_8463E30:: @ 8463E30
+ .string "BASHFUL$"
+
+gUnknown_8463E38:: @ 8463E38
+ .string "RASH$"
+
+gUnknown_8463E3D:: @ 8463E3D
+ .string "CALM$"
+
+gUnknown_8463E42:: @ 8463E42
+ .string "GENTLE$"
+
+gUnknown_8463E49:: @ 8463E49
+ .string "SASSY$"
+
+gUnknown_8463E4F:: @ 8463E4F
+ .string "CAREFUL$"
+
+gUnknown_8463E57:: @ 8463E57
+ .string "QUIRKY$"
+
+ .align 2
+gNatureNames:: @ 8463E60 dataptr
+ .4byte gUnknown_8463DBC
+ .4byte gUnknown_8463DC2
+ .4byte gUnknown_8463DC9
+ .4byte gUnknown_8463DCF
+ .4byte gUnknown_8463DD7
+ .4byte gUnknown_8463DDF
+ .4byte gUnknown_8463DE4
+ .4byte gUnknown_8463DEB
+ .4byte gUnknown_8463DF3
+ .4byte gUnknown_8463DFA
+ .4byte gUnknown_8463DFE
+ .4byte gUnknown_8463E04
+ .4byte gUnknown_8463E0A
+ .4byte gUnknown_8463E12
+ .4byte gUnknown_8463E18
+ .4byte gUnknown_8463E1E
+ .4byte gUnknown_8463E25
+ .4byte gUnknown_8463E2A
+ .4byte gUnknown_8463E30
+ .4byte gUnknown_8463E38
+ .4byte gUnknown_8463E3D
+ .4byte gUnknown_8463E42
+ .4byte gUnknown_8463E49
+ .4byte gUnknown_8463E4F
+ .4byte gUnknown_8463E57
gUnknown_8463EC4:: @ 8463EC4
- .incbin "baserom.gba", 0x463EC4, 0x10
+ .4byte gUnknown_8419B44
+ .4byte gUnknown_8419B7B
+ .4byte gUnknown_8419BAE
+ .4byte gUnknown_8419BDB
gUnknown_8463ED4:: @ 8463ED4
- .incbin "baserom.gba", 0x463ED4, 0x1C
+ .4byte gUnknown_8419A3D
+ .4byte gUnknown_8419B18
+ .4byte gUnknown_8419A6E
+ .4byte gUnknown_8419B18
+ .4byte gUnknown_8419AA2
+ .4byte gUnknown_8419ADE
+ .4byte gUnknown_8419B18
gUnknown_8463EF0:: @ 8463EF0
- .incbin "baserom.gba", 0x463EF0, 0xC
+ .byte 0x00, 0x07, 0x08, 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x00, 0x05, 0x06
gUnknown_8463EFC:: @ 8463EFC
- .incbin "baserom.gba", 0x463EFC, 0x10
+ .4byte 0x000002e0
+ @ {
+ @ .bg = 0,
+ @ .charBaseIndex = 0,
+ @ .mapBaseIndex = 14,
+ @ .screenSize = 1,
+ @ .paletteMode = 0,
+ @ .priority = 0,
+ @ .baseTile = 0x0000
+ @ }
+ .4byte 0x000012aa
+ @ {
+ @ .bg = 2,
+ @ .charBaseIndex = 2,
+ @ .mapBaseIndex = 10,
+ @ .screenSize = 1,
+ @ .paletteMode = 0,
+ @ .priority = 1,
+ @ .baseTile = 0x0000
+ @ }
+ .4byte 0x0000309b
+ @ {
+ @ .bg = 3,
+ @ .charBaseIndex = 2,
+ @ .mapBaseIndex = 9,
+ @ .screenSize = 0,
+ @ .paletteMode = 0,
+ @ .priority = 3,
+ @ .baseTile = 0x0000
+ @ }
+ .4byte 0x000022c9
+ @ {
+ @ .bg = 1,
+ @ .charBaseIndex = 2,
+ @ .mapBaseIndex = 12,
+ @ .screenSize = 1,
+ @ .paletteMode = 0,
+ @ .priority = 2,
+ @ .baseTile = 0x0000
+ @ }
gUnknown_8463F0C:: @ 8463F0C
- .incbin "baserom.gba", 0x463F0C, 0x18
+ .byte 1, 0, 0, 13, 2, 7
+ .2byte 0x0258
+ .byte 1, 19, 0, 11, 2, 7
+ .2byte 0x0272
+ .byte 1, 0, 2, 15, 2, 7
+ .2byte 0x0288
gUnknown_8463F24:: @ 8463F24
- .incbin "baserom.gba", 0x463F24, 0x18
+ .byte 2, 0, 0, 13, 2, 7
+ .2byte 0x0258
+ .byte 2, 19, 0, 11, 2, 7
+ .2byte 0x0272
+ .byte 2, 0, 2, 15, 2, 7
+ .2byte 0x0288
gUnknown_8463F3C:: @ 8463F3C
- .incbin "baserom.gba", 0x463F3C, 0x20
+ .byte 0, 15, 2, 15, 12, 6
+ .2byte 0x0001
+ .byte 0, 1, 14, 28, 6, 6
+ .2byte 0x00b5
+ .byte 0, 0, 0, 0, 0, 0
+ .2byte 0x0000
+ .byte 0, 0, 0, 0, 0, 0
+ .2byte 0x0000
gUnknown_8463F5C:: @ 8463F5C
- .incbin "baserom.gba", 0x463F5C, 0x20
+ .byte 0, 20, 2, 10, 14, 6
+ .2byte 0x0001
+ .byte 0, 6, 12, 14, 4, 6
+ .2byte 0x008d
+ .byte 0, 1, 16, 29, 4, 6
+ .2byte 0x00c5
+ .byte 0, 0, 0, 0, 0, 0
+ .2byte 0x0000
gUnknown_8463F7C:: @ 8463F7C
- .incbin "baserom.gba", 0x463F7C, 0x20
+ .byte 0, 20, 2, 10, 18, 8
+ .2byte 0x0001
+ .byte 0, 0, 7, 15, 13, 6
+ .2byte 0x00b5
+ .byte 0, 15, 2, 5, 18, 6
+ .2byte 0x0178
+ .byte 0, 6, 4, 9, 2, 6
+ .2byte 0x01d2
gUnknown_8463F9C:: @ 8463F9C
- .incbin "baserom.gba", 0x463F9C, 0x8
+ .byte 255, 0, 0, 0, 0, 0
+ .2byte 0x0000
gUnknown_8463FA4:: @ 8463FA4
- .incbin "baserom.gba", 0x463FA4, 0x3
+ .byte 0x00, 0x0e, 0x0a
gUnknown_8463FA7:: @ 8463FA7
- .incbin "baserom.gba", 0x463FA7, 0x11
+ .byte 0x00, 0x01, 0x02, 0x00, 0x09, 0x08, 0x00, 0x05, 0x04, 0x00, 0x02, 0x03, 0x00, 0x0b, 0x0a, 0x00, 0x00
gUnknown_8463FB8:: @ 8463FB8
- .incbin "baserom.gba", 0x463FB8, 0x6
+ .byte 0x00, 0x02, 0x03, 0x01, 0x04, 0x05
gUnknown_8463FBE:: @ 8463FBE
- .incbin "baserom.gba", 0x463FBE, 0x3
+ .byte 0xff, 0x00, 0x01
gUnknown_8463FC1:: @ 8463FC1
- .incbin "baserom.gba", 0x463FC1, 0x5
+ .byte 0xfe, 0xff, 0x00, 0x01, 0x02
gUnknown_8463FC6:: @ 8463FC6
- .incbin "baserom.gba", 0x463FC6, 0x7
+ .byte 0xfd, 0xfe, 0xff, 0x00, 0x01, 0x02, 0x03
gUnknown_8463FCD:: @ 8463FCD
- .incbin "baserom.gba", 0x463FCD, 0x7
+ .byte 0xfb, 0xfd, 0xff, 0x00, 0x01, 0x03, 0x05
gUnknown_8463FD4:: @ 8463FD4
- .incbin "baserom.gba", 0x463FD4, 0xB
+ .byte 0x01, 0x01, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x01, 0x01
gUnknown_8463FDF:: @ 8463FDF
- .incbin "baserom.gba", 0x463FDF, 0xB
+ .byte 0x02, 0x01, 0x00, 0xff, 0xfe, 0x00, 0xfe, 0xff, 0x00, 0x01, 0x02
gUnknown_8463FEA:: @ 8463FEA
- .incbin "baserom.gba", 0x463FEA, 0x12
+ .byte 0x02, 0x01, 0x01, 0x00, 0xff, 0xff, 0xfe, 0x00, 0xfe, 0xff, 0xff, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00
gUnknown_8463FFC:: @ 8463FFC
- .incbin "baserom.gba", 0x463FFC, 0xC
+ .4byte gUnknown_8E9B578
+ .4byte gUnknown_8463AAC
+ .4byte gUnknown_8463ACC
diff --git a/graphics/field_effects/unk_83CA770.png b/graphics/field_effects/unk_83CA770.png
new file mode 100644
index 000000000..d3ca87183
--- /dev/null
+++ b/graphics/field_effects/unk_83CA770.png
Binary files differ
diff --git a/graphics/field_effects/unk_83CAF70.pal b/graphics/field_effects/unk_83CAF70.pal
new file mode 100644
index 000000000..2484c8e07
--- /dev/null
+++ b/graphics/field_effects/unk_83CAF70.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 222 205
+238 180 148
+197 139 106
+106 74 74
+139 156 164
+139 156 172
+74 98 123
+49 65 82
+213 213 222
+131 16 41
+115 115 115
+213 82 90
+180 41 57
+255 255 255
+0 0 0
diff --git a/graphics/field_effects/unk_83CAF90.png b/graphics/field_effects/unk_83CAF90.png
new file mode 100644
index 000000000..c6c456817
--- /dev/null
+++ b/graphics/field_effects/unk_83CAF90.png
Binary files differ
diff --git a/graphics/field_effects/unk_83CAFB0.pal b/graphics/field_effects/unk_83CAFB0.pal
new file mode 100644
index 000000000..5e2face1d
--- /dev/null
+++ b/graphics/field_effects/unk_83CAFB0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+156 180 172
+106 115 115
+57 57 57
+156 24 24
+255 0 0
+255 123 123
+255 255 255
+82 82 106
+123 123 123
+255 255 255
+189 230 255
+164 197 230
+156 189 213
+90 131 180
diff --git a/graphics/field_effects/unk_83CAFD0.png b/graphics/field_effects/unk_83CAFD0.png
new file mode 100644
index 000000000..54117cf6b
--- /dev/null
+++ b/graphics/field_effects/unk_83CAFD0.png
Binary files differ
diff --git a/graphics/field_effects/unk_83CB3D0.pal b/graphics/field_effects/unk_83CB3D0.pal
new file mode 100644
index 000000000..856316be9
--- /dev/null
+++ b/graphics/field_effects/unk_83CB3D0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+82 82 106
+115 255 255
+98 197 205
+90 139 156
+65 115 139
diff --git a/graphics/field_effects/unk_83CB3F0.png b/graphics/field_effects/unk_83CB3F0.png
new file mode 100644
index 000000000..1e3433a3c
--- /dev/null
+++ b/graphics/field_effects/unk_83CB3F0.png
Binary files differ
diff --git a/graphics/field_effects/unk_83CB5F0.png b/graphics/field_effects/unk_83CB5F0.png
new file mode 100644
index 000000000..8f9c6a6a7
--- /dev/null
+++ b/graphics/field_effects/unk_83CB5F0.png
Binary files differ
diff --git a/graphics/field_effects/unk_83CB7F0.pal b/graphics/field_effects/unk_83CB7F0.pal
new file mode 100644
index 000000000..12bc76261
--- /dev/null
+++ b/graphics/field_effects/unk_83CB7F0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/field_effects/unk_83CB810.bin b/graphics/field_effects/unk_83CB810.bin
new file mode 100644
index 000000000..466f456be
--- /dev/null
+++ b/graphics/field_effects/unk_83CB810.bin
Binary files differ
diff --git a/graphics/field_effects/unk_83CBA90.png b/graphics/field_effects/unk_83CBA90.png
new file mode 100644
index 000000000..62d4f6965
--- /dev/null
+++ b/graphics/field_effects/unk_83CBA90.png
Binary files differ
diff --git a/graphics/field_effects/unk_83CBB10.pal b/graphics/field_effects/unk_83CBB10.pal
new file mode 100644
index 000000000..37ea1ae61
--- /dev/null
+++ b/graphics/field_effects/unk_83CBB10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 139 57
+0 0 0
+148 148 148
+197 197 197
+255 255 255
+123 156 230
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/field_effects/unk_83CBB30.bin b/graphics/field_effects/unk_83CBB30.bin
new file mode 100644
index 000000000..9543a056e
--- /dev/null
+++ b/graphics/field_effects/unk_83CBB30.bin
Binary files differ
diff --git a/graphics/interface/pokesummary_unk_84636C0.pal b/graphics/interface/pokesummary_unk_84636C0.pal
new file mode 100644
index 000000000..915f86eb9
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_84636C0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+238 222 0
+255 246 139
+0 0 0
+0 0 0
+0 0 0
+16 115 230
diff --git a/graphics/interface/pokesummary_unk_84636E0.pal b/graphics/interface/pokesummary_unk_84636E0.pal
new file mode 100644
index 000000000..4feaa7bf5
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_84636E0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 222
+238 230 238
+255 139 8
+246 189 123
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/interface/pokesummary_unk_8463700.pal b/graphics/interface/pokesummary_unk_8463700.pal
new file mode 100644
index 000000000..e895b8cf7
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463700.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+238 222 0
+255 246 139
+255 148 0
+255 238 115
+238 0 0
+246 222 156
+32 32 32
+222 222 222
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/interface/pokesummary_unk_8463720.pal b/graphics/interface/pokesummary_unk_8463720.pal
new file mode 100644
index 000000000..b0e0be5f5
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463720.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+230 57 0
+0 90 213
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/graphics/interface/pokesummary_unk_8463740.png b/graphics/interface/pokesummary_unk_8463740.png
new file mode 100644
index 000000000..fedcbdc68
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463740.png
Binary files differ
diff --git a/graphics/interface/pokesummary_unk_846386C.png b/graphics/interface/pokesummary_unk_846386C.png
new file mode 100644
index 000000000..98c6e4a6a
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_846386C.png
Binary files differ
diff --git a/graphics/interface/pokesummary_unk_8463AAC.pal b/graphics/interface/pokesummary_unk_8463AAC.pal
new file mode 100644
index 000000000..358aa7e52
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463AAC.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+189 189 148
+255 230 57
+205 172 8
+123 131 148
+98 106 123
+255 213 82
+255 180 65
+139 205 255
+82 164 238
+0 0 0
+0 0 0
+180 172 139
+156 148 115
+131 139 156
+98 106 123
+255 255 255
diff --git a/graphics/interface/pokesummary_unk_8463ACC.pal b/graphics/interface/pokesummary_unk_8463ACC.pal
new file mode 100644
index 000000000..59238429c
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463ACC.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+189 189 148
+255 90 57
+172 65 74
+123 131 148
+98 106 123
+255 213 82
+255 180 65
+139 205 255
+82 164 238
+0 0 0
+0 0 0
+180 172 139
+156 148 115
+131 139 156
+98 106 123
+255 255 255
diff --git a/graphics/interface/pokesummary_unk_8463B00.pal b/graphics/interface/pokesummary_unk_8463B00.pal
new file mode 100644
index 000000000..61af05b25
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463B00.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 164 164
+106 106 106
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/interface/pokesummary_unk_8463B20.png b/graphics/interface/pokesummary_unk_8463B20.png
new file mode 100644
index 000000000..f79ac524b
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463B20.png
Binary files differ
diff --git a/graphics/interface/pokesummary_unk_8463B44.pal b/graphics/interface/pokesummary_unk_8463B44.pal
new file mode 100644
index 000000000..37aafef66
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463B44.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 213 82
+189 148 16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/interface/pokesummary_unk_8463B64.png b/graphics/interface/pokesummary_unk_8463B64.png
new file mode 100644
index 000000000..481b426e3
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463B64.png
Binary files differ
diff --git a/graphics/interface/pokesummary_unk_8463B88.bin b/graphics/interface/pokesummary_unk_8463B88.bin
new file mode 100644
index 000000000..54ce011ac
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463B88.bin
Binary files differ
diff --git a/graphics/interface/pokesummary_unk_8463C80.bin b/graphics/interface/pokesummary_unk_8463C80.bin
new file mode 100644
index 000000000..4b044887c
--- /dev/null
+++ b/graphics/interface/pokesummary_unk_8463C80.bin
Binary files differ