diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-15 10:01:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 10:01:46 -0400 |
| commit | 407fc23f3f86d5caf665d9bca14e498273ae4dae (patch) | |
| tree | 08bb2e084faf2b6308d1d396b6d674be1bec922b /data | |
| parent | f3ee5e7511f429026680a1ffee82d18a313d9d32 (diff) | |
| parent | 91af78857269212ee25fbaf19b3405fa2c7ec9ef (diff) | |
Merge pull request #121 from PikalaxALT/mail
Decompile mail
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_835B488.s | 21 | ||||
| -rw-r--r-- | data/graphics.s | 39 | ||||
| -rw-r--r-- | data/strings.s | 2 |
3 files changed, 37 insertions, 25 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s index 2766f0eeb..a1893150d 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -961,27 +961,6 @@ gUnknown_83EE8D0:: @ 83EE8D0 gUnknown_83EE958:: @ 83EE958 .incbin "baserom.gba", 0x3EE958, 0x40 -gUnknown_83EE998:: @ 83EE998 - .incbin "baserom.gba", 0x3EE998, 0xC - -gUnknown_83EE9A4:: @ 83EE9A4 - .incbin "baserom.gba", 0x3EE9A4, 0x18 - -gUnknown_83EE9BC:: @ 83EE9BC - .incbin "baserom.gba", 0x3EE9BC, 0x4 - -gUnknown_83EE9C0:: @ 83EE9C0 - .incbin "baserom.gba", 0x3EE9C0, 0x8 - -gUnknown_83EE9C8:: @ 83EE9C8 - .incbin "baserom.gba", 0x3EE9C8, 0xFC - -gUnknown_83EEAC4:: @ 83EEAC4 - .incbin "baserom.gba", 0x3EEAC4, 0xA4 - -gUnknown_83EEB68:: @ 83EEB68 - .incbin "baserom.gba", 0x3EEB68, 0x90 - .section .rodata.83EEC98 .include "data/text/map_section_names.inc" diff --git a/data/graphics.s b/data/graphics.s index 1116f7241..78c955d0f 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -15932,9 +15932,42 @@ gGhostPalette:: @ 8E93B14 gGhostFrontPic:: @ 8E93B38 .incbin "baserom.gba", 0xE93B38, 0x368 -gUnknown_8E93EA0:: @ 8E93EA0 - .incbin "baserom.gba", 0xE93EA0, 0x180 @UNKNOWN - +gFile_graphics_mail_orange_palette_pal:: @ 8E93EA0 + .incbin "graphics/mail/orange/palette.gbapal" + +gFile_graphics_mail_harbor_palette_pal:: @ 8E93EC0 + .incbin "graphics/mail/harbor/palette.gbapal" + +gFile_graphics_mail_glitter_palette_pal:: @ 8E93EE0 + .incbin "graphics/mail/glitter/palette.gbapal" + +gFile_graphics_mail_mech_palette_pal:: @ 8E93F00 + .incbin "graphics/mail/mech/palette.gbapal" + +gFile_graphics_mail_wood_palette_pal:: @ 8E93F20 + .incbin "graphics/mail/wood/palette.gbapal" + +gFile_graphics_mail_wave_palette_pal:: @ 8E93F40 + .incbin "graphics/mail/wave/palette.gbapal" + +gFile_graphics_mail_bead_palette_pal:: @ 8E93F60 + .incbin "graphics/mail/bead/palette.gbapal" + +gFile_graphics_mail_shadow_palette_pal:: @ 8E93F80 + .incbin "graphics/mail/shadow/palette.gbapal" + +gFile_graphics_mail_tropic_palette_pal:: @ 8E93FA0 + .incbin "graphics/mail/tropic/palette.gbapal" + +gFile_graphics_mail_dream_palette_pal:: @ 8E93FC0 + .incbin "graphics/mail/dream/palette.gbapal" + +gFile_graphics_mail_fab_palette_pal:: @ 8E93FE0 + .incbin "graphics/mail/fab/palette.gbapal" + +gFile_graphics_mail_retro_palette_pal:: @ 8E94000 + .incbin "graphics/mail/retro/palette.gbapal" + .align 2 gFile_graphics_mail_orange_tiles_sheet:: @ 8E94020 .incbin "graphics/mail/orange/tiles.4bpp.lz" diff --git a/data/strings.s b/data/strings.s index 52abc36de..f9fea0e1d 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4402,7 +4402,7 @@ gUnknown_841E20D:: @ 841E20D gUnknown_841E21E:: @ 841E21E .string "Take good care of {STR_VAR_3}!$" -gUnknown_841E234:: @ 841E234 +gText_From:: @ 841E234 .string "From $" gUnknown_841E23A:: @ 841E23A |