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

Break up engine/sprites.asm; address yenatch's comments

Browse Source
This commit is contained in:
PikalaxALT
2015-12-01 21:54:11 -05:00
parent ffbf2c0f5d
commit 92a8c491c3
114 changed files with 2610 additions and 2634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maps/AzaleaGym.asm
View File

@@ -23,7 +23,7 @@ BugsyScript:
waitbutton
closetext
winlosstext BugsyText_ResearchIncomplete, 0
scriptedtrainerdata BUGSY, 1
loadtrainer BUGSY, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_BUGSY

10
maps/AzaleaTown.asm
View File

@@ -44,7 +44,7 @@ UnknownScript_0x198018:
moveperson AZALEATOWN_AZALEA_ROCKET2, $b, $b
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
pause 15
appear AZALEATOWN_AZALEA_ROCKET2
applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x198134
@@ -54,7 +54,7 @@ UnknownScript_0x198018:
UnknownScript_0x198034:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
pause 15
appear AZALEATOWN_AZALEA_ROCKET2
applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x19813c
@@ -72,7 +72,7 @@ UnknownScript_0x198049:
iftrue UnknownScript_0x198081
winlosstext UnknownText_0x1981e6, UnknownText_0x19835b
setlasttalked $b
scriptedtrainerdata RIVAL1, RIVAL1_6
loadtrainer RIVAL1, RIVAL1_6
startbattle
reloadmapmusic
returnafterbattle
@@ -81,7 +81,7 @@ UnknownScript_0x198049:
UnknownScript_0x198071:
winlosstext UnknownText_0x1981e6, UnknownText_0x19835b
setlasttalked $b
scriptedtrainerdata RIVAL1, RIVAL1_4
loadtrainer RIVAL1, RIVAL1_4
startbattle
reloadmapmusic
returnafterbattle
@@ -90,7 +90,7 @@ UnknownScript_0x198071:
UnknownScript_0x198081:
winlosstext UnknownText_0x1981e6, UnknownText_0x19835b
setlasttalked $b
scriptedtrainerdata RIVAL1, RIVAL1_5
loadtrainer RIVAL1, RIVAL1_5
startbattle
reloadmapmusic
returnafterbattle

2
maps/BlackthornGym1F.asm
View File

@@ -41,7 +41,7 @@ ClairScript_0x194e24:
waitbutton
closetext
winlosstext UnknownText_0x194fd6, 0
scriptedtrainerdata CLAIR, 1
loadtrainer CLAIR, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_CLAIR

2
maps/BrunosRoom.asm
View File

@@ -56,7 +56,7 @@ BrunoScript_0x1809c5:
waitbutton
closetext
winlosstext UnknownText_0x180b23, 0
scriptedtrainerdata BRUNO, 1
loadtrainer BRUNO, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_ELITE_4_BRUNO

10
maps/BurnedTower1F.asm
View File

@@ -56,7 +56,7 @@ UnknownScript_0x185c0d:
UnknownScript_0x185c25:
showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
pause 15
spriteface BURNEDTOWER1F_SILVER, RIGHT
pause 15
@@ -73,7 +73,7 @@ UnknownScript_0x185c25:
iftrue UnknownScript_0x185c70
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
setlasttalked $4
scriptedtrainerdata RIVAL1, RIVAL1_9
loadtrainer RIVAL1, RIVAL1_9
startbattle
reloadmapmusic
returnafterbattle
@@ -82,7 +82,7 @@ UnknownScript_0x185c25:
UnknownScript_0x185c60:
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
setlasttalked $4
scriptedtrainerdata RIVAL1, RIVAL1_7
loadtrainer RIVAL1, RIVAL1_7
startbattle
reloadmapmusic
returnafterbattle
@@ -91,7 +91,7 @@ UnknownScript_0x185c60:
UnknownScript_0x185c70:
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
setlasttalked $4
scriptedtrainerdata RIVAL1, RIVAL1_8
loadtrainer RIVAL1, RIVAL1_8
startbattle
reloadmapmusic
returnafterbattle
@@ -105,7 +105,7 @@ UnknownScript_0x185c80:
closetext
dotrigger $2
setevent EVENT_RIVAL_BURNED_TOWER
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
pause 15
earthquake 50
showemote EMOTE_SHOCK, PLAYER, 15

2
maps/CeladonGym.asm
View File

@@ -22,7 +22,7 @@ ErikaScript_0x72a6a:
waitbutton
closetext
winlosstext UnknownText_0x72c3e, 0
scriptedtrainerdata ERIKA, 1
loadtrainer ERIKA, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_ERIKA

2
maps/CeruleanGym.asm
View File

@@ -69,7 +69,7 @@ MistyScript_0x188432:
waitbutton
closetext
winlosstext UnknownText_0x18870c, 0
scriptedtrainerdata MISTY, 1
loadtrainer MISTY, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_MISTY

8
maps/CherrygroveCity.asm
View File

@@ -110,7 +110,7 @@ UnknownScript_0x19c0aa:
UnknownScript_0x19c0ae:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
pause 15
appear CHERRYGROVECITY_SILVER
applymovement CHERRYGROVECITY_SILVER, MovementData_0x19c1ce
@@ -126,7 +126,7 @@ UnknownScript_0x19c0ae:
iftrue UnknownScript_0x19c104
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
setlasttalked $3
scriptedtrainerdata RIVAL1, RIVAL1_3
loadtrainer RIVAL1, RIVAL1_3
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
reloadmapmusic
@@ -137,7 +137,7 @@ UnknownScript_0x19c0ae:
UnknownScript_0x19c0ee:
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
setlasttalked $3
scriptedtrainerdata RIVAL1, RIVAL1_1
loadtrainer RIVAL1, RIVAL1_1
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
reloadmapmusic
@@ -148,7 +148,7 @@ UnknownScript_0x19c0ee:
UnknownScript_0x19c104:
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
setlasttalked $3
scriptedtrainerdata RIVAL1, RIVAL1_2
loadtrainer RIVAL1, RIVAL1_2
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
reloadmapmusic

4
maps/CianwoodCity.asm
View File

@@ -68,7 +68,7 @@ UnknownScript_0x1a001e:
closetext
winlosstext UnknownText_0x1a05a1, 0
setlasttalked $c
scriptedtrainerdata MYSTICALMAN, EUSINE
loadtrainer MYSTICALMAN, EUSINE
startbattle
reloadmapmusic
returnafterbattle
@@ -80,7 +80,7 @@ UnknownScript_0x1a001e:
applymovement CIANWOODCITY_SUPER_NERD, MovementData_0x1a00ec
disappear CIANWOODCITY_SUPER_NERD
pause 20
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
playmapmusic
pause 10
.Done

2
maps/CianwoodGym.asm
View File

@@ -40,7 +40,7 @@ ChuckScript_0x9d60f:
waitbutton
closetext
winlosstext UnknownText_0x9d7f6, 0
scriptedtrainerdata CHUCK, 1
loadtrainer CHUCK, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_CHUCK

2
maps/DragonShrine.asm
View File

@@ -136,7 +136,7 @@ DragonShrineTestScript:
writetext UnknownText_0x18d916
waitbutton
closetext
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2da
loadfont
writetext UnknownText_0x18d974

2
maps/DragonsDenB1F.asm
View File

@@ -81,7 +81,7 @@ UnknownScript_0x18c8f4:
closetext
UnknownScript_0x18c8f9:
applymovement DRAGONSDENB1F_CLAIR, MovementData_0x18c9b3
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
pause 30
special RestartMapMusic
disappear DRAGONSDENB1F_CLAIR

2
maps/EcruteakGym.asm
View File

@@ -34,7 +34,7 @@ MortyScript_0x99d58:
waitbutton
closetext
winlosstext UnknownText_0x9a00a, 0
scriptedtrainerdata MORTY, 1
loadtrainer MORTY, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_MORTY

2
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@@ -88,7 +88,7 @@ SailorScript_0x755f1:
waitbutton
closetext
winlosstext UnknownText_0x75897, 0
scriptedtrainerdata SAILOR, STANLY
loadtrainer SAILOR, STANLY
startbattle
reloadmap
special HealParty

10
maps/FuchsiaGym.asm
View File

@@ -23,7 +23,7 @@ JanineScript_0x195db9:
waitbutton
closetext
winlosstext UnknownText_0x195fa1, 0
scriptedtrainerdata JANINE, 1
loadtrainer JANINE, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_JANINE
@@ -75,7 +75,7 @@ UnknownScript_0x195e2c:
waitbutton
closetext
winlosstext UnknownText_0x196126, 0
scriptedtrainerdata LASS, ALICE
loadtrainer LASS, ALICE
startbattle
iftrue UnknownScript_0x195e4a
returnafterbattle
@@ -109,7 +109,7 @@ UnknownScript_0x195e66:
waitbutton
closetext
winlosstext UnknownText_0x19617b, 0
scriptedtrainerdata LASS, LINDA
loadtrainer LASS, LINDA
startbattle
iftrue UnknownScript_0x195e84
returnafterbattle
@@ -143,7 +143,7 @@ UnknownScript_0x195ea0:
waitbutton
closetext
winlosstext UnknownText_0x1961f1, 0
scriptedtrainerdata PICNICKER, CINDY
loadtrainer PICNICKER, CINDY
startbattle
iftrue UnknownScript_0x195ebe
returnafterbattle
@@ -177,7 +177,7 @@ UnknownScript_0x195eda:
waitbutton
closetext
winlosstext UnknownText_0x19624a, 0
scriptedtrainerdata CAMPER, BARRY
loadtrainer CAMPER, BARRY
startbattle
iftrue UnknownScript_0x195ef8
returnafterbattle

2
maps/GoldenrodGym.asm
View File

@@ -32,7 +32,7 @@ WhitneyScript_0x5400c:
waitbutton
closetext
winlosstext UnknownText_0x541a5, 0
scriptedtrainerdata WHITNEY, 1
loadtrainer WHITNEY, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_WHITNEY

4
maps/IlexForest.asm
View File

@@ -464,14 +464,14 @@ MapIlexForestSignpost4Script:
closetext
pause 20
showemote EMOTE_SHOCK, PLAYER, 20
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
applymovement PLAYER, MovementData_0x6ef58
pause 30
spriteface PLAYER, DOWN
pause 20
clearflag ENGINE_HAVE_EXAMINED_GS_BALL
special Special_CelebiShrineEvent
scriptedpokedata CELEBI, 30
loadwildmon CELEBI, 30
startbattle
returnafterbattle
pause 20

10
maps/IndigoPlateauPokeCenter1F.asm
View File

@@ -63,7 +63,7 @@ UnknownScript_0x180053:
appear INDIGOPLATEAUPOKECENTER1F_SILVER
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
pause 15
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x180164
playmusic MUSIC_RIVAL_ENCOUNTER
@@ -84,7 +84,7 @@ UnknownScript_0x180094:
appear INDIGOPLATEAUPOKECENTER1F_SILVER
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special Special_RotatePalettesRightMusic
special Special_FadeOutMusic
pause 15
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x18016b
playmusic MUSIC_RIVAL_ENCOUNTER
@@ -101,7 +101,7 @@ UnknownScript_0x1800ce:
iftrue UnknownScript_0x180103
winlosstext UnknownText_0x180295, UnknownText_0x1802fd
setlasttalked $5
scriptedtrainerdata RIVAL2, 6
loadtrainer RIVAL2, 6
startbattle
reloadmapmusic
returnafterbattle
@@ -110,7 +110,7 @@ UnknownScript_0x1800ce:
UnknownScript_0x1800f3:
winlosstext UnknownText_0x180295, UnknownText_0x1802fd
setlasttalked $5
scriptedtrainerdata RIVAL2, 4
loadtrainer RIVAL2, 4
startbattle
reloadmapmusic
returnafterbattle
@@ -119,7 +119,7 @@ UnknownScript_0x1800f3:
UnknownScript_0x180103:
winlosstext UnknownText_0x180295, UnknownText_0x1802fd
setlasttalked $5
scriptedtrainerdata RIVAL2, 5
loadtrainer RIVAL2, 5
startbattle
reloadmapmusic
returnafterbattle

2
maps/KarensRoom.asm
View File

@@ -56,7 +56,7 @@ KarenScript_0x180bee:
waitbutton
closetext
winlosstext UnknownText_0x180cf8, 0
scriptedtrainerdata KAREN, 1
loadtrainer KAREN, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_ELITE_4_KAREN

2
maps/KogasRoom.asm
View File

@@ -56,7 +56,7 @@ KogaScript_0x18075a:
waitbutton
closetext
winlosstext UnknownText_0x1808a9, 0
scriptedtrainerdata KOGA, 1
loadtrainer KOGA, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_ELITE_4_KOGA

Some files were not shown because too many files have changed in this diff Show More