pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename some call/jump script commands to avoid confusion with jr/jp asm instructions

Browse Source 
Fixes #580
This commit is contained in:
Rangi
2019-03-10 16:39:31 -04:00
parent e002b536af
commit f5c9958aea
164 changed files with 840 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
maps/CopycatsHouse2F.asm
View File

@@ -17,7 +17,7 @@ CopycatsHouse2F_MapScripts:
iftrue .Female
disappear COPYCATSHOUSE2F_COPYCAT2
appear COPYCATSHOUSE2F_COPYCAT1
jump .Done
sjump .Done
.Female:
disappear COPYCATSHOUSE2F_COPYCAT1
appear COPYCATSHOUSE2F_COPYCAT2
@@ -37,7 +37,7 @@ Copycat:
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
jump .Default_Merge_1
sjump .Default_Merge_1
.Default_Female_1:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -51,7 +51,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_2a
writetext CopycatText_Male_1
jump .Default_Merge_2a
sjump .Default_Merge_2a
.Default_Female_2a:
writetext CopycatText_Female_1
@@ -61,7 +61,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_3a
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
jump .Default_Merge_3a
sjump .Default_Merge_3a
.Default_Female_3a:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -80,7 +80,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_2b
writetext CopycatText_Male_2
jump .Default_Merge_2b
sjump .Default_Merge_2b
.Default_Female_2b:
writetext CopycatText_Female_2
@@ -90,7 +90,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_3b
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
jump .Default_Merge_3b
sjump .Default_Merge_3b
.Default_Female_3b:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -112,7 +112,7 @@ Copycat:
takeitem LOST_ITEM
setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
clearevent EVENT_COPYCATS_HOUSE_2F_DOLL
jump .GivePass
sjump .GivePass
.TryGivePassAgain:
opentext
@@ -133,7 +133,7 @@ Copycat:
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
jump .GotPass_Merge_1
sjump .GotPass_Merge_1
.GotPass_Female_1:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -145,7 +145,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_2
writetext CopycatText_Male_3
jump .GotPass_Merge_2
sjump .GotPass_Merge_2
.GotPass_Female_2:
writetext CopycatText_Female_3
@@ -155,7 +155,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_3
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
jump .GotPass_Merge_3
sjump .GotPass_Merge_3
.GotPass_Female_3:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData