diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-07 18:31:19 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-07 18:31:19 +0000 |
| commit | f844eab31bfc956eac1fa3c16ff91664830d64d5 (patch) | |
| tree | a5d21a66f6f1108327d6bab5e766010bbe11c9e1 | |
| parent | dedae4a1d0f265b32bbdc89d147875192b52ca91 (diff) | |
baseroms
fieldmap.s
fldeff_cut.s (partially)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | data/fieldmap.s | 3 | ||||
| -rw-r--r-- | data/fldeff_cut.s | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index f4234c5aa..25be9db78 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ data2old.s dump baserom msys code.txt *.lnk baserom.rar +datadump/ diff --git a/data/fieldmap.s b/data/fieldmap.s index e2cc537da..83b0b2a50 100644 --- a/data/fieldmap.s +++ b/data/fieldmap.s @@ -5,4 +5,5 @@ .align 2, 0 gUnknown_08486EF8:: @ 8486EF8 - .incbin "baserom.gba", 0x486ef8, 0x4 +@ replacing .incbin "baserom.gba", 0x00486ef8, 0x4 +.4byte 0x00000000 diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s index 96bdcede4..c267b7b63 100644 --- a/data/fldeff_cut.s +++ b/data/fldeff_cut.s @@ -8,7 +8,10 @@ gUnknown_0857C608:: @ 857C608 .incbin "baserom.gba", 0x57c608, 0x2 gUnknown_0857C60A:: @ 857C60A - .incbin "baserom.gba", 0x57c60a, 0x5a +@ replacing .incbin "baserom.gba", 0x0057c60a, 0x5a +.byte 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00 +.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x50, 0xc6, 0x57, 0x08, 0x58, 0x6e, 0x4f, 0x08, 0x20, 0x00, 0x00, 0x00 .align 2 gFieldEffectObjectPaletteInfo6:: @ 857C664 |