diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_7.s | 25 | ||||
| -rw-r--r-- | data/smokescreen.s (renamed from data/data2b.s) | 21 |
2 files changed, 25 insertions, 21 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 |