From fbd6100c36847bb9eff1605484d25b6d31f5b5c0 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 22:28:46 +0200 Subject: replace more battle anim baseroms, fix up labels --- asm/battle_anim_80A22E8.s | 44 +++++----- asm/party_menu.s | 4 +- data/graphics.s | 147 ++++++++++++++++++++++++++++----- graphics/interface/party_menu_misc.png | Bin 0 -> 613 bytes graphics/unknown/unknown_E81D14.bin | Bin 0 -> 4096 bytes graphics/unknown/unknown_E81FE4.bin | 1 + graphics/unknown/unknown_E822B8.bin | 1 + 7 files changed, 153 insertions(+), 44 deletions(-) create mode 100644 graphics/interface/party_menu_misc.png create mode 100644 graphics/unknown/unknown_E81D14.bin create mode 100644 graphics/unknown/unknown_E81FE4.bin create mode 100644 graphics/unknown/unknown_E822B8.bin diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index e61ff48ad..31cf3ba30 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -16214,7 +16214,7 @@ _080A9F52: lsls r0, 24 cmp r0, 0 beq _080A9F98 - ldr r0, _080A9F94 @ =gUnknown_8E7F874 + ldr r0, _080A9F94 @ =gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap ldr r1, [sp, 0x4] bl LZDecompressVram b _080A9FC6 @@ -16222,7 +16222,7 @@ _080A9F52: _080A9F88: .4byte 0x00003f42 _080A9F8C: .4byte gUnknown_2022978 _080A9F90: .4byte gUnknown_202297A -_080A9F94: .4byte gUnknown_8E7F874 +_080A9F94: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap _080A9F98: ldr r0, _080A9FB4 @ =gUnknown_2037F1B ldrb r0, [r0] @@ -16233,16 +16233,16 @@ _080A9F98: bne _080A9FBC mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080A9FB8 @ =gUnknown_8E7F4AC + ldr r1, _080A9FB8 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap bl sub_807543C b _080A9FC6 .align 2, 0 _080A9FB4: .4byte gUnknown_2037F1B -_080A9FB8: .4byte gUnknown_8E7F4AC +_080A9FB8: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap _080A9FBC: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AA010 @ =gUnknown_8E7F690 + ldr r1, _080AA010 @ =gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap bl sub_807543C _080A9FC6: mov r0, sp @@ -16280,7 +16280,7 @@ _080A9FFA: pop {r0} bx r0 .align 2, 0 -_080AA010: .4byte gUnknown_8E7F690 +_080AA010: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap _080AA014: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_sheet _080AA018: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_palette _080AA01C: .4byte gTasks @@ -18865,23 +18865,23 @@ sub_80AB38C: @ 80AB38C bne _080AB408 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB404 @ =gUnknown_8E81D14 + ldr r1, _080AB404 @ =gFile_graphics_unknown_unknown_E81D14_tilemap bl sub_807543C b _080AB42E .align 2, 0 _080AB3FC: .4byte 0x00003f42 _080AB400: .4byte gUnknown_2037F1A -_080AB404: .4byte gUnknown_8E81D14 +_080AB404: .4byte gFile_graphics_unknown_unknown_E81D14_tilemap _080AB408: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB414 @ =gUnknown_8E81FE4 + ldr r1, _080AB414 @ =gFile_graphics_unknown_unknown_E81FE4_tilemap bl sub_807543C b _080AB42E .align 2, 0 -_080AB414: .4byte gUnknown_8E81FE4 +_080AB414: .4byte gFile_graphics_unknown_unknown_E81FE4_tilemap _080AB418: - ldr r0, _080AB458 @ =gUnknown_8E822B8 + ldr r0, _080AB458 @ =gFile_graphics_unknown_unknown_E822B8_tilemap ldr r1, [sp, 0x4] bl LZDecompressVram mov r0, sp @@ -18893,7 +18893,7 @@ _080AB418: _080AB42E: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB45C @ =gUnknown_8E809CC + ldr r1, _080AB45C @ =gFile_graphics_battle_anims_backgrounds_water_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 @@ -18902,7 +18902,7 @@ _080AB42E: ldrsh r0, [r0, r1] cmp r0, 0 bne _080AB468 - ldr r0, _080AB464 @ =gUnknown_8E81CEC + ldr r0, _080AB464 @ =gFile_graphics_battle_anims_backgrounds_water_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -18910,10 +18910,10 @@ _080AB42E: bl LoadCompressedPalette b _080AB476 .align 2, 0 -_080AB458: .4byte gUnknown_8E822B8 -_080AB45C: .4byte gUnknown_8E809CC +_080AB458: .4byte gFile_graphics_unknown_unknown_E822B8_tilemap +_080AB45C: .4byte gFile_graphics_battle_anims_backgrounds_water_sheet _080AB460: .4byte gUnknown_2037F02 -_080AB464: .4byte gUnknown_8E81CEC +_080AB464: .4byte gFile_graphics_battle_anims_backgrounds_water_palette _080AB468: ldr r0, _080AB4E0 @ =gFile_graphics_battle_anims_backgrounds_water_muddy_palette mov r1, sp @@ -28163,7 +28163,7 @@ _080AFB26: bl LoadBgTiles mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AFBB0 @ =gUnknown_8E7F1F4 + ldr r1, _080AFBB0 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap bl sub_807543C ldr r0, _080AFBB4 @ =gUnknown_83C2CE0 mov r1, sp @@ -28198,7 +28198,7 @@ _080AFBA0: .4byte 0x00003f42 _080AFBA4: .4byte gUnknown_2022978 _080AFBA8: .4byte gUnknown_202297A _080AFBAC: .4byte gUnknown_83C3540 -_080AFBB0: .4byte gUnknown_8E7F1F4 +_080AFBB0: .4byte gFile_graphics_battle_anims_backgrounds_fog_tilemap _080AFBB4: .4byte gUnknown_83C2CE0 _080AFBB8: .4byte gTasks _080AFBBC: .4byte sub_80AFBC0 @@ -28474,7 +28474,7 @@ _080AFDC2: bl LoadBgTiles mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AFE50 @ =gUnknown_8E7F1F4 + ldr r1, _080AFE50 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap bl sub_807543C ldr r0, _080AFE54 @ =gUnknown_83C2CE0 mov r1, sp @@ -28511,7 +28511,7 @@ _080AFE40: .4byte 0x00003f42 _080AFE44: .4byte gUnknown_2022978 _080AFE48: .4byte gUnknown_202297A _080AFE4C: .4byte gUnknown_83C3540 -_080AFE50: .4byte gUnknown_8E7F1F4 +_080AFE50: .4byte gFile_graphics_battle_anims_backgrounds_fog_tilemap _080AFE54: .4byte gUnknown_83C2CE0 _080AFE58: .4byte gTasks _080AFE5C: .4byte 0x0000ffff @@ -42830,7 +42830,7 @@ _080B6D8C: lsls r4, 1 adds r0, r4 str r1, [r0] - ldr r0, _080B6E00 @ =gUnknown_8E7F4AC + ldr r0, _080B6E00 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap bl LZDecompressWram add r0, sp, 0xC ldrb r0, [r0, 0x8] @@ -42867,7 +42867,7 @@ _080B6D8C: b _080B6F1E .align 2, 0 _080B6DFC: .4byte gMonSpritesGfxPtr -_080B6E00: .4byte gUnknown_8E7F4AC +_080B6E00: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap _080B6E04: ldrh r0, [r6, 0xA] adds r0, 0x1 diff --git a/asm/party_menu.s b/asm/party_menu.s index 3a7542241..224fedb1d 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -647,7 +647,7 @@ _0811EF6C: .4byte _0811F010 _0811EF8C: ldr r4, _0811EFAC @ =gUnknown_203B0B8 - ldr r0, _0811EFB0 @ =gUnknown_8E82700 + ldr r0, _0811EFB0 @ =gFile_graphics_interface_party_menu_misc_sheet mov r1, sp bl malloc_and_decompress adds r1, r0, 0 @@ -661,7 +661,7 @@ _0811EF8C: b _0811F016 .align 2, 0 _0811EFAC: .4byte gUnknown_203B0B8 -_0811EFB0: .4byte gUnknown_8E82700 +_0811EFB0: .4byte gFile_graphics_interface_party_menu_misc_sheet _0811EFB4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 diff --git a/data/graphics.s b/data/graphics.s index 0c79f58e2..98e0939b4 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13741,37 +13741,144 @@ gFile_graphics_battle_anims_sprites_277_palette:: @ 8E7EDD8 gFile_graphics_battle_anims_sprites_277_sheet:: @ 8E7EE00 .incbin "graphics/battle_anims/sprites/277.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_fog_tilemap:: @ 8E7F1F4 + .incbin "graphics/battle_anims/backgrounds/fog.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_283_palette:: @ 8E7F36C + .incbin "graphics/battle_anims/sprites/283.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_283_sheet:: @ 8E7F388 + .incbin "graphics/battle_anims/sprites/283.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap:: @ 8E7F4AC + .incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap:: @ 8E7F690 + .incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap:: @ 8E7F874 + .incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_263_sheet:: @ 8E7FA58 + .incbin "graphics/battle_anims/sprites/263.4bpp.lz" + .align 2 -gUnknown_8E7F1F4:: @ 8E7F1F4 - .incbin "baserom.gba", 0xE7F1F4, 0x2B8 +gFile_graphics_battle_anims_sprites_263_palette:: @ 8E7FA98 + .incbin "graphics/battle_anims/sprites/263.gbapal.lz" -gUnknown_8E7F4AC:: @ 8E7F4AC - .incbin "baserom.gba", 0xE7F4AC, 0x1E4 + .align 2 +gFile_graphics_battle_anims_sprites_266_sheet:: @ 8E7FAB0 + .incbin "graphics/battle_anims/sprites/266.4bpp.lz" -gUnknown_8E7F690:: @ 8E7F690 - .incbin "baserom.gba", 0xE7F690, 0x1E4 + .align 2 +gFile_graphics_battle_anims_sprites_266_palette:: @ 8E7FAF0 + .incbin "graphics/battle_anims/sprites/266.gbapal.lz" -gUnknown_8E7F874:: @ 8E7F874 - .incbin "baserom.gba", 0xE7F874, 0x1158 + .align 2 +gFile_graphics_battle_anims_sprites_267_palette:: @ 8E7FB08 + .incbin "graphics/battle_anims/sprites/267.gbapal.lz" -gUnknown_8E809CC:: @ 8E809CC - .incbin "baserom.gba", 0xE809CC, 0x1320 + .align 2 +gFile_graphics_battle_anims_sprites_268_palette:: @ 8E7FB20 + .incbin "graphics/battle_anims/sprites/268.gbapal.lz" -gUnknown_8E81CEC:: @ 8E81CEC - .incbin "baserom.gba", 0xE81CEC, 0x28 + .align 2 +gFile_graphics_battle_anims_sprites_278_sheet:: @ 8E7FB38 + .incbin "graphics/battle_anims/sprites/278.4bpp.lz" -gUnknown_8E81D14:: @ 8E81D14 - .incbin "baserom.gba", 0xE81D14, 0x2D0 + .align 2 +gFile_graphics_battle_anims_sprites_278_palette:: @ 8E7FD44 + .incbin "graphics/battle_anims/sprites/278.gbapal.lz" -gUnknown_8E81FE4:: @ 8E81FE4 - .incbin "baserom.gba", 0xE81FE4, 0x2D4 + .align 2 +gFile_graphics_battle_anims_sprites_279_sheet:: @ 8E7FD60 + .incbin "graphics/battle_anims/sprites/279.4bpp.lz" -gUnknown_8E822B8:: @ 8E822B8 - .incbin "baserom.gba", 0xE822B8, 0x448 + .align 2 +gFile_graphics_battle_anims_sprites_279_palette:: @ 8E7FDAC + .incbin "graphics/battle_anims/sprites/279.gbapal.lz" -gUnknown_8E82700:: @ 8E82700 - .incbin "baserom.gba", 0xE82700, 0x2C8 + .align 2 +gFile_graphics_battle_anims_sprites_281_sheet:: @ 8E7FDC8 + .incbin "graphics/battle_anims/sprites/281.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_281_palette:: @ 8E7FF50 + .incbin "graphics/battle_anims/sprites/281.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_21_sheet:: @ 8E7FF70 + .incbin "graphics/battle_anims/backgrounds/21.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_21_palette:: @ 8E80264 + .incbin "graphics/battle_anims/backgrounds/21.gbapal.lz" + .align 2 +gFile_graphics_battle_anims_backgrounds_21_tilemap:: @ 8E80280 + .incbin "graphics/battle_anims/backgrounds/21.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_284_sheet:: @ 8E8056C + .incbin "graphics/battle_anims/sprites/284.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_284_palette:: @ 8E808E8 + .incbin "graphics/battle_anims/sprites/284.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_285_sheet:: @ 8E80904 + .incbin "graphics/battle_anims/sprites/285.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_285_palette:: @ 8E809A4 + .incbin "graphics/battle_anims/sprites/285.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_water_sheet:: @ 8E809CC + .incbin "graphics/battle_anims/backgrounds/water.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_water_palette:: @ 8E81CEC + .incbin "graphics/battle_anims/backgrounds/water.gbapal.lz" + + .align 2 +gFile_graphics_unknown_unknown_E81D14_tilemap:: @ 8E81D14 + .incbin "graphics/unknown/unknown_E81D14.bin.lz" + + .align 2 +gFile_graphics_unknown_unknown_E81FE4_tilemap:: @ 8E81FE4 + .incbin "graphics/unknown/unknown_E81FE4.bin.lz" + + .align 2 +gFile_graphics_unknown_unknown_E822B8_tilemap:: @ 8E822B8 + .incbin "graphics/unknown/unknown_E822B8.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_286_palette:: @ 8E825AC + .incbin "graphics/battle_anims/sprites/286.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_188_sheet:: @ 8E825D4 + .incbin "graphics/battle_anims/sprites/188.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_188_palette:: @ 8E826E8 + .incbin "graphics/battle_anims/sprites/188.gbapal.lz" + + .align 2 +gFile_graphics_interface_party_menu_misc_sheet:: @ 8E82700 + .incbin "graphics/interface/party_menu_misc.4bpp.lz" + + .align 2 gUnknown_8E829C8:: @ 8E829C8 .incbin "baserom.gba", 0xE829C8, 0xE8 diff --git a/graphics/interface/party_menu_misc.png b/graphics/interface/party_menu_misc.png new file mode 100644 index 000000000..c58f3aae9 Binary files /dev/null and b/graphics/interface/party_menu_misc.png differ diff --git a/graphics/unknown/unknown_E81D14.bin b/graphics/unknown/unknown_E81D14.bin new file mode 100644 index 000000000..d48de1d6f Binary files /dev/null and b/graphics/unknown/unknown_E81D14.bin differ diff --git a/graphics/unknown/unknown_E81FE4.bin b/graphics/unknown/unknown_E81FE4.bin new file mode 100644 index 000000000..6a6f7c049 --- /dev/null +++ b/graphics/unknown/unknown_E81FE4.bin @@ -0,0 +1 @@ +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000€ÀĀŀƀǀȀɀʀˀ̀̀000000000000000000ЀрҀӀԀՀր׀؀ـڀۀ܀݀ހ߀0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/graphics/unknown/unknown_E822B8.bin b/graphics/unknown/unknown_E822B8.bin new file mode 100644 index 000000000..6312b8645 --- /dev/null +++ b/graphics/unknown/unknown_E822B8.bin @@ -0,0 +1 @@ +τ΄̈́̄˄ʄɄȄDŽƄńĄÄ„߄ބ݄܄ۄڄل؄ׄքՄԄӄ҄фЄ \ No newline at end of file -- cgit v1.2.3