diff options
17 files changed, 294 insertions, 64 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/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index c986d6c9d..a26613dd7 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -4,26 +4,26 @@ .align 2 gUnknown_84636C0:: @ 84636C0 gbapal - .incbin "baserom.gba", 0x4636C0, 0x20 + .incbin "graphics/interface/pokesummary_unk_84636C0.gbapal" gUnknown_84636E0:: @ 84636E0 gbapal - .incbin "baserom.gba", 0x4636E0, 0x20 + .incbin "graphics/interface/pokesummary_unk_84636E0.gbapal" gUnknown_8463700:: @ 8463700 gbapal - .incbin "baserom.gba", 0x463700, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463700.gbapal" gUnknown_8463720:: @ 8463720 gbapal - .incbin "baserom.gba", 0x463720, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463720.gbapal" gUnknown_8463740:: @ 8463740 something.lz - .incbin "baserom.gba", 0x463740, 0x12C + .incbin "graphics/interface/pokesummary_unk_8463740.4bpp.lz" gUnknown_846386C:: @ 846386C something.lz - .incbin "baserom.gba", 0x46386C, 0x120 + .incbin "graphics/interface/pokesummary_unk_846386C.4bpp.lz" gUnknown_846398C:: @ 846398C oamdata .4byte 0xc0004000, 0x00000000 - @ animcmd + gUnknown_8463994:: obj_image_anim_frame 0x0000, 20 @@ -39,7 +39,7 @@ gUnknown_84639A4:: @ 84639A4 dataptr gUnknown_84639AC:: @ 84639AC oamdata .4byte 0x40004000, 0x00000000 - @ animcmd + gUnknown_84639B4:: obj_image_anim_frame 0x0000, 20 @@ -149,88 +149,166 @@ gUnknown_8463A7C:: @ 8463A7C dataptr .4byte gUnknown_8463A74 gUnknown_8463AAC:: @ 8463AAC gbapal - .incbin "baserom.gba", 0x463AAC, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463AAC.gbapal" gUnknown_8463ACC:: @ 8463ACC gbapal - .incbin "baserom.gba", 0x463ACC, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463ACC.gbapal" gUnknown_8463AEC:: @ 8463AEC oamdata .4byte 0x00000000, 0x00000000 - @ animcmd + +gUnknown_8463AF4:: obj_image_anim_frame 0x0000, 20 obj_image_anim_jump 0 gUnknown_8463AFC:: @ 8463AFC dataptr - .4byte 0x8463af4 + .4byte gUnknown_8463AF4 gUnknown_8463B00:: @ 8463B00 gbapal - .incbin "baserom.gba", 0x463B00, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463B00.gbapal" gUnknown_8463B20:: @ 8463B20 something.lz - .incbin "baserom.gba", 0x463B20, 0x10 + .incbin "graphics/interface/pokesummary_unk_8463B20.4bpp.lz" gUnknown_8463B30:: @ 8463B30 oamdata .4byte 0x00000000, 0x00000000 - @ animcmd + +gUnknown_8463B38:: obj_image_anim_frame 0x0001, 20 obj_image_anim_jump 0 gUnknown_8463B40:: @ 8463B40 dataptr - .4byte 0x8463b38 + .4byte gUnknown_8463B38 gUnknown_8463B44:: @ 8463B44 gbapal - .incbin "baserom.gba", 0x463B44, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463B44.gbapal" gUnknown_8463B64:: @ 8463B64 something.lz - .incbin "baserom.gba", 0x463B64, 0x24 + .incbin "graphics/interface/pokesummary_unk_8463B64.4bpp.lz" gUnknown_8463B88:: @ 8463B88 bin.lz - .incbin "baserom.gba", 0x463B88, 0xF8 + .incbin "graphics/interface/pokesummary_unk_8463B88.bin.lz" gUnknown_8463C80:: @ 8463C80 bin.lz - .incbin "baserom.gba", 0x463C80, 0x1E0 - -gUnknown_8463E60:: @ 8463E60 dataptr - .4byte 0x8463dbc - .4byte 0x8463dc2 - .4byte 0x8463dc9 - .4byte 0x8463dcf - .4byte 0x8463dd7 - .4byte 0x8463ddf - .4byte 0x8463de4 - .4byte 0x8463deb - .4byte 0x8463df3 - .4byte 0x8463dfa - .4byte 0x8463dfe - .4byte 0x8463e04 - .4byte 0x8463e0a - .4byte 0x8463e12 - .4byte 0x8463e18 - .4byte 0x8463e1e - .4byte 0x8463e25 - .4byte 0x8463e2a - .4byte 0x8463e30 - .4byte 0x8463e38 - .4byte 0x8463e3d - .4byte 0x8463e42 - .4byte 0x8463e49 - .4byte 0x8463e4f - .4byte 0x8463e57 + .incbin "graphics/interface/pokesummary_unk_8463C80.bin.lz" + +gUnknown_8463DBC:: + .string "HARDY$" + +gUnknown_8463DC2:: + .string "LONELY$" + +gUnknown_8463DC9:: + .string "BRAVE$" + +gUnknown_8463DCF:: + .string "ADAMANT$" + +gUnknown_8463DD7:: + .string "NAUGHTY$" + +gUnknown_8463DDF:: + .string "BOLD$" + +gUnknown_8463DE4:: + .string "DOCILE$" + +gUnknown_8463DEB:: + .string "RELAXED$" + +gUnknown_8463DF3:: + .string "IMPISH$" + +gUnknown_8463DFA:: + .string "LAX$" + +gUnknown_8463DFE:: + .string "TIMID$" + +gUnknown_8463E04:: + .string "HASTY$" + +gUnknown_8463E0A:: + .string "SERIOUS$" + +gUnknown_8463E12:: + .string "JOLLY$" + +gUnknown_8463E18:: + .string "NAIVE$" + +gUnknown_8463E1E:: + .string "MODEST$" + +gUnknown_8463E25:: + .string "MILD$" + +gUnknown_8463E2A:: + .string "QUIET$" + +gUnknown_8463E30:: + .string "BASHFUL$" + +gUnknown_8463E38:: + .string "RASH$" + +gUnknown_8463E3D:: + .string "CALM$" + +gUnknown_8463E42:: + .string "GENTLE$" + +gUnknown_8463E49:: + .string "SASSY$" + +gUnknown_8463E4F:: + .string "CAREFUL$" + +gUnknown_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 dataptr - .4byte 0x8419b44 - .4byte 0x8419b7b - .4byte 0x8419bae - .4byte 0x8419bdb + .4byte gUnknown_8419B44 + .4byte gUnknown_8419B7B + .4byte gUnknown_8419BAE + .4byte gUnknown_8419BDB gUnknown_8463ED4:: @ 8463ED4 dataptr - .4byte 0x8419a3d - .4byte 0x8419b18 - .4byte 0x8419a6e - .4byte 0x8419b18 - .4byte 0x8419aa2 - .4byte 0x8419ade - .4byte 0x8419b18 + .4byte gUnknown_8419A3D + .4byte gUnknown_8419B18 + .4byte gUnknown_8419A6E + .4byte gUnknown_8419B18 + .4byte gUnknown_8419AA2 + .4byte gUnknown_8419ADE + .4byte gUnknown_8419B18 gUnknown_8463EF0:: @ 8463EF0 data8 .byte 0x00, 0x07, 0x08, 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x00, 0x05, 0x06 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 Binary files differnew file mode 100644 index 000000000..fedcbdc68 --- /dev/null +++ b/graphics/interface/pokesummary_unk_8463740.png diff --git a/graphics/interface/pokesummary_unk_846386C.png b/graphics/interface/pokesummary_unk_846386C.png Binary files differnew file mode 100644 index 000000000..98c6e4a6a --- /dev/null +++ b/graphics/interface/pokesummary_unk_846386C.png 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 Binary files differnew file mode 100644 index 000000000..f79ac524b --- /dev/null +++ b/graphics/interface/pokesummary_unk_8463B20.png 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 Binary files differnew file mode 100644 index 000000000..481b426e3 --- /dev/null +++ b/graphics/interface/pokesummary_unk_8463B64.png diff --git a/graphics/interface/pokesummary_unk_8463B88.bin b/graphics/interface/pokesummary_unk_8463B88.bin Binary files differnew file mode 100644 index 000000000..54ce011ac --- /dev/null +++ b/graphics/interface/pokesummary_unk_8463B88.bin diff --git a/graphics/interface/pokesummary_unk_8463C80.bin b/graphics/interface/pokesummary_unk_8463C80.bin Binary files differnew file mode 100644 index 000000000..4b044887c --- /dev/null +++ b/graphics/interface/pokesummary_unk_8463C80.bin |
