diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-16 15:03:22 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-16 15:03:22 -0500 |
| commit | b779a60ad70bcf65001bf88bc1c652629b22a2f9 (patch) | |
| tree | 21746f2d1cc68c2841368ea5775dfd63052b5e08 | |
| parent | 7860ce8dbe3d4abca3a8d3fb336705e3d09b32e0 (diff) | |
split data2b
| -rw-r--r-- | data/battle_7.s | 25 | ||||
| -rw-r--r-- | data/smokescreen.s (renamed from data/data2b.s) | 21 | ||||
| -rw-r--r-- | ld_script.txt | 3 |
3 files changed, 27 insertions, 22 deletions
diff --git a/data/battle_7.s b/data/battle_7.s new file mode 100644 index 000000000..50fad468a --- /dev/null +++ b/data/battle_7.s @@ -0,0 +1,25 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_081FAF24:: @ 81FAF24 + obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759 + + .align 2 +gOamData_81FAF2C:: @ 81FAF2C + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0C00 + + .align 2 +gSpriteTemplate_81FAF34:: @ 81FAF34 + spr_template 55129, 55039, gOamData_81FAF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8032978 + + .align 2 +gUnknown_081FAF4C:: @ 81FAF4C + .4byte gSharedMem + 0x8000 + .4byte gSharedMem + 0xA000 + .4byte gSharedMem + 0xC000 + .4byte gSharedMem + 0xE000 diff --git a/data/data2b.s b/data/smokescreen.s index c7cd4dfcf..21cca5917 100644 --- a/data/data2b.s +++ b/data/smokescreen.s @@ -55,24 +55,3 @@ gSpriteAnimTable_81FAEFC:: @ 81FAEFC .align 2 gSpriteTemplate_81FAF0C:: @ 81FAF0C spr_template 55019, 55019, gOamData_81FAEB4, gSpriteAnimTable_81FAEFC, NULL, gDummySpriteAffineAnimTable, sub_80463CC - - .align 2 -gUnknown_081FAF24:: @ 81FAF24 - obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759 - - .align 2 -gOamData_81FAF2C:: @ 81FAF2C - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0C00 - - .align 2 -gSpriteTemplate_81FAF34:: @ 81FAF34 - spr_template 55129, 55039, gOamData_81FAF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8032978 - - .align 2 -gUnknown_081FAF4C:: @ 81FAF4C - .4byte gSharedMem + 0x8000 - .4byte gSharedMem + 0xA000 - .4byte gSharedMem + 0xC000 - .4byte gSharedMem + 0xE000 diff --git a/ld_script.txt b/ld_script.txt index 3749b49f5..38fd4ff74 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -485,7 +485,8 @@ SECTIONS { data/btl_attrs.o(.rodata); src/battle/battle_4.o(.rodata); src/battle/battle_controller_player.o(.rodata); - data/data2b.o(.rodata); + data/smokescreen.o(.rodata); /* why is smokescreen rodata way up here and not in the correct location? */ + data/battle_7.o(.rodata); src/battle/battle_controller_opponent.o(.rodata); src/battle/battle_controller_linkopponent.o(.rodata); data/battle_moves.o(.rodata); |