From 71eb0fc9d80731a26867aedf0b470f67315ab623 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 1 Nov 2019 02:17:23 +0800 Subject: battle_controller_pokedude data --- data/data_8471F00.s | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'data') diff --git a/data/data_8471F00.s b/data/data_8471F00.s index 82d507ea1..62a23c646 100644 --- a/data/data_8471F00.s +++ b/data/data_8471F00.s @@ -191,30 +191,6 @@ gUnknown_8478EC4:: @ 8478EC4 gUnknown_8478F14:: @ 8478F14 .incbin "baserom.gba", 0x478F14, 0x8 -gUnknown_8478F1C:: @ 8478F1C - .incbin "baserom.gba", 0x478F1C, 0x144 - -gUnknown_8479060:: @ 8479060 - .incbin "baserom.gba", 0x479060, 0x78 - -gUnknown_84790D8:: @ 84790D8 - .incbin "baserom.gba", 0x4790D8, 0xC0 - -gUnknown_8479198:: @ 8479198 - .incbin "baserom.gba", 0x479198, 0x10 - -gUnknown_84791A8:: @ 84791A8 - .incbin "baserom.gba", 0x4791A8, 0x10 - -gUnknown_84791B8:: @ 84791B8 - .incbin "baserom.gba", 0x4791B8, 0x14 - -gUnknown_84791CC:: @ 84791CC - .incbin "baserom.gba", 0x4791CC, 0x1C - -gUnknown_84791E8:: @ 84791E8 - .incbin "baserom.gba", 0x4791E8, 0x18 - .section .rodata.8479668 .align 2 -- cgit v1.2.3 From 253ffec0352404ae2ffe5635a5b648d39d8d6b7e Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 8 Nov 2019 01:16:42 +0800 Subject: poison --- data/battle_anim_effects_misc.s | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s index 6eed66f09..1aa9f6e7a 100644 --- a/data/battle_anim_effects_misc.s +++ b/data/battle_anim_effects_misc.s @@ -139,7 +139,10 @@ gUnknown_83E5898:: @ 83E5898 .incbin "baserom.gba", 0x3E5898, 0xC0 gUnknown_83E5958:: @ 83E5958 - .incbin "baserom.gba", 0x3E5958, 0x188 + .incbin "baserom.gba", 0x3E5958, 0x120 + +gUnknown_83E5A78:: @ 83E5A78 + .incbin "baserom.gba", 0x3E5A78, 0x68 gUnknown_83E5AE0:: @ 83E5AE0 .incbin "baserom.gba", 0x3E5AE0, 0xA8 @@ -199,4 +202,4 @@ gUnknown_83E652C:: @ 83E652C .incbin "baserom.gba", 0x3E652C, 0x78 gUnknown_83E65A4:: @ 83E65A4 - .incbin "baserom.gba", 0x3E65A4, 0x544 + .incbin "baserom.gba", 0x3E65A4, 0x3F0 -- cgit v1.2.3 From 7e4a3697cd6587e78b07eb8899cc142cca6bb583 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 8 Nov 2019 05:03:08 +0800 Subject: fighting --- data/battle_anim_effects_misc.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s index 1aa9f6e7a..afba51599 100644 --- a/data/battle_anim_effects_misc.s +++ b/data/battle_anim_effects_misc.s @@ -202,4 +202,4 @@ gUnknown_83E652C:: @ 83E652C .incbin "baserom.gba", 0x3E652C, 0x78 gUnknown_83E65A4:: @ 83E65A4 - .incbin "baserom.gba", 0x3E65A4, 0x3F0 + .incbin "baserom.gba", 0x3E65A4, 0xE8 -- cgit v1.2.3 From 94c1924ed8849ccd2bbc7c3f3f4d28400edf72d5 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 8 Nov 2019 10:30:17 +0800 Subject: ice --- data/battle_anim_effects_misc.s | 17 +---------------- data/field_weather.s | 2 +- data/graphics.s | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) (limited to 'data') diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s index afba51599..7d9f59c21 100644 --- a/data/battle_anim_effects_misc.s +++ b/data/battle_anim_effects_misc.s @@ -187,19 +187,4 @@ gUnknown_83E6278:: @ 83E6278 .incbin "baserom.gba", 0x3E6278, 0x30 gUnknown_83E62A8:: @ 83E62A8 - .incbin "baserom.gba", 0x3E62A8, 0x138 - -gUnknown_83E63E0:: @ 83E63E0 - .incbin "baserom.gba", 0x3E63E0, 0xF4 - -gUnknown_83E64D4:: @ 83E64D4 - .incbin "baserom.gba", 0x3E64D4, 0x2C - -gUnknown_83E6500:: @ 83E6500 - .incbin "baserom.gba", 0x3E6500, 0x2C - -gUnknown_83E652C:: @ 83E652C - .incbin "baserom.gba", 0x3E652C, 0x78 - -gUnknown_83E65A4:: @ 83E65A4 - .incbin "baserom.gba", 0x3E65A4, 0xE8 + .incbin "baserom.gba", 0x3E62A8, 0x18 diff --git a/data/field_weather.s b/data/field_weather.s index 517480d9a..03b3e8faa 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -25,7 +25,7 @@ gUnknown_83C2D00:: @ 83C2D00 gUnknown_83C2D20:: @ 83C2D20 .incbin "baserom.gba", 0x3C2D20, 0x820 -gUnknown_83C3540:: @ 83C3540 +gWeatherFog1Tiles:: @ 83C3540 .incbin "baserom.gba", 0x3C3540, 0x3080 gUnknown_83C65C0:: @ 83C65C0 diff --git a/data/graphics.s b/data/graphics.s index 7ead75c74..5eacc0cb2 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13760,7 +13760,7 @@ 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 +gBattleAnimFogTilemap:: @ 8E7F1F4 .incbin "graphics/battle_anims/backgrounds/fog.bin.lz" .align 2 -- cgit v1.2.3 From ab9ce0e6413607d1677be1bc0e1174e5f82e48f0 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 9 Nov 2019 04:20:43 +0800 Subject: electric --- data/battle_anim_effects_misc.s | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'data') diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s index 7d9f59c21..112b3dbe4 100644 --- a/data/battle_anim_effects_misc.s +++ b/data/battle_anim_effects_misc.s @@ -166,25 +166,4 @@ gUnknown_83E5EFC:: @ 83E5EFC .incbin "baserom.gba", 0x3E5EFC, 0x10 gUnknown_83E5F0C:: @ 83E5F0C - .incbin "baserom.gba", 0x3E5F0C, 0x2C - -gUnknown_83E5F38:: @ 83E5F38 - .incbin "baserom.gba", 0x3E5F38, 0x168 - -gUnknown_83E60A0:: @ 83E60A0 - .incbin "baserom.gba", 0x3E60A0, 0x18 - -gUnknown_83E60B8:: @ 83E60B8 - .incbin "baserom.gba", 0x3E60B8, 0x18 - -gUnknown_83E60D0:: @ 83E60D0 - .incbin "baserom.gba", 0x3E60D0, 0x50 - -gUnknown_83E6120:: @ 83E6120 - .incbin "baserom.gba", 0x3E6120, 0x158 - -gUnknown_83E6278:: @ 83E6278 - .incbin "baserom.gba", 0x3E6278, 0x30 - -gUnknown_83E62A8:: @ 83E62A8 - .incbin "baserom.gba", 0x3E62A8, 0x18 + .incbin "baserom.gba", 0x3E5F0C, 0x10 -- cgit v1.2.3 From a4a44dd18e125974e784f5f2fcb4c1387a8de90a Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 9 Nov 2019 09:05:26 +0800 Subject: fire; update constants --- data/battle_anim_effects_misc.s | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'data') diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s index 112b3dbe4..182ebc850 100644 --- a/data/battle_anim_effects_misc.s +++ b/data/battle_anim_effects_misc.s @@ -148,22 +148,4 @@ gUnknown_83E5AE0:: @ 83E5AE0 .incbin "baserom.gba", 0x3E5AE0, 0xA8 gUnknown_83E5B88:: @ 83E5B88 - .incbin "baserom.gba", 0x3E5B88, 0x1C0 - -gUnknown_83E5D48:: @ 83E5D48 - .incbin "baserom.gba", 0x3E5D48, 0xE4 - -gUnknown_83E5E2C:: @ 83E5E2C - .incbin "baserom.gba", 0x3E5E2C, 0x18 - -gUnknown_83E5E44:: @ 83E5E44 - .incbin "baserom.gba", 0x3E5E44, 0x2 - -gUnknown_83E5E46:: @ 83E5E46 - .incbin "baserom.gba", 0x3E5E46, 0xB6 - -gUnknown_83E5EFC:: @ 83E5EFC - .incbin "baserom.gba", 0x3E5EFC, 0x10 - -gUnknown_83E5F0C:: @ 83E5F0C - .incbin "baserom.gba", 0x3E5F0C, 0x10 + .incbin "baserom.gba", 0x3E5B88, 0x30 -- cgit v1.2.3