diff options
| -rw-r--r-- | data/battle_anim_81258BC.s | 64 | ||||
| -rw-r--r-- | data/battle_anim_812C144.s (renamed from data/rom_81258BC.s) | 212 | ||||
| -rw-r--r-- | data/decoration_inventory.s | 16 | ||||
| -rw-r--r-- | data/learn_move.s | 144 | ||||
| -rw-r--r-- | ld_script.txt | 5 |
5 files changed, 228 insertions, 213 deletions
diff --git a/data/battle_anim_81258BC.s b/data/battle_anim_81258BC.s new file mode 100644 index 000000000..b4f88fc67 --- /dev/null +++ b/data/battle_anim_81258BC.s @@ -0,0 +1,64 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_08402080:: @ 8402080 + .4byte sub_812B864 + .4byte sub_812B870 + .4byte sub_812B87C + .4byte sub_812B888 + .4byte sub_812B894 + .4byte sub_812B8A0 + .4byte sub_812B8AC + .4byte sub_812B8B8 + .4byte sub_812B994 + .4byte sub_812B9A0 + .4byte sub_812B9AC + .4byte sub_812B9B8 + .4byte sub_812B9C4 + .4byte sub_812BA14 + .4byte sub_812BA70 + .4byte sub_812BA7C + .4byte dp01t_10_6_message + .4byte dp01t_11_6_message_for_player_only + .4byte sub_812BB10 + .4byte sub_812BBFC + .4byte sub_812BC08 + .4byte sub_812BC14 + .4byte sub_812BC54 + .4byte sub_812BC60 + .4byte sub_812BC6C + .4byte sub_812BC78 + .4byte sub_812BC84 + .4byte sub_812BCC0 + .4byte sub_812BCCC + .4byte sub_812BCD8 + .4byte sub_812BCE4 + .4byte sub_812BCF0 + .4byte sub_812BCFC + .4byte sub_812BD08 + .4byte sub_812BD14 + .4byte sub_812BD20 + .4byte sub_812BD2C + .4byte sub_812BD38 + .4byte sub_812BD44 + .4byte sub_812BD50 + .4byte sub_812BD5C + .4byte sub_812BD68 + .4byte sub_812BD74 + .4byte sub_812BD80 + .4byte sub_812BDC4 + .4byte sub_812BDF4 + .4byte dp01t_2E_6_battle_intro + .4byte sub_812BE64 + .4byte sub_812BEB0 + .4byte sub_812BEBC + .4byte sub_812BEC8 + .4byte sub_812BED4 + .4byte sub_812BEE0 + .4byte sub_812BF3C + .4byte sub_812BF48 + .4byte sub_812BF54 + .4byte nullsub_78 diff --git a/data/rom_81258BC.s b/data/battle_anim_812C144.s index fe01aa049..62e3b45ae 100644 --- a/data/rom_81258BC.s +++ b/data/battle_anim_812C144.s @@ -4,66 +4,6 @@ .section .rodata .align 2 -gUnknown_08402080:: @ 8402080 - .4byte sub_812B864 - .4byte sub_812B870 - .4byte sub_812B87C - .4byte sub_812B888 - .4byte sub_812B894 - .4byte sub_812B8A0 - .4byte sub_812B8AC - .4byte sub_812B8B8 - .4byte sub_812B994 - .4byte sub_812B9A0 - .4byte sub_812B9AC - .4byte sub_812B9B8 - .4byte sub_812B9C4 - .4byte sub_812BA14 - .4byte sub_812BA70 - .4byte sub_812BA7C - .4byte dp01t_10_6_message - .4byte dp01t_11_6_message_for_player_only - .4byte sub_812BB10 - .4byte sub_812BBFC - .4byte sub_812BC08 - .4byte sub_812BC14 - .4byte sub_812BC54 - .4byte sub_812BC60 - .4byte sub_812BC6C - .4byte sub_812BC78 - .4byte sub_812BC84 - .4byte sub_812BCC0 - .4byte sub_812BCCC - .4byte sub_812BCD8 - .4byte sub_812BCE4 - .4byte sub_812BCF0 - .4byte sub_812BCFC - .4byte sub_812BD08 - .4byte sub_812BD14 - .4byte sub_812BD20 - .4byte sub_812BD2C - .4byte sub_812BD38 - .4byte sub_812BD44 - .4byte sub_812BD50 - .4byte sub_812BD5C - .4byte sub_812BD68 - .4byte sub_812BD74 - .4byte sub_812BD80 - .4byte sub_812BDC4 - .4byte sub_812BDF4 - .4byte dp01t_2E_6_battle_intro - .4byte sub_812BE64 - .4byte sub_812BEB0 - .4byte sub_812BEBC - .4byte sub_812BEC8 - .4byte sub_812BED4 - .4byte sub_812BEE0 - .4byte sub_812BF3C - .4byte sub_812BF48 - .4byte sub_812BF54 - .4byte nullsub_78 - - .align 2 gSpriteAnim_8402164:: @ 8402164 obj_image_anim_frame 0, 4 obj_image_anim_frame 16, 4 @@ -658,155 +598,3 @@ gBattleAnimSpriteTemplate_8402B10:: @ 8402B10 .align 2 gUnknown_08402B28:: @ 8402B28 .incbin "baserom.gba", 0x00402b28, 0x30 - - .align 2 -gDexArrows_Pal:: - .incbin "graphics/pokedex/arrows.gbapal" - - .align 2 -gDexArrows_Gfx:: - .incbin "graphics/pokedex/arrows.4bpp" - - .incbin "baserom.gba", 0x00402c78, 0x80 - -gUnknown_08402CF8:: @ 8402CF8 - .incbin "baserom.gba", 0x00402cf8, 0x10 - -gUnknown_08402D08:: @ 8402D08 - .4byte OtherText_Battle - .byte 1, 1, 0, 0 - .4byte OtherText_Power - .byte 1, 4, 1, 0 - .4byte OtherText_Accuracy - .byte 1, 9, 2, 0 - .space 8 - - .4byte OtherText_Contest - .byte 1, 1, 0, 0 - .4byte OtherText_Appeal - .byte 1, 4, 1, 0 - .4byte OtherText_Jam - .byte 1, 9, 2, 0 - .space 8 - - .4byte 0xFF00FFEF - .4byte gTileBuffer - - .align 2 -gOamData_8402D50:: @ 8402D50 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gOamData_8402D58:: @ 8402D58 - .2byte 0x8000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gOamData_8402D60:: @ 8402D60 - .2byte 0x4000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_8402D68:: @ 8402D68 - obj_image_anim_frame 2, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_8402D70:: @ 8402D70 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8402D78:: @ 8402D78 - .4byte gSpriteAnim_8402D68 - .4byte gSpriteAnim_8402D70 - - .align 2 -gUnknown_08402D80:: @ 8402D80 - obj_tiles gDexArrows_Gfx, 384, 0x1595 - - .align 2 -gUnknown_08402D88:: @ 8402D88 - obj_pal gDexArrows_Pal, 0x1596 - - .align 2 -gSpriteTemplate_8402D90:: @ 8402D90 - spr_template 5525, 5526, gOamData_8402D58, gSpriteAnimTable_8402D78, NULL, gDummySpriteAffineAnimTable, sub_8133300 - - .align 2 -gSpriteAnim_8402DA8:: @ 8402DA8 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_8402DB0:: @ 8402DB0 - obj_image_anim_frame 6, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8402DB8:: @ 8402DB8 - .4byte gSpriteAnim_8402DA8 - .4byte gSpriteAnim_8402DB0 - - .align 2 -gSpriteTemplate_8402DC0:: @ 8402DC0 - spr_template 5525, 5526, gOamData_8402D60, gSpriteAnimTable_8402DB8, NULL, gDummySpriteAffineAnimTable, sub_8133300 - - .align 2 -gSpriteAnim_8402DD8:: @ 8402DD8 - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_8402DE0:: @ 8402DE0 - obj_image_anim_frame 9, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_8402DE8:: @ 8402DE8 - obj_image_anim_frame 10, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_8402DF0:: @ 8402DF0 - obj_image_anim_frame 11, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8402DF8:: @ 8402DF8 - .4byte gSpriteAnim_8402DD8 - .4byte gSpriteAnim_8402DE0 - .4byte gSpriteAnim_8402DE8 - .4byte gSpriteAnim_8402DF0 - - .align 2 -gSpriteTemplate_8402E08:: @ 8402E08 - spr_template 5525, 5526, gOamData_8402D50, gSpriteAnimTable_8402DF8, NULL, gDummySpriteAffineAnimTable, sub_8133300 - - .align 2 - .incbin "baserom.gba", 0x00402e20, 0x4 - -gUnknown_08402E24:: @ 8402E24 - .incbin "baserom.gba", 0x00402e24, 0x15 - -gUnknown_08402E39:: @ 8402E39 - .byte 0, 1, 2, 3 - -gUnknown_08402E3D:: @ 8402E3D - .byte 4, 5, 6 - -@ pointer to decorations, capacity - .align 2 -gDecorationInventories:: @ 8402E40 - .4byte gSaveBlock1 + 0x26A0, 10 @ DESK - .4byte gSaveBlock1 + 0x26AA, 10 @ CHAIR - .4byte gSaveBlock1 + 0x26B4, 10 @ PLANT - .4byte gSaveBlock1 + 0x26BE, 30 @ ORNAMENT - .4byte gSaveBlock1 + 0x26DC, 30 @ MAT - .4byte gSaveBlock1 + 0x26FA, 10 @ POSTER - .4byte gSaveBlock1 + 0x2704, 40 @ DOLL - .4byte gSaveBlock1 + 0x272C, 10 @ CUSHION diff --git a/data/decoration_inventory.s b/data/decoration_inventory.s new file mode 100644 index 000000000..a70dedbe5 --- /dev/null +++ b/data/decoration_inventory.s @@ -0,0 +1,16 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +@ pointer to decorations, capacity + .align 2 +gDecorationInventories:: @ 8402E40 + .4byte gSaveBlock1 + 0x26A0, 10 @ DESK + .4byte gSaveBlock1 + 0x26AA, 10 @ CHAIR + .4byte gSaveBlock1 + 0x26B4, 10 @ PLANT + .4byte gSaveBlock1 + 0x26BE, 30 @ ORNAMENT + .4byte gSaveBlock1 + 0x26DC, 30 @ MAT + .4byte gSaveBlock1 + 0x26FA, 10 @ POSTER + .4byte gSaveBlock1 + 0x2704, 40 @ DOLL + .4byte gSaveBlock1 + 0x272C, 10 @ CUSHION diff --git a/data/learn_move.s b/data/learn_move.s new file mode 100644 index 000000000..adb8dc1c2 --- /dev/null +++ b/data/learn_move.s @@ -0,0 +1,144 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gDexArrows_Pal:: + .incbin "graphics/pokedex/arrows.gbapal" + + .align 2 +gDexArrows_Gfx:: + .incbin "graphics/pokedex/arrows.4bpp" + + .incbin "baserom.gba", 0x00402c78, 0x80 + +gUnknown_08402CF8:: @ 8402CF8 + .incbin "baserom.gba", 0x00402cf8, 0x10 + +gUnknown_08402D08:: @ 8402D08 + .4byte OtherText_Battle + .byte 1, 1, 0, 0 + .4byte OtherText_Power + .byte 1, 4, 1, 0 + .4byte OtherText_Accuracy + .byte 1, 9, 2, 0 + .space 8 + + .4byte OtherText_Contest + .byte 1, 1, 0, 0 + .4byte OtherText_Appeal + .byte 1, 4, 1, 0 + .4byte OtherText_Jam + .byte 1, 9, 2, 0 + .space 8 + + .4byte 0xFF00FFEF + .4byte gTileBuffer + + .align 2 +gOamData_8402D50:: @ 8402D50 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + + .align 2 +gOamData_8402D58:: @ 8402D58 + .2byte 0x8000 + .2byte 0x0000 + .2byte 0x0000 + + .align 2 +gOamData_8402D60:: @ 8402D60 + .2byte 0x4000 + .2byte 0x0000 + .2byte 0x0000 + + .align 2 +gSpriteAnim_8402D68:: @ 8402D68 + obj_image_anim_frame 2, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_8402D70:: @ 8402D70 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_8402D78:: @ 8402D78 + .4byte gSpriteAnim_8402D68 + .4byte gSpriteAnim_8402D70 + + .align 2 +gUnknown_08402D80:: @ 8402D80 + obj_tiles gDexArrows_Gfx, 384, 0x1595 + + .align 2 +gUnknown_08402D88:: @ 8402D88 + obj_pal gDexArrows_Pal, 0x1596 + + .align 2 +gSpriteTemplate_8402D90:: @ 8402D90 + spr_template 5525, 5526, gOamData_8402D58, gSpriteAnimTable_8402D78, NULL, gDummySpriteAffineAnimTable, sub_8133300 + + .align 2 +gSpriteAnim_8402DA8:: @ 8402DA8 + obj_image_anim_frame 4, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_8402DB0:: @ 8402DB0 + obj_image_anim_frame 6, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_8402DB8:: @ 8402DB8 + .4byte gSpriteAnim_8402DA8 + .4byte gSpriteAnim_8402DB0 + + .align 2 +gSpriteTemplate_8402DC0:: @ 8402DC0 + spr_template 5525, 5526, gOamData_8402D60, gSpriteAnimTable_8402DB8, NULL, gDummySpriteAffineAnimTable, sub_8133300 + + .align 2 +gSpriteAnim_8402DD8:: @ 8402DD8 + obj_image_anim_frame 8, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_8402DE0:: @ 8402DE0 + obj_image_anim_frame 9, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_8402DE8:: @ 8402DE8 + obj_image_anim_frame 10, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_8402DF0:: @ 8402DF0 + obj_image_anim_frame 11, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_8402DF8:: @ 8402DF8 + .4byte gSpriteAnim_8402DD8 + .4byte gSpriteAnim_8402DE0 + .4byte gSpriteAnim_8402DE8 + .4byte gSpriteAnim_8402DF0 + + .align 2 +gSpriteTemplate_8402E08:: @ 8402E08 + spr_template 5525, 5526, gOamData_8402D50, gSpriteAnimTable_8402DF8, NULL, gDummySpriteAffineAnimTable, sub_8133300 + + .align 2 + .incbin "baserom.gba", 0x00402e20, 0x4 + +gUnknown_08402E24:: @ 8402E24 + .incbin "baserom.gba", 0x00402e24, 0x15 + +gUnknown_08402E39:: @ 8402E39 + .byte 0, 1, 2, 3 + +gUnknown_08402E3D:: @ 8402E3D + .byte 4, 5, 6 diff --git a/ld_script.txt b/ld_script.txt index 380473480..b65b3b5f4 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -442,7 +442,10 @@ SECTIONS { src/save.o(.rodata); data/field_effect_helpers.o(.rodata); data/contest_ai.o(.rodata); - data/rom_81258BC.o(.rodata); + data/battle_anim_81258BC.o(.rodata); + data/battle_anim_812C144.o(.rodata); + data/learn_move.o(.rodata); + data/decoration_inventory.o(.rodata); data/roamer.o(.rodata); data/battle_tower.o(.rodata); data/use_pokeblock.o(.rodata); |