diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-18 14:02:13 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-18 14:02:13 -0600 |
| commit | 48c1e4961e00aa1e3930fcc9b09f737d690ece6a (patch) | |
| tree | 7f99f490768be07d0d45244f927f77e0d1c1b7a5 /data | |
| parent | dcdf91c111e005f253acd19173c8784c24de9c15 (diff) | |
| parent | 295aa96a052d4ab7daecbc9fb5da166dd0d2a0f1 (diff) | |
Merge remote-tracking branch 'Egg/decompile_unk_transition'
Diffstat (limited to 'data')
| -rw-r--r-- | data/unk_sprite_file.s | 42 | ||||
| -rw-r--r-- | data/unk_transition.s | 60 |
2 files changed, 8 insertions, 94 deletions
diff --git a/data/unk_sprite_file.s b/data/unk_sprite_file.s deleted file mode 100644 index 2d5c9c12a..000000000 --- a/data/unk_sprite_file.s +++ /dev/null @@ -1,42 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0862AD54:: @ 862AD54 - .incbin "baserom.gba", 0x62ad54, 0x1dc - -gUnknown_0862AF30:: @ 862AF30 - .incbin "baserom.gba", 0x62af30, 0x1AC - -gUnknown_0862B0DC:: @ 862B0DC - .incbin "baserom.gba", 0x62b0dc, 0x460 - -gUnknown_0862B53C:: @ 862B53C - .incbin "baserom.gba", 0x62b53c, 0x1E0 - -gUnknown_0862B71C:: @ 862B71C - .incbin "baserom.gba", 0x62b71c, 0x8 - -gUnknown_0862B724:: @ 862B724 - obj_tiles gUnknown_0862B0DC, 0x1800, 11920 - -gUnknown_0862B72C:: @ 862B72C - obj_pal gUnknown_0862B53C, 11920 - -gUnknown_0862B734:: @ 862B734 - .incbin "baserom.gba", 0x62b734, 0x8 - -gUnknown_0862B73C:: @ 862B73C - .incbin "baserom.gba", 0x62b73c, 0x8 - -gUnknown_0862B744:: @ 862B744 - .incbin "baserom.gba", 0x62b744, 0x8 - -gUnknown_0862B74C:: @ 862B74C - .4byte gUnknown_0862B734 - .4byte gUnknown_0862B73C - .4byte gUnknown_0862B744 - -gUnknown_0862B758:: @ 862B758 - spr_template 11920, 11920, gUnknown_0862B71C, gUnknown_0862B74C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/unk_transition.s b/data/unk_transition.s index 1b9ce5171..5d0dc07af 100644 --- a/data/unk_transition.s +++ b/data/unk_transition.s @@ -3,58 +3,14 @@ .section .rodata -gUnknown_0862B770:: @ 862B770 - .4byte sub_81DAACC - .4byte sub_81DAC14 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAC80 +gUnknown_0862AD54:: @ 862AD54 + .incbin "baserom.gba", 0x62ad54, 0x1dc -gUnknown_0862B784:: @ 862B784 - .4byte sub_81DAACC - .4byte sub_81DACEC - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAD58 +gUnknown_0862AF30:: @ 862AF30 + .incbin "baserom.gba", 0x62af30, 0x1AC -gUnknown_0862B798:: @ 862B798 - .4byte sub_81DAACC - .4byte sub_81DADC4 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAE44 +gUnknown_0862B0DC:: @ 862B0DC + .incbin "baserom.gba", 0x62b0dc, 0x460 -gUnknown_0862B7AC:: @ 862B7AC - .4byte sub_81DAACC - .4byte sub_81DAEB0 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DAF34 - -gUnknown_0862B7C0:: @ 862B7C0 - .4byte sub_81DAACC - .4byte sub_81DAFA0 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB02C - -gUnknown_0862B7D4:: @ 862B7D4 - .4byte sub_81DAACC - .4byte sub_81DB098 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB124 - -gUnknown_0862B7E8:: @ 862B7E8 - .4byte sub_81DAACC - .4byte sub_81DB190 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB224 - -gUnknown_0862B7FC:: @ 862B7FC - .4byte sub_81DAACC - .4byte sub_81DB290 - .4byte sub_81DABBC - .4byte sub_81DAB4C - .4byte sub_81DB328 +gUnknown_0862B53C:: @ 862B53C + .incbin "baserom.gba", 0x62b53c, 0x1E0 |