From aa89a0482dd8734410f89e77a5d694ae474b7ec7 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 2 Oct 2019 04:08:59 +0800 Subject: battle_anim_utility_funcs; split battle_intro.s --- data/data_835B488.s | 10 ++-------- data/graphics.s | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 19 deletions(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index 742224d2b..470eee3c1 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -941,14 +941,8 @@ gUnknown_83E7C38:: @ 83E7C38 gUnknown_83E7C98:: @ 83E7C98 .incbin "baserom.gba", 0x3E7C98, 0x30 -gUnknown_83E7CC8:: @ 83E7CC8 - .incbin "baserom.gba", 0x3E7CC8, 0x2 - -gUnknown_83E7CCA:: @ 83E7CCA - .incbin "baserom.gba", 0x3E7CCA, 0x4 - -gUnknown_83E7CCE:: @ 83E7CCE - .incbin "baserom.gba", 0x3E7CCE, 0x6 + .section .rodata.83E7CD4 + .balign 4 gUnknown_83E7CD4:: @ 83E7CD4 .incbin "baserom.gba", 0x3E7CD4, 0x28 diff --git a/data/graphics.s b/data/graphics.s index 9c5d1c3f9..d0bae69c0 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2412,47 +2412,47 @@ gFile_graphics_battle_anims_sprites_243_palette:: @ 8D2D8CC .incbin "graphics/battle_anims/sprites/243.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_stat_sheet:: @ 8D2D8F4 +gBattleStatMask_Gfx:: @ 8D2D8F4 .incbin "graphics/battle_anims/masks/stat.4bpp.lz" .align 2 -gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap:: @ 8D2DB04 +gBattleStatMask1_Tilemap:: @ 8D2DB04 .incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz" .align 2 -gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap:: @ 8D2DC20 +gBattleStatMask2_Tilemap:: @ 8D2DC20 .incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz" .align 2 -gFile_graphics_battle_anims_masks_stat1_palette:: @ 8D2DD3C +gBattleStatMask1_Pal:: @ 8D2DD3C .incbin "graphics/battle_anims/masks/stat1.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_stat2_palette:: @ 8D2DD5C +gBattleStatMask2_Pal:: @ 8D2DD5C .incbin "graphics/battle_anims/masks/stat2.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_stat3_palette:: @ 8D2DD7C +gBattleStatMask3_Pal:: @ 8D2DD7C .incbin "graphics/battle_anims/masks/stat3.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_stat4_palette:: @ 8D2DD9C +gBattleStatMask4_Pal:: @ 8D2DD9C .incbin "graphics/battle_anims/masks/stat4.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_stat5_palette:: @ 8D2DDBC +gBattleStatMask5_Pal:: @ 8D2DDBC .incbin "graphics/battle_anims/masks/stat5.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_stat6_palette:: @ 8D2DDDC +gBattleStatMask6_Pal:: @ 8D2DDDC .incbin "graphics/battle_anims/masks/stat6.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_stat7_palette:: @ 8D2DDFC +gBattleStatMask7_Pal:: @ 8D2DDFC .incbin "graphics/battle_anims/masks/stat7.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_stat8_palette:: @ 8D2DE1C +gBattleStatMask8_Pal:: @ 8D2DE1C .incbin "graphics/battle_anims/masks/stat8.gbapal.lz" .align 2 -- cgit v1.2.3 From eef286808aad14f206d8899e8fe19295fa8e7a9f Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 4 Oct 2019 00:14:23 +0800 Subject: battle_intro --- data/data_835B488.s | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index 470eee3c1..7bb53324e 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -941,11 +941,7 @@ gUnknown_83E7C38:: @ 83E7C38 gUnknown_83E7C98:: @ 83E7C98 .incbin "baserom.gba", 0x3E7C98, 0x30 - .section .rodata.83E7CD4 - .balign 4 - -gUnknown_83E7CD4:: @ 83E7CD4 - .incbin "baserom.gba", 0x3E7CD4, 0x28 + .section .rodata.83E7CFC gUnknown_83E7CFC:: @ 83E7CFC .incbin "baserom.gba", 0x3E7CFC, 0x14 -- cgit v1.2.3 From e9cdb63903143b98cb443007755222bdfbc2efec Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 5 Oct 2019 03:06:45 +0800 Subject: battle_anim_mons --- data/battle_anim.s | 18 ------------------ data/data.s | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) (limited to 'data') diff --git a/data/battle_anim.s b/data/battle_anim.s index 3fae69431..c166708a2 100644 --- a/data/battle_anim.s +++ b/data/battle_anim.s @@ -242,21 +242,3 @@ gUnknown_83ADE18:: @ 83ADE18 gUnknown_83ADF5C:: @ 83ADF5C .incbin "baserom.gba", 0x3ADF5C, 0xC0 - -gUnknown_83AE01C:: @ 83AE01C - .incbin "baserom.gba", 0x3AE01C, 0x20 - -gUnknown_83AE03C:: @ 83AE03C - .incbin "baserom.gba", 0x3AE03C, 0x10 - -gUnknown_83AE04C:: @ 83AE04C - .incbin "baserom.gba", 0x3AE04C, 0x4 - -gUnknown_83AE050:: @ 83AE050 - .incbin "baserom.gba", 0x3AE050, 0x4 - -gUnknown_83AE054:: @ 83AE054 - .incbin "baserom.gba", 0x3AE054, 0x30 - -gUnknown_83AE084:: @ 0x83AE084 - .incbin "baserom.gba", 0x3AE084, 0x10 diff --git a/data/data.s b/data/data.s index d0bd198e1..06b06f043 100644 --- a/data/data.s +++ b/data/data.s @@ -89,7 +89,7 @@ gUnknown_823499C:: @ 823499C gUnknown_82349BC:: @ 82349BC .incbin "baserom.gba", 0x2349BC, 0x10 -gUnknown_82349CC:: @ 82349CC +gMonFrontPicCoords:: @ 82349CC .incbin "baserom.gba", 0x2349CC, 0x6E0 gMonFrontPicTable:: @ 82350AC @@ -98,7 +98,7 @@ gMonFrontPicTable:: @ 82350AC gUnknown_8235194:: @ 8235194 .incbin "baserom.gba", 0x235194, 0xCD8 -gUnknown_8235E6C:: @ 8235E6C +gMonBackPicCoords:: @ 8235E6C .incbin "baserom.gba", 0x235E6C, 0x6E0 gMonBackPicTable:: @ 823654C -- cgit v1.2.3 From 9f7bd7157d102801c58192c3359d5149244a3ec3 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sun, 6 Oct 2019 02:09:03 +0800 Subject: ground --- data/data_835B488.s | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index 7bb53324e..7ac2159a0 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -930,7 +930,12 @@ gUnknown_83E7668:: @ 83E7668 .incbin "baserom.gba", 0x3E7668, 0x78 gUnknown_83E76E0:: @ 83E76E0 - .incbin "baserom.gba", 0x3E76E0, 0x528 + .incbin "baserom.gba", 0x3E76E0, 0x320 + + .section .rodata.83E7ADC + +gUnknown_83E7ADC:: @ 83E7ADC + .incbin "baserom.gba", 0x3E7ADC, 0x12C gUnknown_83E7C08:: @ 83E7C08 .incbin "baserom.gba", 0x3E7C08, 0x30 -- cgit v1.2.3 From 90e9bbffa6f8ea1b2456e184b02bd05fd2ba92c2 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 7 Oct 2019 02:09:21 +0800 Subject: normal --- data/data_835B488.s | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index 7ac2159a0..3635065c7 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -932,20 +932,6 @@ gUnknown_83E7668:: @ 83E7668 gUnknown_83E76E0:: @ 83E76E0 .incbin "baserom.gba", 0x3E76E0, 0x320 - .section .rodata.83E7ADC - -gUnknown_83E7ADC:: @ 83E7ADC - .incbin "baserom.gba", 0x3E7ADC, 0x12C - -gUnknown_83E7C08:: @ 83E7C08 - .incbin "baserom.gba", 0x3E7C08, 0x30 - -gUnknown_83E7C38:: @ 83E7C38 - .incbin "baserom.gba", 0x3E7C38, 0x60 - -gUnknown_83E7C98:: @ 83E7C98 - .incbin "baserom.gba", 0x3E7C98, 0x30 - .section .rodata.83E7CFC gUnknown_83E7CFC:: @ 83E7CFC -- cgit v1.2.3 From 8c40cd5e5cf336a011728e132e7ead070270bb83 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Thu, 10 Oct 2019 07:42:34 +0800 Subject: dark --- data/data_835B488.s | 2 +- data/graphics.s | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index 3635065c7..e55eaea08 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -930,7 +930,7 @@ gUnknown_83E7668:: @ 83E7668 .incbin "baserom.gba", 0x3E7668, 0x78 gUnknown_83E76E0:: @ 83E76E0 - .incbin "baserom.gba", 0x3E76E0, 0x320 + .incbin "baserom.gba", 0x3E76E0, 0x198 .section .rodata.83E7CFC diff --git a/data/graphics.s b/data/graphics.s index d0bae69c0..79b622cfa 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1624,15 +1624,15 @@ gFile_graphics_battle_anims_backgrounds_00_tilemap:: @ 8D1CFD4 .incbin "graphics/battle_anims/backgrounds/00.bin.lz" .align 2 -gFile_graphics_battle_anims_masks_metal_shine_sheet:: @ 8D1D224 +gMetalShineGfx:: @ 8D1D224 .incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz" .align 2 -gFile_graphics_battle_anims_masks_metal_shine_palette:: @ 8D1D360 +gMetalShinePalette:: @ 8D1D360 .incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_metal_shine_tilemap:: @ 8D1D388 +gMetalShineTilemap:: @ 8D1D388 .incbin "graphics/battle_anims/masks/metal_shine.bin.lz" .align 2 -- cgit v1.2.3 From 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Thu, 10 Oct 2019 08:09:37 +0800 Subject: dragon --- data/data_835B488.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index e55eaea08..41b35a648 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -930,7 +930,7 @@ gUnknown_83E7668:: @ 83E7668 .incbin "baserom.gba", 0x3E7668, 0x78 gUnknown_83E76E0:: @ 83E76E0 - .incbin "baserom.gba", 0x3E76E0, 0x198 + .incbin "baserom.gba", 0x3E76E0, 0x30 .section .rodata.83E7CFC -- cgit v1.2.3 From c0c4a2e94b691ec102fa84eb555b7964daf92be0 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 11 Oct 2019 06:01:19 +0800 Subject: ghost --- data/data_835B488.s | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index 41b35a648..fd6f9c209 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -924,13 +924,7 @@ gUnknown_83E74D8:: @ 83E74D8 .incbin "baserom.gba", 0x3E74D8, 0x18 gUnknown_83E74F0:: @ 83E74F0 - .incbin "baserom.gba", 0x3E74F0, 0x178 - -gUnknown_83E7668:: @ 83E7668 - .incbin "baserom.gba", 0x3E7668, 0x78 - -gUnknown_83E76E0:: @ 83E76E0 - .incbin "baserom.gba", 0x3E76E0, 0x30 + .incbin "baserom.gba", 0x3E74F0, 0xB8 .section .rodata.83E7CFC -- cgit v1.2.3 From e61343049278df73a0da8da70a50dea88da0bdae Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 11 Oct 2019 08:48:05 +0800 Subject: rock --- data/data_835B488.s | 21 +++++++++------------ data/graphics.s | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index fd6f9c209..cf435e174 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -843,13 +843,19 @@ gUnknown_83E4410:: @ 83E4410 .incbin "baserom.gba", 0x3E4410, 0x1488 gUnknown_83E5898:: @ 83E5898 - .incbin "baserom.gba", 0x3E5898, 0x248 + .incbin "baserom.gba", 0x3E5898, 0xC0 + +gUnknown_83E5958:: @ 83E5958 + .incbin "baserom.gba", 0x3E5958, 0x188 gUnknown_83E5AE0:: @ 83E5AE0 .incbin "baserom.gba", 0x3E5AE0, 0xA8 gUnknown_83E5B88:: @ 83E5B88 - .incbin "baserom.gba", 0x3E5B88, 0x2A4 + .incbin "baserom.gba", 0x3E5B88, 0x1C0 + +gUnknown_83E5D48:: @ 83E5D48 + .incbin "baserom.gba", 0x3E5D48, 0xE4 gUnknown_83E5E2C:: @ 83E5E2C .incbin "baserom.gba", 0x3E5E2C, 0x18 @@ -915,16 +921,7 @@ gUnknown_83E7044:: @ 83E7044 .incbin "baserom.gba", 0x3E7044, 0xD0 gUnknown_83E7114:: @ 83E7114 - .incbin "baserom.gba", 0x3E7114, 0x35C - -gUnknown_83E7470:: @ 83E7470 - .incbin "baserom.gba", 0x3E7470, 0x68 - -gUnknown_83E74D8:: @ 83E74D8 - .incbin "baserom.gba", 0x3E74D8, 0x18 - -gUnknown_83E74F0:: @ 83E74F0 - .incbin "baserom.gba", 0x3E74F0, 0xB8 + .incbin "baserom.gba", 0x3E7114, 0x27C .section .rodata.83E7CFC diff --git a/data/graphics.s b/data/graphics.s index 79b622cfa..379411a67 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13554,7 +13554,7 @@ gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet:: @ 8E794D0 .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_261_palette:: @ 8E799FC +gBattleAnimSpritePal_FlyingDirt:: @ 8E799FC .incbin "graphics/battle_anims/sprites/261.gbapal.lz" .align 2 -- cgit v1.2.3 From 1aa9698ff037aea4e52a5306d6abb4d1c528ef1c Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 11 Oct 2019 11:35:33 +0800 Subject: bug --- data/data_835B488.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index cf435e174..d909c4f64 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -921,7 +921,7 @@ gUnknown_83E7044:: @ 83E7044 .incbin "baserom.gba", 0x3E7044, 0xD0 gUnknown_83E7114:: @ 83E7114 - .incbin "baserom.gba", 0x3E7114, 0x27C + .incbin "baserom.gba", 0x3E7114, 0xD4 .section .rodata.83E7CFC -- cgit v1.2.3 From 6743faa82211187514153c6754f4ae43af7daf9c Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 11 Oct 2019 12:58:59 +0800 Subject: psychic --- data/data_835B488.s | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index d909c4f64..7bacc0bc7 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -906,22 +906,7 @@ gUnknown_83E652C:: @ 83E652C .incbin "baserom.gba", 0x3E652C, 0x78 gUnknown_83E65A4:: @ 83E65A4 - .incbin "baserom.gba", 0x3E65A4, 0xA4C - -gUnknown_83E6FF0:: @ 83E6FF0 - .incbin "baserom.gba", 0x3E6FF0, 0x1C - -gUnknown_83E700C:: @ 83E700C - .incbin "baserom.gba", 0x3E700C, 0x20 - -gUnknown_83E702C:: @ 83E702C - .incbin "baserom.gba", 0x3E702C, 0x18 - -gUnknown_83E7044:: @ 83E7044 - .incbin "baserom.gba", 0x3E7044, 0xD0 - -gUnknown_83E7114:: @ 83E7114 - .incbin "baserom.gba", 0x3E7114, 0xD4 + .incbin "baserom.gba", 0x3E65A4, 0x838 .section .rodata.83E7CFC -- cgit v1.2.3 From c46e6fa3d923641c875c68027947896f78b68c1c Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 12 Oct 2019 11:46:11 +0800 Subject: flying --- data/data_835B488.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index 7bacc0bc7..2766f0eeb 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -906,7 +906,7 @@ gUnknown_83E652C:: @ 83E652C .incbin "baserom.gba", 0x3E652C, 0x78 gUnknown_83E65A4:: @ 83E65A4 - .incbin "baserom.gba", 0x3E65A4, 0x838 + .incbin "baserom.gba", 0x3E65A4, 0x544 .section .rodata.83E7CFC -- cgit v1.2.3