summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-11-08 10:30:17 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-11-09 12:26:53 +0800
commit94c1924ed8849ccd2bbc7c3f3f4d28400edf72d5 (patch)
tree3708cbadf4c47b8ee06232ab145b20debde976a2 /data
parent7e4a3697cd6587e78b07eb8899cc142cca6bb583 (diff)
ice
Diffstat (limited to 'data')
-rw-r--r--data/battle_anim_effects_misc.s17
-rw-r--r--data/field_weather.s2
-rw-r--r--data/graphics.s2
3 files changed, 3 insertions, 18 deletions
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