diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-27 08:21:46 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-27 08:42:00 +0800 |
| commit | a61be4c32d8b81bd0ee414f44e1b0c9095778148 (patch) | |
| tree | bb3fbc3f725df83912f43bc6d9dafc4cca347c03 /data/data_83FECCC.s | |
| parent | b5162467692853dabb7765976fc7c0fa679c0f3d (diff) | |
| parent | 634fe80e9dcaffc9b1cf622b3132e686e926e97f (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'data/data_83FECCC.s')
| -rw-r--r-- | data/data_83FECCC.s | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 0b86868c2..c8dcbfb6b 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1,3 +1,5 @@ +#include "constants/region_map.h" +#include "constants/flags.h" .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata @@ -384,17 +386,9 @@ gTMCaseMainWindowPalette:: @ 841F408 .section .rodata.841F4B4 .align 2 gUnknown_841F4B4:: @ 841F4B4 - .incbin "baserom.gba", 0x41F4B4, 0x1F534 - -gUnknown_843E9E8:: @ 843E9E8 - .incbin "baserom.gba", 0x43E9E8, 0x1C0 - -gUnknown_843EBA8:: @ 843EBA8 - .incbin "baserom.gba", 0x43EBA8, 0x8 - -gUnknown_843EBB0:: @ 843EBB0 - .incbin "baserom.gba", 0x43EBB0, 0x4 + .incbin "baserom.gba", 0x41f4b4, 0x20 + .section .rodata.843EBB4 gUnknown_843EBB4:: @ 843EBB4 .incbin "baserom.gba", 0x43EBB4, 0x18 |