diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-02-15 16:54:34 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-02-15 16:54:34 -0600 |
| commit | 34716558b1f8bc4e9f07e90d3727ea44e74ddd9d (patch) | |
| tree | c515cb97b1a5a29ef6ae55e6d2ae8bec0271c6f7 /data | |
| parent | 398e775d906ff4f1e5aaad3d8a9eee530c7b122d (diff) | |
Almost finish decompiling intro
Diffstat (limited to 'data')
| -rw-r--r-- | data/intro.s | 46 | ||||
| -rw-r--r-- | data/intro_credits_graphics.s | 8 |
2 files changed, 38 insertions, 16 deletions
diff --git a/data/intro.s b/data/intro.s index d43a57972..142d1c69e 100644 --- a/data/intro.s +++ b/data/intro.s @@ -230,9 +230,12 @@ gUnknown_085E4C4C:: @ 85E4C4C .align 2 gUnknown_085E4C64:: @ 85E4C64 - .2byte 0x0068, 0x0000, 0x00c0, 0x008e, 0x0003, 0x0280, 0x0053, 0x0001 - .2byte 0x0180, 0x009b, 0x0000, 0x0080, 0x0038, 0x0002, 0x0200, 0x00ae - .2byte 0x0001, 0x0100 + .2byte 0x0068, 0x0000, 0x00c0 + .2byte 0x008e, 0x0003, 0x0280 + .2byte 0x0053, 0x0001, 0x0180 + .2byte 0x009b, 0x0000, 0x0080 + .2byte 0x0038, 0x0002, 0x0200 + .2byte 0x00ae, 0x0001, 0x0100 .align 2 gUnknown_085E4C88:: @ 85E4C88 @@ -246,11 +249,18 @@ gUnknown_085E4C98:: @ 85E4C98 .align 2 gUnknown_085E4CA8:: @ 85E4CA8 - .2byte 0x0042, 0x0040, 0x0001, 0x0060, 0x0060, 0x0008, 0x0080, 0x0040 - .2byte 0x0001, 0x0090, 0x0030, 0x0008, 0x00a0, 0x0048, 0x0001, 0x00b0 - .2byte 0x0060, 0x0008, 0x0060, 0x0060, 0x0004, 0x0070, 0x0068, 0x0008 - .2byte 0x0080, 0x0060, 0x0004, 0x0058, 0x0020, 0x0004, 0x0068, 0x0018 - .2byte 0x0008, 0x0078, 0x0020, 0x0004 + .2byte 0x0042, 0x0040, 0x0001 + .2byte 0x0060, 0x0060, 0x0008 + .2byte 0x0080, 0x0040, 0x0001 + .2byte 0x0090, 0x0030, 0x0008 + .2byte 0x00a0, 0x0048, 0x0001 + .2byte 0x00b0, 0x0060, 0x0008 + .2byte 0x0060, 0x0060, 0x0004 + .2byte 0x0070, 0x0068, 0x0008 + .2byte 0x0080, 0x0060, 0x0004 + .2byte 0x0058, 0x0020, 0x0004 + .2byte 0x0068, 0x0018, 0x0008 + .2byte 0x0078, 0x0020, 0x0004 .align 2 gUnknown_085E4CF0:: @ 85E4CF0 @@ -420,10 +430,22 @@ gUnknown_085E4E90:: @ 85E4E90 .align 2 gUnknown_085E4E94:: @ 85E4E94 - .2byte 0x0000, 0xffb8, 0x0001, 0xffc8, 0x0002, 0xffd8, 0x0003, 0xffe8 - .2byte 0x0004, 0x0008, 0x0005, 0x0018, 0x0003, 0x0028, 0x0001, 0x0038 - .2byte 0x0006, 0x0048, 0x0000, 0xffe4, 0x0001, 0xffec, 0x0002, 0xfff4 - .2byte 0x0003, 0xfffc, 0x0002, 0x0004, 0x0004, 0x000c, 0x0005, 0x0014 + .2byte 0x0000, 0xffb8 + .2byte 0x0001, 0xffc8 + .2byte 0x0002, 0xffd8 + .2byte 0x0003, 0xffe8 + .2byte 0x0004, 0x0008 + .2byte 0x0005, 0x0018 + .2byte 0x0003, 0x0028 + .2byte 0x0001, 0x0038 + .2byte 0x0006, 0x0048 + .2byte 0x0000, 0xffe4 + .2byte 0x0001, 0xffec + .2byte 0x0002, 0xfff4 + .2byte 0x0003, 0xfffc + .2byte 0x0002, 0x0004 + .2byte 0x0004, 0x000c + .2byte 0x0005, 0x0014 .2byte 0x0003, 0x001c .align 2 diff --git a/data/intro_credits_graphics.s b/data/intro_credits_graphics.s index 636c1a8fb..7c5726eb8 100644 --- a/data/intro_credits_graphics.s +++ b/data/intro_credits_graphics.s @@ -383,17 +383,17 @@ gUnknown_085F52A4:: @ 85F52A4 spr_template 0x03ed, 0x03ed, gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66 .align 2 -gUnknown_085F52BC:: @ 85F52BC +gIntro2BrendanSpriteSheet:: @ 85F52BC obj_tiles gIntro2BrendanNoTurnGfx, 0x2000, 0x03ea null_obj_tiles .align 2 -gUnknown_085F52CC:: @ 85F52CC +gIntro2MaySpriteSheet:: @ 85F52CC obj_tiles gIntro2MayNoTurnGfx, 0x2000, 0x03eb null_obj_tiles .align 2 -gUnknown_085F52DC:: @ 85F52DC +gIntro2BicycleSpriteSheet:: @ 85F52DC obj_tiles gIntro2BicycleGfx, 0x1000, 0x03e9 null_obj_tiles @@ -403,7 +403,7 @@ gUnknown_085F52EC:: @ 85F52EC null_obj_tiles .align 2 -gUnknown_085F52FC:: @ 85F52FC +gIntro2FlygonSpriteSheet:: @ 85F52FC obj_tiles gIntro2FlygonGfx, 0x1000, 0x03ed null_obj_tiles |