summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2018-01-03 14:58:08 +0100
committerxCrystal <rgr.crystal@gmail.com>2018-01-03 14:58:08 +0100
commit91f97f08f06923e3548797133275df53e240d894 (patch)
treeee131f0a35b86beede728cc9db6be0feed3e2514
parentaa9a0a900ddeaa79a05f1b93458a8b19ae170d69 (diff)
Special_MapCallbackSprites_LoadUsedSpritesGFX -> Special_LoadUsedSpritesGFX
-rwxr-xr-xengine/overworld.asm8
-rw-r--r--engine/specials.asm2
-rw-r--r--maps/CopycatsHouse2F.asm10
-rw-r--r--maps/FuchsiaGym.asm10
-rw-r--r--maps/FuchsiaPokecenter1F.asm4
-rw-r--r--maps/OlivineCity.asm4
-rw-r--r--maps/Route36.asm2
7 files changed, 20 insertions, 20 deletions
diff --git a/engine/overworld.asm b/engine/overworld.asm
index 4b330efb1..67c2f25c6 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -23,7 +23,7 @@ Function14146: ; mobile
push af
res 7, [hl]
set 6, [hl]
- call Special_MapCallbackSprites_LoadUsedSpritesGFX
+ call Special_LoadUsedSpritesGFX
pop af
ld [wSpriteFlags], a
ret
@@ -35,7 +35,7 @@ Function14157: ; mobile
push af
set 7, [hl]
res 6, [hl]
- call Special_MapCallbackSprites_LoadUsedSpritesGFX
+ call Special_LoadUsedSpritesGFX
pop af
ld [wSpriteFlags], a
ret
@@ -43,7 +43,7 @@ Function14157: ; mobile
Special_RefreshSprites:: ; 14168
call .Refresh
- call Special_MapCallbackSprites_LoadUsedSpritesGFX
+ call Special_LoadUsedSpritesGFX
ret
; 1416f
@@ -164,7 +164,7 @@ AddOutdoorSprites: ; 141ee
; 14209
-Special_MapCallbackSprites_LoadUsedSpritesGFX: ; 14209
+Special_LoadUsedSpritesGFX: ; 14209
ld a, MAPCALLBACK_SPRITES
call RunMapCallback
call GetUsedSprites
diff --git a/engine/specials.asm b/engine/specials.asm
index 83ec5bfb3..5b4fd45ae 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -113,7 +113,7 @@ SpecialsPointers:: ; c029
add_special Special_RandomUnseenWildMon
add_special Special_RandomPhoneWildMon
add_special Special_RandomPhoneMon
- add_special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ add_special Special_LoadUsedSpritesGFX
add_special Special_PlaySlowCry
add_special Special_SnorlaxAwake
add_special Special_YoungerHaircutBrother
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index 8d378a820..0f12d3a97 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -46,7 +46,7 @@ Copycat:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
.Default_Merge_1:
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .TalkAboutLostItem
opentext
@@ -70,7 +70,7 @@ Copycat:
.Default_Merge_3a:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
opentext
writetext CopycatText_QuickMimicking
waitbutton
@@ -99,7 +99,7 @@ Copycat:
.Default_Merge_3b:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
opentext
writetext CopycatText_Worried
waitbutton
@@ -142,7 +142,7 @@ Copycat:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
.GotPass_Merge_1:
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
opentext
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_2
@@ -164,7 +164,7 @@ Copycat:
.GotPass_Merge_3:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
opentext
writetext CopycatText_ItsAScream
waitbutton
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index 505f5ca53..2ef7f2abd 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -35,7 +35,7 @@ FuchsiaGymJanineScript:
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
opentext
writetext Text_ReceivedSoulBadge
playsound SFX_GET_BADGE
@@ -65,7 +65,7 @@ LassAliceScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
.AliceUnmasked:
faceplayer
opentext
@@ -99,7 +99,7 @@ LassLindaScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
.LindaUnmasked:
faceplayer
opentext
@@ -133,7 +133,7 @@ PicnickerCindyScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
.CindyUnmasked:
faceplayer
opentext
@@ -167,7 +167,7 @@ CamperBarryScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
.BarryUnmasked:
faceplayer
opentext
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index f82fbb26e..1e7b32c9e 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -33,7 +33,7 @@ JanineImpersonatorScript_0x196462:
applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
opentext
writetext UnknownText_0x19654e
waitbutton
@@ -41,7 +41,7 @@ JanineImpersonatorScript_0x196462:
applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
end
MovementData_0x196486:
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index d90d2900e..f914fb493 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -45,7 +45,7 @@ UnknownScript_0x1a8833:
disappear OLIVINECITY_OLIVINE_RIVAL
special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
end
UnknownScript_0x1a886b:
@@ -69,7 +69,7 @@ UnknownScript_0x1a886b:
setscene $1
special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
end
OlivineCitySailor1Script:
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 58530fbee..91a497c1f 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -94,7 +94,7 @@ DidntCatchSudowoodo:
applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
- special Special_MapCallbackSprites_LoadUsedSpritesGFX
+ special Special_LoadUsedSpritesGFX
special Special_RefreshSprites
end