diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-18 15:10:25 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-18 15:10:25 -0400 |
| commit | 810bfffd1242ebfd29fcc2db6fef19b34545ad0b (patch) | |
| tree | 72e19ed5db4cfc05e8ee2d7ed79555f196d01d05 /data | |
| parent | 0e2d84f24d22b6ec47e6adf32bc5f4d6b4c6289b (diff) | |
data decomp
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_emerald2.s | 31 | ||||
| -rw-r--r-- | data/graphics.s | 58 | ||||
| -rw-r--r-- | data/text/move_descriptions.inc | 3 |
3 files changed, 60 insertions, 32 deletions
diff --git a/data/data_emerald2.s b/data/data_emerald2.s index 7efcbbecf..ce7e2a6e3 100644 --- a/data/data_emerald2.s +++ b/data/data_emerald2.s @@ -34,36 +34,7 @@ gUnknown_08617E34:: @ 8617E34 gUnknown_08617E60:: @ 8617E60 .incbin "baserom.gba", 0x617e60, 0x18 -gUnknown_08617E78:: @ 8617E78 - .incbin "baserom.gba", 0x617e78, 0x15 - -gUnknown_08617E8D:: @ 8617E8D - .incbin "baserom.gba", 0x617e8d, 0xe - -gUnknown_08617E9B:: @ 8617E9B - .incbin "baserom.gba", 0x617e9b, 0x26d - -gUnknown_08618108:: @ 8618108 - .incbin "baserom.gba", 0x618108, 0x8 - -gUnknown_08618110:: @ 8618110 - .incbin "baserom.gba", 0x618110, 0x28 - -gUnknown_08618138:: @ 8618138 - .incbin "baserom.gba", 0x618138, 0x20 - -gUnknown_08618158:: @ 8618158 - .incbin "baserom.gba", 0x618158, 0x3 - -gUnknown_0861815B:: @ 861815B - .incbin "baserom.gba", 0x61815b, 0x5 - -gUnknown_08618160:: @ 8618160 - .incbin "baserom.gba", 0x618160, 0x18 - -gUnknown_08618178:: @ 8618178 - .incbin "baserom.gba", 0x618178, 0x49 - + .section .rodata.2 @ 86181C1 .include "data/text/move_descriptions.inc" diff --git a/data/graphics.s b/data/graphics.s index bf080fd95..1be6d1a07 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -953,7 +953,7 @@ gUnknown_08DD4BF0:: @ 8DD4BF0 gUnknown_08DD4C4C:: @ 8DD4C4C .incbin "baserom.gba", 0xdd4c4c, 0xac - + .align 2 gUnknown_08DD4CF8:: @ 8DD4CF8 .incbin "graphics/interface/unk_change_case.4bpp.lz" @@ -988,7 +988,61 @@ gUnknown_08DD7300:: @ 8DD7300 .incbin "baserom.gba", 0xdd7300, 0x60 gUnknown_08DD7360:: @ 8DD7360 - .incbin "baserom.gba", 0xdd7360, 0x4084 + .incbin "baserom.gba", 0xdd7360, 0x1420 + +gUnknown_08DD8780:: @ 8DD8780 + .incbin "baserom.gba", 0xdd8780, 0x40 + +gUnknown_08DD87C0:: @ 8DD87C0 + .incbin "baserom.gba", 0xdd87c0, 0x720 + +gUnknown_08DD8EE0:: @ 8DD8EE0 + .incbin "baserom.gba", 0xdd8ee0, 0x1a0 + +gUnknown_08DD9080:: @ 8DD9080 + .incbin "baserom.gba", 0xdd9080, 0x60 + +gUnknown_08DD90E0:: @ 8DD90E0 + .incbin "baserom.gba", 0xdd90e0, 0x638 + +gUnknown_08DD9718:: @ 8DD9718 + .incbin "baserom.gba", 0xdd9718, 0x15c + +gUnknown_08DD9874:: @ 8DD9874 + .incbin "baserom.gba", 0xdd9874, 0x40 + +gUnknown_08DD98B4:: @ 8DD98B4 + .incbin "baserom.gba", 0xdd98b4, 0x5a4 + +gUnknown_08DD9E58:: @ 8DD9E58 + .incbin "baserom.gba", 0xdd9e58, 0x194 + +gUnknown_08DD9FEC:: @ 8DD9FEC + .incbin "baserom.gba", 0xdd9fec, 0x40 + +gUnknown_08DDA02C:: @ 8DDA02C + .incbin "baserom.gba", 0xdda02c, 0x610 + +gUnknown_08DDA63C:: @ 8DDA63C + .incbin "baserom.gba", 0xdda63c, 0x1c4 + +gUnknown_08DDA800:: @ 8DDA800 + .incbin "baserom.gba", 0xdda800, 0x40 + +gUnknown_08DDA840:: @ 8DDA840 + .incbin "baserom.gba", 0xdda840, 0x600 + +gUnknown_08DDAE40:: @ 8DDAE40 + .incbin "baserom.gba", 0xddae40, 0x1a0 + +gUnknown_08DDAFE0:: @ 8DDAFE0 + .incbin "baserom.gba", 0xddafe0, 0x40 + +gUnknown_08DDB020:: @ 8DDB020 + .incbin "baserom.gba", 0xddb020, 0x2a4 + +gUnknown_08DDB2C4:: @ 8DDB2C4 + .incbin "baserom.gba", 0xddb2c4, 0x120 gUnknown_08DDB3E4:: @ 8DDB3E4 .incbin "baserom.gba", 0xddb3e4, 0x80 diff --git a/data/text/move_descriptions.inc b/data/text/move_descriptions.inc index 454e49ae1..0f6b1adbf 100644 --- a/data/text/move_descriptions.inc +++ b/data/text/move_descriptions.inc @@ -1,3 +1,6 @@ +gNullMoveDescription:: @ 86181C0 + .string "$" + gPoundMoveDescription:: @ 86181C1 .string "Pounds the foe with\nforelegs or tail.$" |