Special_MapCallbackSprites_LoadUsedSpritesGFX -> Special_LoadUsedSpritesGFX

This commit is contained in:
xCrystal
2018-01-03 14:58:08 +01:00
parent aa9a0a900d
commit 91f97f08f0
7 changed files with 20 additions and 20 deletions

View File

@@ -23,7 +23,7 @@ Function14146: ; mobile
push af push af
res 7, [hl] res 7, [hl]
set 6, [hl] set 6, [hl]
call Special_MapCallbackSprites_LoadUsedSpritesGFX call Special_LoadUsedSpritesGFX
pop af pop af
ld [wSpriteFlags], a ld [wSpriteFlags], a
ret ret
@@ -35,7 +35,7 @@ Function14157: ; mobile
push af push af
set 7, [hl] set 7, [hl]
res 6, [hl] res 6, [hl]
call Special_MapCallbackSprites_LoadUsedSpritesGFX call Special_LoadUsedSpritesGFX
pop af pop af
ld [wSpriteFlags], a ld [wSpriteFlags], a
ret ret
@@ -43,7 +43,7 @@ Function14157: ; mobile
Special_RefreshSprites:: ; 14168 Special_RefreshSprites:: ; 14168
call .Refresh call .Refresh
call Special_MapCallbackSprites_LoadUsedSpritesGFX call Special_LoadUsedSpritesGFX
ret ret
; 1416f ; 1416f
@@ -164,7 +164,7 @@ AddOutdoorSprites: ; 141ee
; 14209 ; 14209
Special_MapCallbackSprites_LoadUsedSpritesGFX: ; 14209 Special_LoadUsedSpritesGFX: ; 14209
ld a, MAPCALLBACK_SPRITES ld a, MAPCALLBACK_SPRITES
call RunMapCallback call RunMapCallback
call GetUsedSprites call GetUsedSprites

View File

@@ -113,7 +113,7 @@ SpecialsPointers:: ; c029
add_special Special_RandomUnseenWildMon add_special Special_RandomUnseenWildMon
add_special Special_RandomPhoneWildMon add_special Special_RandomPhoneWildMon
add_special Special_RandomPhoneMon add_special Special_RandomPhoneMon
add_special Special_MapCallbackSprites_LoadUsedSpritesGFX add_special Special_LoadUsedSpritesGFX
add_special Special_PlaySlowCry add_special Special_PlaySlowCry
add_special Special_SnorlaxAwake add_special Special_SnorlaxAwake
add_special Special_YoungerHaircutBrother add_special Special_YoungerHaircutBrother

View File

@@ -46,7 +46,7 @@ Copycat:
faceplayer faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS variablesprite SPRITE_COPYCAT, SPRITE_KRIS
.Default_Merge_1: .Default_Merge_1:
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
checkevent EVENT_RETURNED_MACHINE_PART checkevent EVENT_RETURNED_MACHINE_PART
iftrue .TalkAboutLostItem iftrue .TalkAboutLostItem
opentext opentext
@@ -70,7 +70,7 @@ Copycat:
.Default_Merge_3a: .Default_Merge_3a:
faceplayer faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS variablesprite SPRITE_COPYCAT, SPRITE_LASS
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
opentext opentext
writetext CopycatText_QuickMimicking writetext CopycatText_QuickMimicking
waitbutton waitbutton
@@ -99,7 +99,7 @@ Copycat:
.Default_Merge_3b: .Default_Merge_3b:
faceplayer faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS variablesprite SPRITE_COPYCAT, SPRITE_LASS
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
opentext opentext
writetext CopycatText_Worried writetext CopycatText_Worried
waitbutton waitbutton
@@ -142,7 +142,7 @@ Copycat:
faceplayer faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS variablesprite SPRITE_COPYCAT, SPRITE_KRIS
.GotPass_Merge_1: .GotPass_Merge_1:
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
opentext opentext
checkflag ENGINE_PLAYER_IS_FEMALE checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_2 iftrue .GotPass_Female_2
@@ -164,7 +164,7 @@ Copycat:
.GotPass_Merge_3: .GotPass_Merge_3:
faceplayer faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS variablesprite SPRITE_COPYCAT, SPRITE_LASS
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
opentext opentext
writetext CopycatText_ItsAScream writetext CopycatText_ItsAScream
waitbutton waitbutton

View File

@@ -35,7 +35,7 @@ FuchsiaGymJanineScript:
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
opentext opentext
writetext Text_ReceivedSoulBadge writetext Text_ReceivedSoulBadge
playsound SFX_GET_BADGE playsound SFX_GET_BADGE
@@ -65,7 +65,7 @@ LassAliceScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin
faceplayer faceplayer
variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
.AliceUnmasked: .AliceUnmasked:
faceplayer faceplayer
opentext opentext
@@ -99,7 +99,7 @@ LassLindaScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin
faceplayer faceplayer
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
.LindaUnmasked: .LindaUnmasked:
faceplayer faceplayer
opentext opentext
@@ -133,7 +133,7 @@ PicnickerCindyScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin
faceplayer faceplayer
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
.CindyUnmasked: .CindyUnmasked:
faceplayer faceplayer
opentext opentext
@@ -167,7 +167,7 @@ CamperBarryScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin
faceplayer faceplayer
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
.BarryUnmasked: .BarryUnmasked:
faceplayer faceplayer
opentext opentext

View File

@@ -33,7 +33,7 @@ JanineImpersonatorScript_0x196462:
applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
faceplayer faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
opentext opentext
writetext UnknownText_0x19654e writetext UnknownText_0x19654e
waitbutton waitbutton
@@ -41,7 +41,7 @@ JanineImpersonatorScript_0x196462:
applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
faceplayer faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
end end
MovementData_0x196486: MovementData_0x196486:

View File

@@ -45,7 +45,7 @@ UnknownScript_0x1a8833:
disappear OLIVINECITY_OLIVINE_RIVAL disappear OLIVINECITY_OLIVINE_RIVAL
special RestartMapMusic special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
end end
UnknownScript_0x1a886b: UnknownScript_0x1a886b:
@@ -69,7 +69,7 @@ UnknownScript_0x1a886b:
setscene $1 setscene $1
special RestartMapMusic special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
end end
OlivineCitySailor1Script: OlivineCitySailor1Script:

View File

@@ -94,7 +94,7 @@ DidntCatchSudowoodo:
applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee
disappear ROUTE36_WEIRD_TREE disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
special Special_MapCallbackSprites_LoadUsedSpritesGFX special Special_LoadUsedSpritesGFX
special Special_RefreshSprites special Special_RefreshSprites
end end