From 2ef974d7766f899bbe3c3d4af8974232c6a13610 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 24 Apr 2019 17:14:11 -0400 Subject: Decompile seagallop --- data/data_8468C98.s | 37 +++++-------------------------------- data/seagallop/unk_8468C98.png | Bin 0 -> 283 bytes data/seagallop/unk_84691B8.pal | 19 +++++++++++++++++++ data/seagallop/unk_84691D8.bin | Bin 0 -> 2048 bytes data/seagallop/unk_84699D8.bin | Bin 0 -> 2048 bytes data/seagallop/unk_846A1D8.png | Bin 0 -> 595 bytes data/seagallop/unk_846A6D8.pal | 19 +++++++++++++++++++ data/seagallop/unk_846A6F8.png | Bin 0 -> 574 bytes 8 files changed, 43 insertions(+), 32 deletions(-) create mode 100644 data/seagallop/unk_8468C98.png create mode 100644 data/seagallop/unk_84691B8.pal create mode 100644 data/seagallop/unk_84691D8.bin create mode 100644 data/seagallop/unk_84699D8.bin create mode 100644 data/seagallop/unk_846A1D8.png create mode 100644 data/seagallop/unk_846A6D8.pal create mode 100644 data/seagallop/unk_846A6F8.png (limited to 'data') 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/unk_8468C98.png b/data/seagallop/unk_8468C98.png new file mode 100644 index 000000000..ccf64591a Binary files /dev/null and b/data/seagallop/unk_8468C98.png differ diff --git a/data/seagallop/unk_84691B8.pal b/data/seagallop/unk_84691B8.pal new file mode 100644 index 000000000..4b2dc6c7d --- /dev/null +++ b/data/seagallop/unk_84691B8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +213 238 255 +172 205 255 +139 180 238 +106 156 230 +49 115 180 +65 123 189 +82 139 205 +205 222 238 +172 189 205 +123 123 131 +90 90 115 +49 115 172 +238 230 139 +230 213 139 +213 197 106 diff --git a/data/seagallop/unk_84691D8.bin b/data/seagallop/unk_84691D8.bin new file mode 100644 index 000000000..a3c27d319 Binary files /dev/null and b/data/seagallop/unk_84691D8.bin differ diff --git a/data/seagallop/unk_84699D8.bin b/data/seagallop/unk_84699D8.bin new file mode 100644 index 000000000..2f912fb18 Binary files /dev/null and b/data/seagallop/unk_84699D8.bin differ diff --git a/data/seagallop/unk_846A1D8.png b/data/seagallop/unk_846A1D8.png new file mode 100644 index 000000000..cc06fbffa Binary files /dev/null and b/data/seagallop/unk_846A1D8.png differ diff --git a/data/seagallop/unk_846A6D8.pal b/data/seagallop/unk_846A6D8.pal new file mode 100644 index 000000000..c25501332 --- /dev/null +++ b/data/seagallop/unk_846A6D8.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/unk_846A6F8.png b/data/seagallop/unk_846A6F8.png new file mode 100644 index 000000000..a5ff28c6e Binary files /dev/null and b/data/seagallop/unk_846A6F8.png differ -- cgit v1.2.3 From b4ffd53ee2fed6eada3610e833bebb8c170fcdd6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 24 Apr 2019 22:42:54 -0400 Subject: Documentation of SeaGallop --- data/specials.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') 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 -- cgit v1.2.3 From 276db165b7dddb1ed6ec91261ae49ceab244fd69 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 24 Apr 2019 23:08:23 -0400 Subject: change asset filenames --- data/seagallop/eb_tilemap.bin | Bin 0 -> 2048 bytes data/seagallop/ferry_and_wake.pal | 19 +++++++++++++++++++ data/seagallop/ferry_sprite.png | Bin 0 -> 595 bytes data/seagallop/unk_8468C98.png | Bin 283 -> 0 bytes data/seagallop/unk_84691B8.pal | 19 ------------------- data/seagallop/unk_84691D8.bin | Bin 2048 -> 0 bytes data/seagallop/unk_84699D8.bin | Bin 2048 -> 0 bytes data/seagallop/unk_846A1D8.png | Bin 595 -> 0 bytes data/seagallop/unk_846A6D8.pal | 19 ------------------- data/seagallop/unk_846A6F8.png | Bin 574 -> 0 bytes data/seagallop/wake.png | Bin 0 -> 574 bytes data/seagallop/water.png | Bin 0 -> 283 bytes data/seagallop/wb_tilemap.bin | Bin 0 -> 2048 bytes 13 files changed, 19 insertions(+), 38 deletions(-) create mode 100644 data/seagallop/eb_tilemap.bin create mode 100644 data/seagallop/ferry_and_wake.pal create mode 100644 data/seagallop/ferry_sprite.png delete mode 100644 data/seagallop/unk_8468C98.png delete mode 100644 data/seagallop/unk_84691B8.pal delete mode 100644 data/seagallop/unk_84691D8.bin delete mode 100644 data/seagallop/unk_84699D8.bin delete mode 100644 data/seagallop/unk_846A1D8.png delete mode 100644 data/seagallop/unk_846A6D8.pal delete mode 100644 data/seagallop/unk_846A6F8.png create mode 100644 data/seagallop/wake.png create mode 100644 data/seagallop/water.png create mode 100644 data/seagallop/wb_tilemap.bin (limited to 'data') diff --git a/data/seagallop/eb_tilemap.bin b/data/seagallop/eb_tilemap.bin new file mode 100644 index 000000000..2f912fb18 Binary files /dev/null and b/data/seagallop/eb_tilemap.bin differ 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 new file mode 100644 index 000000000..cc06fbffa Binary files /dev/null and b/data/seagallop/ferry_sprite.png differ diff --git a/data/seagallop/unk_8468C98.png b/data/seagallop/unk_8468C98.png deleted file mode 100644 index ccf64591a..000000000 Binary files a/data/seagallop/unk_8468C98.png and /dev/null differ diff --git a/data/seagallop/unk_84691B8.pal b/data/seagallop/unk_84691B8.pal deleted file mode 100644 index 4b2dc6c7d..000000000 --- a/data/seagallop/unk_84691B8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -49 115 180 -65 123 189 -82 139 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/seagallop/unk_84691D8.bin b/data/seagallop/unk_84691D8.bin deleted file mode 100644 index a3c27d319..000000000 Binary files a/data/seagallop/unk_84691D8.bin and /dev/null differ diff --git a/data/seagallop/unk_84699D8.bin b/data/seagallop/unk_84699D8.bin deleted file mode 100644 index 2f912fb18..000000000 Binary files a/data/seagallop/unk_84699D8.bin and /dev/null differ diff --git a/data/seagallop/unk_846A1D8.png b/data/seagallop/unk_846A1D8.png deleted file mode 100644 index cc06fbffa..000000000 Binary files a/data/seagallop/unk_846A1D8.png and /dev/null differ diff --git a/data/seagallop/unk_846A6D8.pal b/data/seagallop/unk_846A6D8.pal deleted file mode 100644 index c25501332..000000000 --- a/data/seagallop/unk_846A6D8.pal +++ /dev/null @@ -1,19 +0,0 @@ -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/unk_846A6F8.png b/data/seagallop/unk_846A6F8.png deleted file mode 100644 index a5ff28c6e..000000000 Binary files a/data/seagallop/unk_846A6F8.png and /dev/null differ diff --git a/data/seagallop/wake.png b/data/seagallop/wake.png new file mode 100644 index 000000000..a5ff28c6e Binary files /dev/null and b/data/seagallop/wake.png differ diff --git a/data/seagallop/water.png b/data/seagallop/water.png new file mode 100644 index 000000000..ccf64591a Binary files /dev/null and b/data/seagallop/water.png differ diff --git a/data/seagallop/wb_tilemap.bin b/data/seagallop/wb_tilemap.bin new file mode 100644 index 000000000..a3c27d319 Binary files /dev/null and b/data/seagallop/wb_tilemap.bin differ -- cgit v1.2.3