diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 18:24:01 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 18:24:01 +0200 |
| commit | 117f8a6abd8ba160409b0077920887ee0cff49f8 (patch) | |
| tree | 80eae5a134bc87f9ac00652f6436c29c332f5ef5 /data | |
| parent | c9603c40d86053a571023845b5c32c8ff381cabe (diff) | |
| parent | 78009a835f840864b3d30af00c65a745f75b80fa (diff) | |
Merge branch 'master' into decomp_pokemon
Diffstat (limited to 'data')
| -rw-r--r-- | data/data3.s | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/data/data3.s b/data/data3.s index dac15b02e..ee981ac4f 100644 --- a/data/data3.s +++ b/data/data3.s @@ -5,17 +5,7 @@ .section .rodata -gBitTable:: @ 832A328 - .incbin "baserom.gba", 0x32a328, 0x80 -gUnknown_0832A3A8:: @ 832A3A8 - .incbin "baserom.gba", 0x32a3a8, 0x18 - -gUnknown_0832A3C0:: @ 832A3C0 - .incbin "baserom.gba", 0x32a3c0, 0x18 - -gUnknown_0832A3D8:: @ 832A3D8 - .incbin "baserom.gba", 0x32a3d8, 0xa00 @ 832ADD8 .include "data/egg_moves.inc" |