diff options
| -rw-r--r-- | asm/rom5.s | 6 | ||||
| -rw-r--r-- | asm/rom_8040EB4.s | 2 | ||||
| -rw-r--r-- | data/data2.s | 143 | ||||
| -rw-r--r-- | data/graphics.s | 10 | ||||
| -rw-r--r-- | graphics/battle_anims/sprites/smokescreen_impact.pal | 19 | ||||
| -rw-r--r-- | graphics/battle_anims/sprites/smokescreen_impact.png | bin | 0 -> 254 bytes | |||
| -rwxr-xr-x | graphics/unused/unknown_D02410.png | bin | 209 -> 0 bytes | |||
| -rwxr-xr-x | graphics/unused/unknown_D024F0.bin | bin | 24 -> 0 bytes |
8 files changed, 126 insertions, 54 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 8b98b6930..157168d6d 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -422936,7 +422936,7 @@ sub_8149248: @ 8149248 bx r0 .align 2, 0 _0814925C: .4byte gUnknown_08416B94 -_08149260: .4byte gUnknown_08416B84 +_08149260: .4byte gSpriteAnimTable_8416B84 thumb_func_end sub_8149248 thumb_func_start sub_8149264 @@ -422951,7 +422951,7 @@ sub_8149264: @ 8149264 bx r0 .align 2, 0 _08149278: .4byte gUnknown_08416C10 -_0814927C: .4byte gUnknown_08416C04 +_0814927C: .4byte gSpriteAnimTable_8416C04 thumb_func_end sub_8149264 thumb_func_start sub_8149280 @@ -422966,7 +422966,7 @@ sub_8149280: @ 8149280 bx r0 .align 2, 0 _08149294: .4byte gUnknown_08416C8C -_08149298: .4byte gUnknown_08416C88 +_08149298: .4byte gSpriteAnimTable_8416C88 thumb_func_end sub_8149280 thumb_func_start nullsub_82 diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index fa118ef7d..91b78c7ee 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -18698,7 +18698,7 @@ _0804A22C: .4byte 0x03004824 _0804A230: .4byte 0x02020004 _0804A234: .4byte gUnknown_0820C29C _0804A238: .4byte gUnknown_0820C334 -_0804A23C: .4byte gUnknown_0820C335 +_0804A23C: .4byte gUnknown_0820C334 + 0x1 _0804A240: .4byte gUnknown_0842C7CA _0804A244: ldr r0, _0804A2A4 diff --git a/data/data2.s b/data/data2.s index 08cb59c0d..8429201e4 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1465,23 +1465,34 @@ gUnknown_081FAD98:: @ 81FAD98 .4byte nullsub_43 gUnknown_081FAE7C:: @ 81FAE7C - .incbin "baserom.gba", 0x001fae7c, 0x4 + .byte 0, 2, 3, 1 gUnknown_081FAE80:: @ 81FAE80 .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT_BLUE WHITE2}$" gUnknown_081FAE89:: @ 81FAE89 - .incbin "baserom.gba", 0x001fae89, 0x8 + .byte 8, 120 + .byte 88, 120 + .byte 8, 136 + .byte 88, 136 gUnknown_081FAE91:: @ 81FAE91 - .incbin "baserom.gba", 0x001fae91, 0x10 + .byte 144, 120 + .byte 190, 120 + .byte 144, 136 + .byte 190, 136 + .byte 72, 72 + .byte 32, 90 + .byte 80, 80 + .byte 80, 88 .align 2 gUnknown_081FAEA4:: @ 81FAEA4 - obj_tiles 0x08d02410, 384, 0xd6eb + obj_tiles gSmokescreenImpactTiles, 0x180, 55019 + .align 2 gUnknown_081FAEAC:: @ 81FAEAC - .incbin "baserom.gba", 0x001faeac, 0x8 + obj_pal gSmokescreenImpactPalette, 55019 .align 2 gOamData_81FAEB4:: @ 81FAEB4 @@ -2294,13 +2305,14 @@ gUnknown_0820C320:: @ 820C320 .4byte sub_804AA00 gUnknown_0820C330:: @ 820C330 - .incbin "baserom.gba", 0x0020c330, 0x4 + .byte 0, 14 + .byte 15, 29 gUnknown_0820C334:: @ 820C334 - .incbin "baserom.gba", 0x0020c334, 0x1 - -gUnknown_0820C335:: @ 820C335 - .incbin "baserom.gba", 0x0020c335, 0x7 + .byte 3, 5 + .byte 3, 7 + .byte 18, 5 + .byte 18, 7 gUnknown_0820C33C:: .string "$" @@ -10965,11 +10977,11 @@ gUnknown_083B5558:: @ 83B5558 .align 2 gUnknown_083B5584:: @ 83B5584 -Unknown_83B5584: .4byte 0x02008000 .4byte 0x0200c000 .4byte 0x02010000 .4byte 0x02014000 + Unknown_83B5594: .incbin "baserom.gba", 0x003b5594, 0x80 Unknown_83B5614: @@ -28052,7 +28064,7 @@ gSpriteAffineAnimTable_84121D8:: @ 84121D8 .align 2 gUnknown_084121DC:: @ 84121DC - obj_tiles 0x08e781c8, 32, 0x39e2 + obj_tiles 0x08e781c8, 0x20, 14818 .align 2 gSpriteTemplate_84121E4:: @ 84121E4 @@ -28106,16 +28118,22 @@ gUnknown_08413340:: @ 8413340 gUnknown_084139C8:: @ 84139C8 .incbin "baserom.gba", 0x004139c8, 0x304 + .align 2 gUnknown_08413CCC:: @ 8413CCC .incbin "graphics/intro/intro2_bgtrees.gbapal" + + .align 2 +gIntro2TreeTiles:: @ 8413CEC .incbin "graphics/intro/intro2_bgtreessmall.4bpp.lz" gUnknown_08413E38:: @ 8413E38 .incbin "baserom.gba", 0x00413e38, 0x40 @ two palettes? + .align 2 gUnknown_08413E78:: @ 8413E78 .incbin "graphics/intro/intro2_bgnight.4bpp.lz" @ only used in credits, coupled with intro because bicycle sequence + .align 2 gUnknown_08414064:: @ 8414064 .incbin "graphics/intro/intro2_bgnight.gbapal" @@ -28170,55 +28188,83 @@ gIntro2LatiasTiles:: @ 8416718 gSpriteTemplate_8416B3C:: @ 8416B3C spr_template 2000, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_814910C + .align 2 gUnknown_08416B54:: @ 8416B54 -Unknown_8416B54: - .incbin "baserom.gba", 0x00416b54, 0x10 -Unknown_8416B64: - .incbin "baserom.gba", 0x00416b64, 0x8 -Unknown_8416B6C: - .incbin "baserom.gba", 0x00416b6c, 0x8 -Unknown_8416B74: - .incbin "baserom.gba", 0x00416b74, 0x8 -Unknown_8416B7C: - .incbin "baserom.gba", 0x00416b7c, 0x8 - - .align 2 -gUnknown_08416B84:: @ 8416B84 - .4byte Unknown_8416B64 - .4byte Unknown_8416B6C - .4byte Unknown_8416B74 - .4byte Unknown_8416B7C + obj_tiles gUnknown_084131C4, 0x400, 2000 + null_obj_tiles + + .align 2 +gSpriteAnim_8416B64:: @ 8416B64 + obj_image_anim_frame 0, 30 + obj_image_anim_end + + .align 2 +gSpriteAnim_8416B6C:: @ 8416B6C + obj_image_anim_frame 16, 30 + obj_image_anim_end + + .align 2 +gSpriteAnim_8416B74:: @ 8416B74 + obj_image_anim_frame 20, 30 + obj_image_anim_end + + .align 2 +gSpriteAnim_8416B7C:: @ 8416B7C + obj_image_anim_frame 22, 30 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_8416B84:: @ 8416B84 + .4byte gSpriteAnim_8416B64 + .4byte gSpriteAnim_8416B6C + .4byte gSpriteAnim_8416B74 + .4byte gSpriteAnim_8416B7C gUnknown_08416B94:: @ 8416B94 .incbin "baserom.gba", 0x00416b94, 0x48 + .align 2 gUnknown_08416BDC:: @ 8416BDC -Unknown_8416BDC: - .incbin "baserom.gba", 0x00416bdc, 0x10 -Unknown_8416BEC: - .incbin "baserom.gba", 0x00416bec, 0x8 -Unknown_8416BF4: - .incbin "baserom.gba", 0x00416bf4, 0x8 -Unknown_8416BFC: - .incbin "baserom.gba", 0x00416bfc, 0x8 + obj_tiles gIntro2TreeTiles, 0x400, 2000 + null_obj_tiles + + .align 2 +gSpriteAnim_8416BEC:: @ 8416BEC + obj_image_anim_frame 0, 30 + obj_image_anim_end + + .align 2 +gSpriteAnim_8416BF4:: @ 8416BF4 + obj_image_anim_frame 16, 30 + obj_image_anim_end .align 2 -gUnknown_08416C04:: @ 8416C04 - .4byte Unknown_8416BEC - .4byte Unknown_8416BF4 - .4byte Unknown_8416BFC +gSpriteAnim_8416BFC:: @ 8416BFC + obj_image_anim_frame 24, 30 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_8416C04:: @ 8416C04 + .4byte gSpriteAnim_8416BEC + .4byte gSpriteAnim_8416BF4 + .4byte gSpriteAnim_8416BFC gUnknown_08416C10:: @ 8416C10 .incbin "baserom.gba", 0x00416c10, 0x60 + .align 2 gUnknown_08416C70:: @ 8416C70 -Unknown_8416C70: - .incbin "baserom.gba", 0x00416c70, 0x10 -Unknown_8416C80: - .incbin "baserom.gba", 0x00416c80, 0x8 + obj_tiles gIntro2NightBGTiles, 0x400, 2000 + null_obj_tiles + + .align 2 +gSpriteAnim_8416C80:: @ 8416C80 + obj_image_anim_frame 0, 30 + obj_image_anim_end -gUnknown_08416C88:: @ 8416C88 - .4byte Unknown_8416C80 + .align 2 +gSpriteAnimTable_8416C88:: @ 8416C88 + .4byte gSpriteAnim_8416C80 gUnknown_08416C8C:: @ 8416C8C .incbin "baserom.gba", 0x00416c8c, 0x30 @@ -28371,8 +28417,8 @@ gSpriteTemplate_8416EB8:: @ 8416EB8 spr_template 1001, 1001, gOamData_8416EA4, gSpriteAnimTable_8416EB4, NULL, gDummySpriteAffineAnimTable, nullsub_84 gUnknown_08416ED0:: @ 8416ED0 -Unknown_8416ED0: .incbin "baserom.gba", 0x00416ed0, 0x38 + Unknown_8416F08: .incbin "baserom.gba", 0x00416f08, 0x4 Unknown_8416F0C: @@ -28522,6 +28568,7 @@ gUnknown_0842C29C:: @ 842C29C .4byte UnknownString_6thRound, sub_814A4B8 .4byte UnknownString_7thRound, sub_814A4B8 .4byte UnknownString_8thRound, sub_814A4B8 + OtherText_TopSpeed: .string "TOP SPEED$" diff --git a/data/graphics.s b/data/graphics.s index a007f21c5..b0387740c 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -18,8 +18,14 @@ gUnknown_08D00524:: @ 8D00524 .incbin "graphics/unused/old.4bpp.lz" @ japanese table and bunch of stuff .incbin "graphics/unused/unknown_D021BC.bin" .incbin "graphics/unused/unknown_D023E8.bin" - .incbin "graphics/unused/unknown_D02410.4bpp.lz" - .incbin "graphics/unused/unknown_D024F0.bin" + + .align 2 +gSmokescreenImpactTiles:: @ 8D02410 + .incbin "graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz" + + .align 2 +gSmokescreenImpactPalette:: @ 8D024F0 + .incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz" gInterfaceGfx_PokeBall:: .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC diff --git a/graphics/battle_anims/sprites/smokescreen_impact.pal b/graphics/battle_anims/sprites/smokescreen_impact.pal new file mode 100644 index 000000000..64367bdc9 --- /dev/null +++ b/graphics/battle_anims/sprites/smokescreen_impact.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 148 49 +57 98 197 +0 0 0 +0 0 0 +0 0 0 +164 156 106 +197 197 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/smokescreen_impact.png b/graphics/battle_anims/sprites/smokescreen_impact.png Binary files differnew file mode 100644 index 000000000..01a94429a --- /dev/null +++ b/graphics/battle_anims/sprites/smokescreen_impact.png diff --git a/graphics/unused/unknown_D02410.png b/graphics/unused/unknown_D02410.png Binary files differdeleted file mode 100755 index c02c644a1..000000000 --- a/graphics/unused/unknown_D02410.png +++ /dev/null diff --git a/graphics/unused/unknown_D024F0.bin b/graphics/unused/unknown_D024F0.bin Binary files differdeleted file mode 100755 index d23673450..000000000 --- a/graphics/unused/unknown_D024F0.bin +++ /dev/null |
