diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2020-10-15 22:43:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-15 22:43:19 -0700 |
| commit | ccbbadcfd78d20d2d9ed785981427fcc3acd48d8 (patch) | |
| tree | 6322f3dc261c27e4439ef83827624a89166da25c /data | |
| parent | 2a9e3022c1375966d54b095a77b2a6990e0e7a5d (diff) | |
| parent | 1fec60ed5da2d5fbd793e38e7da2f9d121ce9a95 (diff) | |
Merge branch 'master' into manager8
Diffstat (limited to 'data')
| -rwxr-xr-x | data/data_08107BC8.s | 36 | ||||
| -rw-r--r-- | data/data_081081EC.s | 11 |
2 files changed, 11 insertions, 36 deletions
diff --git a/data/data_08107BC8.s b/data/data_08107BC8.s index 8c290db5..699c41d5 100755 --- a/data/data_08107BC8.s +++ b/data/data_08107BC8.s @@ -99,39 +99,3 @@ gUnk_08107DA0:: @ 08107DA0 gUnk_08107DC0:: @ 08107DC0 .incbin "baserom.gba", 0x107DC0, 0x0000264 - -gUnk_08108024:: @ 08108024 - .incbin "baserom.gba", 0x108024, 0x0000010 - -gUnk_08108034:: @ 08108034 - .incbin "baserom.gba", 0x108034, 0x0000010 - -gUnk_08108044:: @ 08108044 - .incbin "baserom.gba", 0x108044, 0x000000C - -gUnk_08108050:: @ 08108050 - .incbin "baserom.gba", 0x108050, 0x000001E - -gUnk_0810806E:: @ 0810806E - .incbin "baserom.gba", 0x10806E, 0x0000036 - -gUnk_081080A4:: @ 081080A4 - .incbin "baserom.gba", 0x1080A4, 0x0000020 - -gUnk_081080C4:: @ 081080C4 - .incbin "baserom.gba", 0x1080C4, 0x0000043 - -gUnk_08108107:: @ 08108107 - .incbin "baserom.gba", 0x108107, 0x0000079 - -gUnk_08108180:: @ 08108180 - .incbin "baserom.gba", 0x108180, 0x0000064 - -gUnk_081081E4:: @ 081081E4 - .incbin "baserom.gba", 0x1081E4, 0x0000008 - -gUnk_081081EC:: @ 081081EC - .incbin "baserom.gba", 0x1081EC, 0x0000008 - -gUnk_081081F4:: @ 081081F4 - .incbin "baserom.gba", 0x1081F4, 0x0000014 diff --git a/data/data_081081EC.s b/data/data_081081EC.s new file mode 100644 index 00000000..4d0e1d08 --- /dev/null +++ b/data/data_081081EC.s @@ -0,0 +1,11 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_081081EC:: @ 081081EC + .incbin "baserom.gba", 0x1081EC, 0x0000008 + +gUnk_081081F4:: @ 081081F4 + .incbin "baserom.gba", 0x1081F4, 0x0000014 |