diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-18 13:46:34 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-18 13:46:34 -0600 |
| commit | dcdf91c111e005f253acd19173c8784c24de9c15 (patch) | |
| tree | 67badb0f3740fd0394617a22ef59192fdee70a8b | |
| parent | dbbd005a5376cf573a35d39dabdde24a7bab7b78 (diff) | |
| parent | 820c11358d0832b92c82c45a6a228e0759eba03a (diff) | |
Merge remote-tracking branch 'Bird/dump_learn_move.s'
| -rw-r--r-- | data/battle_anim_815A0D4.s | 3 | ||||
| -rw-r--r-- | data/learn_move.s | 83 | ||||
| -rwxr-xr-x | graphics/interface/ui_learn_move.png | bin | 0 -> 282 bytes |
3 files changed, 77 insertions, 9 deletions
diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s index 1b4cc5af9..0cb95a7e1 100644 --- a/data/battle_anim_815A0D4.s +++ b/data/battle_anim_815A0D4.s @@ -505,6 +505,5 @@ gUnknown_085CE9B0:: @ 85CE9B0 .align 2 gUnknown_085CE9C8:: @ 85CE9C8 .2byte 0x0000, 0x0010, 0x0400, 0x0000, 0xfffe, 0x0000, 0x0800, 0x0000, 0x0000, 0x0004, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000 - .2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000, 0x03e0, 0x001f, 0x001c, 0x001a, 0x0018, 0x0000, 0x0000, 0x0000 - .2byte 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6318, 0x0000, 0x7fff + .2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 diff --git a/data/learn_move.s b/data/learn_move.s index 94805bacb..0a2c31e58 100644 --- a/data/learn_move.s +++ b/data/learn_move.s @@ -2,23 +2,92 @@ .include "constants/constants.inc" .section .rodata + +gUnknown_085CE9F8:: @ 85CE9F8 + .incbin "graphics/interface/ui_learn_move.gbapal" + gUnknown_085CEA18:: @ 85CEA18 - .incbin "baserom.gba", 0x5ceA18, 0x198 + .incbin "graphics/interface/ui_learn_move.4bpp" + +gUnknown_085CEB98:: @ 85CEB98 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + .2byte 0 gUnknown_085CEBB0:: @ 85CEBB0 - .incbin "baserom.gba", 0x5cebb0, 0x8 + obj_tiles gUnknown_085CEA18, 0x180, 0x1595 gUnknown_085CEBB8:: @ 85CEBB8 - .incbin "baserom.gba", 0x5cebb8, 0x8 + obj_pal gUnknown_085CE9F8, 0x1596 gUnknown_085CEBC0:: @ 85CEBC0 - .incbin "baserom.gba", 0x5cebc0, 0x10 + .byte 0 + .byte 0x1B + .byte 16 + .byte 1 + .byte 0x75 + .byte 16 + .2byte 0xFFFF + .2byte 0xFFFF + .2byte 0x14CD + .2byte 0x14CD + .byte 0, 0 gUnknown_085CEBD0:: @ 85CEBD0 - .incbin "baserom.gba", 0x5cebd0, 0x40 + .byte 2 + .byte 0xC0 + .byte 8 + .byte 3 + .byte 0xC0 + .byte 0x68 + .2byte 0 + .2byte 0 + .2byte 0x1531 + .2byte 0x1531 + .byte 0, 0 +gUnknown_085CEBE0:: @ 85CEBE0 + .2byte 8 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEBE8:: @ 85CEBE8 + .2byte 9 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEBF0:: @ 85CEBF0 + .2byte 10 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEBF8:: @ 85CEBF8 + .2byte 11 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_085CEC00:: @ 85CEC00 + .4byte gUnknown_085CEBE0 + .4byte gUnknown_085CEBE8 + .4byte gUnknown_085CEBF0 + .4byte gUnknown_085CEBF8 + gUnknown_085CEC10:: @ 85CEC10 - .incbin "baserom.gba", 0x5cec10, 0x18 + spr_template 0x1595, 0x1596, gUnknown_085CEB98, gUnknown_085CEC00, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085CEC28:: @ 85CEC28 - .incbin "baserom.gba", 0x5cec28, 0x8 + .4byte 0x1F0 + .4byte 0x11E1 diff --git a/graphics/interface/ui_learn_move.png b/graphics/interface/ui_learn_move.png Binary files differnew file mode 100755 index 000000000..6cb6540b5 --- /dev/null +++ b/graphics/interface/ui_learn_move.png |
