diff options
| -rwxr-xr-x | data/use_pokeblock.s | 44 | ||||
| -rwxr-xr-x | ld_script.txt | 1 | ||||
| -rwxr-xr-x | src/use_pokeblock.c | 50 |
3 files changed, 50 insertions, 45 deletions
diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s deleted file mode 100755 index 88f8cc336..000000000 --- a/data/use_pokeblock.s +++ /dev/null @@ -1,44 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSpriteSheet_ConditionUpDown:: @ 8406148 - obj_tiles ConditionUpDownTiles, 0x200, 0 - - .align 2 -gSpritePalette_ConditionUpDown:: @ 8406150 - obj_pal ConditionUpDownPalette, 0 - -gUnknown_08406158:: @ 8406158 - .2byte 156, 30 - .2byte 117, 53 - .2byte 117, 112 - .2byte 197, 112 - .2byte 197, 53 - - .align 2 -gOamData_840616C:: @ 840616C - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_8406174:: @ 8406174 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_840617C:: @ 840617C - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8406184:: @ 8406184 - .4byte gSpriteAnim_8406174 - .4byte gSpriteAnim_840617C - - .align 2 -gSpriteTemplate_840618C:: @ 840618C - spr_template 0, 0, gOamData_840616C, gSpriteAnimTable_8406184, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/ld_script.txt b/ld_script.txt index a360ee781..2282bc7a2 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -463,7 +463,6 @@ SECTIONS { src/roamer.o(.rodata); data/battle_tower.o(.rodata); src/use_pokeblock.o(.rodata); - data/use_pokeblock.o(.rodata); data/battle_anim_8137220.o(.rodata); src/player_pc.o(.rodata); src/intro.o(.rodata); diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index c21e3719a..6ca3437fd 100755 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -46,6 +46,56 @@ const u8 *const gUnknown_08406134[] = { OtherText_Beauty }; +const struct SpriteSheet gSpriteSheet_ConditionUpDown = { + (u8 *)ConditionUpDownTiles, + sizeof ConditionUpDownTiles, + GFX_TAG_CONDITIONUPDOWN +}; + +const struct SpritePalette gSpritePalette_ConditionUpDown = { + ConditionUpDownPalette, + GFX_TAG_CONDITIONUPDOWN +}; + +const struct Coords16 gUnknown_08406158[] = { + {0x9c, 0x1e}, + {0x75, 0x35}, + {0x75, 0x70}, + {0xc5, 0x70}, + {0xc5, 0x35} +}; + +const struct OamData gOamData_840616C = { + .shape = 1, + .size = 2, + .priority = 1 +}; + +const union AnimCmd gSpriteAnim_8406174[] = { + ANIMCMD_FRAME(0, 5), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_840617C[] = { + ANIMCMD_FRAME(8, 5), + ANIMCMD_END +}; + +const union AnimCmd *const gSpriteAnimTable_8406184[] = { + gSpriteAnim_8406174, + gSpriteAnim_840617C +}; + +const struct SpriteTemplate gSpriteTemplate_840618C = { + GFX_TAG_CONDITIONUPDOWN, + GFX_TAG_CONDITIONUPDOWN, + &gOamData_840616C, + gSpriteAnimTable_8406184, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + asm(".text\n" ".include \"constants/gba_constants.inc\""); |