summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-18 12:58:12 -0700
committerYamaArashi <shadow962@live.com>2016-10-18 12:58:12 -0700
commit269deb860eea244184454c580b03ae64d6fd23c4 (patch)
treea33d1f8c1e5f7d8d3595026b0948a6dfc627271f /data
parent4507114ef7f556b930a696f04ddee9d72670e944 (diff)
name some graphics functions
Diffstat (limited to 'data')
-rw-r--r--data/data2.s46
-rw-r--r--data/field_effect_scripts.s4
2 files changed, 25 insertions, 25 deletions
diff --git a/data/data2.s b/data/data2.s
index 9c7eb20d9..97def8225 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -11143,7 +11143,7 @@ gBirchPalette:: @ 839E414
.align 2
gSpriteImage_839E434:: @ 839E434
- .incbin "graphics/unknown_sprites/839E434.4bpp"
+ .incbin "graphics/misc/pokeball_glow.4bpp"
.align 2
gFieldEffectObjectPalette4: @ 839E454
@@ -11159,11 +11159,11 @@ gSpriteImage_839E534:: @ 839E534
.align 2
gSpriteImage_839E5F4:: @ 839E5F4
- .incbin "graphics/unknown_sprites/839E5F4.4bpp"
+ .incbin "graphics/misc/big_hof_monitor.4bpp"
.align 2
gSpriteImage_839E7F4:: @ 839E7F4
- .incbin "graphics/unknown_sprites/839E7F4.4bpp"
+ .incbin "graphics/misc/small_hof_monitor.4bpp"
.align 2
gFieldEffectObjectPalette5: @ 839E8F4
@@ -11322,44 +11322,44 @@ gSpriteAnimTable_839F204:: @ 839F204
.align 2
gSpriteTemplate_839F208:: @ 839F208
- spr_template 0xFFFF, 4103, gOamData_839F0FC, gSpriteAnimTable_839F1FC, gSpriteImageTable_839F158, gDummySpriteAffineAnimTable, sub_8086408
+ spr_template 0xFFFF, 4103, gOamData_839F0FC, gSpriteAnimTable_839F1FC, gSpriteImageTable_839F158, gDummySpriteAffineAnimTable, SpriteCB_PokeballGlow
.align 2
gSpriteTemplate_839F220:: @ 839F220
- spr_template 0xFFFF, 4100, gOamData_839F104, gSpriteAnimTable_839F1FC, gSpriteImageTable_839F160, gDummySpriteAffineAnimTable, sub_808648C
+ spr_template 0xFFFF, 4100, gOamData_839F104, gSpriteAnimTable_839F1FC, gSpriteImageTable_839F160, gDummySpriteAffineAnimTable, SpriteCB_PokecenterMonitor
.align 2
gSpriteTemplate_839F238:: @ 839F238
- spr_template 0xFFFF, 4112, gOamData_839F104, gSpriteAnimTable_839F204, gSpriteImageTable_839F170, gDummySpriteAffineAnimTable, sub_8086550
+ spr_template 0xFFFF, 4112, gOamData_839F104, gSpriteAnimTable_839F204, gSpriteImageTable_839F170, gDummySpriteAffineAnimTable, SpriteCB_HallOfFameMonitor
.align 2
gSpriteTemplate_839F250:: @ 839F250
- spr_template 0xFFFF, 4112, gOamData_839F150, gSpriteAnimTable_839F204, gSpriteImageTable_839F178, gDummySpriteAffineAnimTable, sub_8086550
+ spr_template 0xFFFF, 4112, gOamData_839F150, gSpriteAnimTable_839F204, gSpriteImageTable_839F178, gDummySpriteAffineAnimTable, SpriteCB_HallOfFameMonitor
.align 2
gUnknown_0839F268:: @ 839F268
- .4byte sub_8085DF4
- .4byte sub_8085E30
- .4byte sub_8085E6C
- .4byte sub_8085E94
+ .4byte PokecenterHealEffect_0
+ .4byte PokecenterHealEffect_1
+ .4byte PokecenterHealEffect_2
+ .4byte PokecenterHealEffect_3
.align 2
gUnknown_0839F278:: @ 839F278
- .4byte sub_8085F40
- .4byte sub_8085FB4
- .4byte sub_8085FE4
- .4byte sub_808600C
+ .4byte HallOfFameRecord_0
+ .4byte HallOfFameRecord_1
+ .4byte HallOfFameRecord_2
+ .4byte HallOfFameRecord_3
.align 2
gUnknown_0839F288:: @ 839F288
- .4byte sub_80860BC
- .4byte sub_8086154
- .4byte sub_8086188
- .4byte sub_80862C8
- .4byte sub_80863BC
- .4byte sub_80863D8
- .4byte sub_80863E0
- .4byte nullsub_57
+ .4byte PokeballGlowEffect_0
+ .4byte PokeballGlowEffect_1
+ .4byte PokeballGlowEffect_2
+ .4byte PokeballGlowEffect_3
+ .4byte PokeballGlowEffect_4
+ .4byte PokeballGlowEffect_5
+ .4byte PokeballGlowEffect_6
+ .4byte PokeballGlowEffect_7
gUnknown_0839F2A8:: @ 839F2A8
.incbin "baserom.gba", 0x0039f2a8, 0x18
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 7cef8924c..6a59eb3e3 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -173,7 +173,7 @@ gFieldEffectScript_DeepSandFootprints: @ 81D9D00
gFieldEffectScript_Unknown25: @ 81D9D0A
loadfadedpal gFieldEffectObjectPaletteInfo4
- loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8085D80
+ loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_PokecenterHeal
end
gFieldEffectScript_Unknown26: @ 81D9D19
@@ -323,7 +323,7 @@ gFieldEffectScript_Unknown61: @ 81D9E2C
gFieldEffectScript_Unknown62: @ 81D9E32
loadfadedpal gFieldEffectObjectPaletteInfo4
- loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, sub_8085ED4
+ loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, FldEff_HallOfFameRecord
end
gFieldEffectScript_Unknown63: @ 81D9E41