diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-04-24 23:10:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-24 23:10:28 -0400 |
| commit | 1a4867a4bf4427c45af7545adcabae58ee19eb6e (patch) | |
| tree | eb9c51a236166d5ae172d2d043f9aff010e37985 /data | |
| parent | 1d28c9820f3435b458bc73712f6c5902715efaa7 (diff) | |
| parent | 276db165b7dddb1ed6ec91261ae49ceab244fd69 (diff) | |
Merge pull request #52 from PikalaxALT/seagallop
Decompile seagallop
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_8468C98.s | 37 | ||||
| -rw-r--r-- | data/seagallop/eb_tilemap.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | data/seagallop/ferry_and_wake.pal | 19 | ||||
| -rw-r--r-- | data/seagallop/ferry_sprite.png | bin | 0 -> 595 bytes | |||
| -rw-r--r-- | data/seagallop/wake.png | bin | 0 -> 574 bytes | |||
| -rw-r--r-- | data/seagallop/water.png | bin | 0 -> 283 bytes | |||
| -rw-r--r-- | data/seagallop/wb_tilemap.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | data/specials.inc | 2 |
8 files changed, 25 insertions, 33 deletions
diff --git a/data/data_8468C98.s b/data/data_8468C98.s index f850fe141..828932cc6 100644 --- a/data/data_8468C98.s +++ b/data/data_8468C98.s @@ -1,38 +1,11 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + .section .rodata .align 2 -gUnknown_8468C98:: @ 8468C98 - .incbin "baserom.gba", 0x468C98, 0x520 - -gUnknown_84691B8:: @ 84691B8 - .incbin "baserom.gba", 0x4691B8, 0x20 - -gUnknown_84691D8:: @ 84691D8 - .incbin "baserom.gba", 0x4691D8, 0x800 - -gUnknown_84699D8:: @ 84699D8 - .incbin "baserom.gba", 0x4699D8, 0x1520 - -gUnknown_846AEF8:: @ 846AEF8 - .incbin "baserom.gba", 0x46AEF8, 0x4 - -gUnknown_846AEFC:: @ 846AEFC - .incbin "baserom.gba", 0x46AEFC, 0x2C - -gUnknown_846AF28:: @ 846AF28 - .incbin "baserom.gba", 0x46AF28, 0x38 - -gUnknown_846AF60:: @ 846AF60 - .incbin "baserom.gba", 0x46AF60, 0x18 - -gUnknown_846AF78:: @ 846AF78 - .incbin "baserom.gba", 0x46AF78, 0x18 - -gUnknown_846AF90:: @ 846AF90 - .incbin "baserom.gba", 0x46AF90, 0x40 - -gUnknown_846AFD0:: @ 846AFD0 - .incbin "baserom.gba", 0x46AFD0, 0x45C +gUnknown_846AFE8:: @ 846AFE8 + .incbin "baserom.gba", 0x46AFE8, 0x444 gUnknown_846B42C:: @ 846B42C .incbin "baserom.gba", 0x46B42C, 0x10 diff --git a/data/seagallop/eb_tilemap.bin b/data/seagallop/eb_tilemap.bin Binary files differnew file mode 100644 index 000000000..2f912fb18 --- /dev/null +++ b/data/seagallop/eb_tilemap.bin diff --git a/data/seagallop/ferry_and_wake.pal b/data/seagallop/ferry_and_wake.pal new file mode 100644 index 000000000..c25501332 --- /dev/null +++ b/data/seagallop/ferry_and_wake.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 123 180 +238 246 255 +222 230 238 +189 205 230 +156 164 189 +139 139 156 +98 98 123 +57 57 106 +197 98 98 +172 65 106 +32 74 156 +197 148 0 +246 213 24 +222 238 255 +255 255 255 +74 106 139 diff --git a/data/seagallop/ferry_sprite.png b/data/seagallop/ferry_sprite.png Binary files differnew file mode 100644 index 000000000..cc06fbffa --- /dev/null +++ b/data/seagallop/ferry_sprite.png diff --git a/data/seagallop/wake.png b/data/seagallop/wake.png Binary files differnew file mode 100644 index 000000000..a5ff28c6e --- /dev/null +++ b/data/seagallop/wake.png diff --git a/data/seagallop/water.png b/data/seagallop/water.png Binary files differnew file mode 100644 index 000000000..ccf64591a --- /dev/null +++ b/data/seagallop/water.png diff --git a/data/seagallop/wb_tilemap.bin b/data/seagallop/wb_tilemap.bin Binary files differnew file mode 100644 index 000000000..a3c27d319 --- /dev/null +++ b/data/seagallop/wb_tilemap.bin diff --git a/data/specials.inc b/data/specials.inc index 33cc5736b..f3c71d1bd 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -388,7 +388,7 @@ gSpecials:: @ 815FD60 def_special sub_8046B94 def_special sub_8046BBC def_special sub_8046BDC - def_special sub_8146E78 + def_special ScrSpecial_SeaGallopFerry def_special sub_80CC48C def_special sub_812B220 def_special sub_812B234 |
