Labels for the heal machine; spriteface constants.

This commit is contained in:
yenatch
2015-06-26 23:24:55 -07:00
parent d6f7dc3206
commit c00949dddf
86 changed files with 341 additions and 341 deletions

View File

@@ -2469,7 +2469,7 @@ Function3cfa4: ; 3cfa4
ld a, [BattleType]
cp BATTLETYPE_CANLOSE
jr nz, .asm_3cfe8
predef Functionc658
predef HealParty
.asm_3cfe8
ld a, [wc2cc]
bit 0, a

View File

@@ -43,7 +43,7 @@ SpecialsPointers:: ; c029
add_special Function135db
add_special Functionfbb32
add_special Functionfbcd2
add_special Functionc658
add_special HealParty
add_special Function1559a
add_special Functionc2e7
add_special Function166d6
@@ -78,7 +78,7 @@ SpecialsPointers:: ; c029
add_special WaitSFX
add_special PlayMapMusic
add_special RestartMapMusic
add_special Function12324
add_special HealMachineAnim
add_special Function8379
add_special Functionc25a
add_special Functionc268

View File

@@ -110,10 +110,10 @@ PokeCenterNurseScript:
special Function1060a2
spriteface $fe, LEFT
pause 10
special Functionc658
special HealParty
playmusic MUSIC_NONE
writebyte 0
special Function12324
special HealMachineAnim
pause 30
special RestartMapMusic
spriteface $fe, DOWN

View File

@@ -4082,7 +4082,7 @@ PredefPointers:: ; 856b
add_predef LearnMove ; $0
add_predef Predef1
add_predef Functionc658
add_predef HealParty
add_predef FlagPredef
add_predef Functionc699
add_predef FillPP
@@ -4491,7 +4491,7 @@ _PrintNum:: ; c4c7
; c658
Functionc658: ; c658
HealParty: ; c658
xor a
ld [CurPartyMon], a
ld hl, PartySpecies
@@ -4503,7 +4503,7 @@ Functionc658: ; c658
jr z, .next
push hl
call Functionc677
call HealPartyMon
pop hl
.next
@@ -4516,7 +4516,7 @@ Functionc658: ; c658
ret
; c677
Functionc677: ; c677
HealPartyMon: ; c677
ld a, PartyMon1Species - PartyMon1
call GetPartyParamLocation
ld d, h
@@ -8824,7 +8824,7 @@ Functiondd64: ; dd64
ld a, [PartyCount]
dec a
ld [CurPartyMon], a
callba Functionc677
callba HealPartyMon
ld a, [CurPartyLevel]
ld d, a
callab Function50e47
@@ -12447,7 +12447,7 @@ Function122f8: ; 122f8
ret
; 12324
Function12324: ; 12324
HealMachineAnim: ; 12324
ld a, [PartyCount]
and a
ret z
@@ -12720,7 +12720,7 @@ UnknownScript_0x124ce: ; 0x124ce
closetext
special Function8c084
pause 40
special Functionc658
special HealParty
checkflag $0011
iftrue .script_64f2
callasm HalveMoney
@@ -49489,7 +49489,7 @@ CheckAnyFaintedMon: ; 507fb
; 50821
UnknownScript_0x50821: ; 0x50821
special Functionc658
special HealParty
reloadmappart
playsound SFX_WARP_TO
special Function8c084

View File

@@ -28,23 +28,23 @@ AzaleaTown_MapScriptHeader:
UnknownScript_0x198018:
moveperson $b, $b, $b
spriteface $0, $3
spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
pause 15
appear $b
applymovement $b, MovementData_0x198134
spriteface $0, $0
spriteface $0, DOWN
jump UnknownScript_0x198049
UnknownScript_0x198034:
spriteface $0, $3
spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
pause 15
appear $b
applymovement $b, MovementData_0x19813c
spriteface $0, $1
spriteface $0, UP
UnknownScript_0x198049:
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
@@ -88,7 +88,7 @@ UnknownScript_0x198091:
writetext UnknownText_0x198233
closetext
loadmovesprites
spriteface $0, $2
spriteface $0, LEFT
applymovement $b, MovementData_0x198144
playsound SFX_EXIT_BUILDING
disappear $b
@@ -150,13 +150,13 @@ UnknownScript_0x1980e5:
loadfont
writetext UnknownText_0x1985df
keeptextopen
spriteface $d, $3
spriteface $d, RIGHT
writetext UnknownText_0x19860b
keeptextopen
writetext UnknownText_0x198628
closetext
verbosegiveitem GS_BALL, 1
spriteface $d, $2
spriteface $d, LEFT
setflag $0064
clearevent $06ed
setevent $06eb
@@ -169,7 +169,7 @@ KurtOutsideScript_0x19810c:
loadfont
writetext UnknownText_0x198628
closetext
spriteface $d, $2
spriteface $d, LEFT
loadmovesprites
end

View File

@@ -191,10 +191,10 @@ UnknownScript_0x9e4be: ; 0x9e4be
if_equal $a, UnknownScript_0x9e3fc
if_not_equal $0, UnknownScript_0x9e550
writetext UnknownText_0x9e9eb
spriteface $2, $2
spriteface $2, LEFT
writetext UnknownText_0x9ea1b
closetext
spriteface $2, $0
spriteface $2, DOWN
loadmovesprites
end
; 0x9e4ea
@@ -273,7 +273,7 @@ YoungsterScript_0x9e55d: ; 0x9e55d
writetext UnknownText_0x9f264
closetext
loadmovesprites
spriteface $3, $3
spriteface $3, RIGHT
end
; 0x9e568

View File

@@ -41,7 +41,7 @@ UnknownScript_0x185c0c: ; 0x185c0c
; 0x185c0d
UnknownScript_0x185c0d: ; 0x185c0d
spriteface $3, $0
spriteface $3, DOWN
showemote $0, $3, 15
applymovement $3, MovementData_0x185cd3
loadfont
@@ -57,7 +57,7 @@ UnknownScript_0x185c25: ; 0x185c25
showemote $0, $4, 15
special Functionc48f
pause 15
spriteface $4, $3
spriteface $4, RIGHT
pause 15
applymovement $0, MovementData_0x185ccd
applymovement $4, MovementData_0x185ccf

View File

@@ -34,48 +34,48 @@ UnknownScript_0x18616b: ; 0x18616b
playmusic MUSIC_NONE
pause 30
appear $3
spriteface $0, $1
spriteface $0, UP
pause 5
disappear $6
pause 15
cry RAIKOU
appear $4
spriteface $0, $1
spriteface $0, UP
pause 5
disappear $7
pause 15
cry ENTEI
appear $5
spriteface $0, $1
spriteface $0, UP
pause 5
disappear $8
pause 15
cry SUICUNE
pause 15
playsound SFX_WARP_FROM
spriteface $0, $2
spriteface $0, LEFT
applymovement $3, MovementData_0x186236
disappear $3
waitbutton
playsound SFX_WARP_FROM
spriteface $0, $3
spriteface $0, RIGHT
applymovement $4, MovementData_0x18623b
disappear $4
waitbutton
pause 15
playsound SFX_WARP_FROM
spriteface $0, $1
spriteface $0, UP
applymovement $5, MovementData_0x186241
playsound SFX_WARP_FROM
spriteface $0, $0
spriteface $0, DOWN
applymovement $5, MovementData_0x186248
spriteface $0, $1
spriteface $0, UP
pause 20
cry SUICUNE
pause 30
playsound SFX_WARP_FROM
applymovement $5, MovementData_0x186253
spriteface $0, $0
spriteface $0, DOWN
disappear $5
waitbutton
special RestartMapMusic

View File

@@ -25,7 +25,7 @@ FisherScript_0x73051: ; 0x73051
writetext UnknownText_0x7313a
closetext
loadmovesprites
spriteface $3, $2
spriteface $3, LEFT
end
; 0x73062
@@ -39,7 +39,7 @@ FisherScript_0x73062: ; 0x73062
writetext UnknownText_0x73178
closetext
loadmovesprites
spriteface $4, $3
spriteface $4, RIGHT
end
; 0x73073
@@ -53,7 +53,7 @@ FisherScript_0x73073: ; 0x73073
writetext UnknownText_0x731bd
closetext
loadmovesprites
spriteface $5, $3
spriteface $5, RIGHT
end
; 0x73084
@@ -69,7 +69,7 @@ TeacherScript_0x73084: ; 0x73084
writetext UnknownText_0x73212
closetext
loadmovesprites
spriteface $6, $2
spriteface $6, LEFT
end
; 0x7309a
@@ -78,12 +78,12 @@ UnknownScript_0x7309a: ; 0x7309a
writetext UnknownText_0x73254
closetext
loadmovesprites
spriteface $6, $3
spriteface $6, RIGHT
loadfont
writetext UnknownText_0x73278
closetext
loadmovesprites
spriteface $6, $2
spriteface $6, LEFT
end
; 0x730ad

View File

@@ -21,7 +21,7 @@ GameboyKidScript_0x70d34:
writetext UnknownText_0x70d86
closetext
loadmovesprites
spriteface $4, $0
spriteface $4, DOWN
end
GameboyKidScript_0x70d3f:
@@ -30,7 +30,7 @@ GameboyKidScript_0x70d3f:
writetext UnknownText_0x70dc7
closetext
loadmovesprites
spriteface $5, $0
spriteface $5, DOWN
end
SuperNerdScript_0x70d4a:

View File

@@ -20,7 +20,7 @@ PokefanMScript_0x72123: ; 0x72123
writetext UnknownText_0x72215
closetext
loadmovesprites
spriteface $4, $2
spriteface $4, LEFT
end
; 0x7212e
@@ -30,7 +30,7 @@ TeacherScript_0x7212e: ; 0x7212e
writetext UnknownText_0x72242
closetext
loadmovesprites
spriteface $5, $3
spriteface $5, RIGHT
end
; 0x72139
@@ -40,7 +40,7 @@ FishingGuruScript_0x72139: ; 0x72139
writetext UnknownText_0x72295
closetext
loadmovesprites
spriteface $6, $3
spriteface $6, RIGHT
end
; 0x72144
@@ -63,7 +63,7 @@ FisherScript_0x72144: ; 0x72144
writetext UnknownText_0x72345
closetext
loadmovesprites
spriteface $fe, $2
spriteface $fe, LEFT
end
; 0x72172
@@ -80,7 +80,7 @@ UnknownScript_0x7217b: ; 0x7217b
writetext UnknownText_0x7238a
closetext
loadmovesprites
spriteface $fe, $2
spriteface $fe, LEFT
end
; 0x72184
@@ -88,7 +88,7 @@ UnknownScript_0x72184: ; 0x72184
writetext UnknownText_0x723d9
closetext
loadmovesprites
spriteface $fe, $2
spriteface $fe, LEFT
end
; 0x7218d
@@ -102,7 +102,7 @@ GrampsScript_0x72190: ; 0x72190
writetext UnknownText_0x724ad
closetext
loadmovesprites
spriteface $a, $2
spriteface $a, LEFT
end
; 0x7219b

View File

@@ -45,7 +45,7 @@ CooltrainerFScript_0x18402a:
writetext UnknownText_0x1841fa
closetext
loadmovesprites
spriteface $5, $2
spriteface $5, LEFT
loadfont
writetext UnknownText_0x184229
closetext
@@ -109,7 +109,7 @@ UnknownScript_0x184072:
playsound SFX_TRANSACTION
waitbutton
showemote $0, $7, 15
spriteface $7, $2
spriteface $7, LEFT
loadfont
writetext UnknownText_0x1842ee
closetext

View File

@@ -51,7 +51,7 @@ UnknownScript_0x1883de: ; 0x1883de
waitbutton
special RestartMapMusic
pause 15
spriteface $0, $0
spriteface $0, DOWN
pause 15
end
; 0x188432

View File

@@ -41,28 +41,28 @@ CherrygroveCityGuideGent:
closetext
loadmovesprites
applymovement $2, MovementData_0x19c19b
spriteface $0, $1
spriteface $0, UP
loadfont
writetext GuideGentMartText
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1a3
spriteface $0, $1
spriteface $0, UP
loadfont
writetext GuideGentRoute30Text
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1ac
spriteface $0, $2
spriteface $0, LEFT
loadfont
writetext GuideGentSeaText
closetext
loadmovesprites
applymovement $2, MovementData_0x19c1b6
spriteface $0, $1
spriteface $0, UP
pause 60
spriteface $2, $2
spriteface $0, $3
spriteface $2, LEFT
spriteface $0, RIGHT
loadfont
writetext GuideGentGiftText
keeptextopen
@@ -76,7 +76,7 @@ CherrygroveCityGuideGent:
loadmovesprites
stopfollow
special RestartMapMusic
spriteface $0, $1
spriteface $0, UP
applymovement $2, MovementData_0x19c1cb
playsound SFX_ENTER_DOOR
disappear $2
@@ -101,13 +101,13 @@ UnknownScript_0x19c0aa:
moveperson $3, $27, $7
UnknownScript_0x19c0ae:
spriteface $0, $3
spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
pause 15
appear $3
applymovement $3, MovementData_0x19c1ce
spriteface $0, $3
spriteface $0, RIGHT
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
writetext UnknownText_0x19c4e2
@@ -166,11 +166,11 @@ UnknownScript_0x19c126:
UnknownScript_0x19c12f:
playsound SFX_TACKLE
applymovement $0, MovementData_0x19c1d4
spriteface $0, $2
spriteface $0, LEFT
applymovement $3, MovementData_0x19c1da
disappear $3
dotrigger $0
special Functionc658
special HealParty
playmapmusic
end

View File

@@ -28,12 +28,12 @@ UnknownScript_0x1a001d:
return
UnknownScript_0x1a001e:
spriteface $0, $1
spriteface $0, UP
showemote $0, $0, 15
pause 15
playsound SFX_WARP_FROM
applymovement $d, MovementData_0x1a00da
spriteface $0, $0
spriteface $0, DOWN
pause 15
playsound SFX_WARP_FROM
applymovement $d, MovementData_0x1a00e0

View File

@@ -14,7 +14,7 @@ ChuckScript_0x9d60f: ; 0x9d60f
writetext UnknownText_0x9d6f9
closetext
loadmovesprites
spriteface $2, $3
spriteface $2, RIGHT
loadfont
writetext UnknownText_0x9d76f
closetext

View File

@@ -93,12 +93,12 @@ UnknownScript_0x18d0a9: ; 0x18d0a9
iftrue UnknownScript_0x18d049
UnknownScript_0x18d0cb: ; 0x18d0cb
loadmovesprites
spriteface $2, $2
spriteface $2, LEFT
loadfont
writetext UnknownText_0x18d7f6
closetext
loadmovesprites
spriteface $2, $0
spriteface $2, DOWN
loadfont
writetext UnknownText_0x18d816
closetext
@@ -124,12 +124,12 @@ UnknownScript_0x18d100: ; 0x18d100
playmusic MUSIC_CLAIR
appear $5
waitbutton
spriteface $0, $0
spriteface $0, DOWN
pause 30
applymovement $5, MovementData_0x18d2d4
spriteface $5, $3
spriteface $0, $2
spriteface $2, $2
spriteface $5, RIGHT
spriteface $0, LEFT
spriteface $2, LEFT
loadfont
writetext UnknownText_0x18d916
closetext
@@ -146,7 +146,7 @@ UnknownScript_0x18d100: ; 0x18d100
closetext
loadmovesprites
applymovement $2, MovementData_0x18d2c9
spriteface $5, $1
spriteface $5, UP
loadfont
writetext UnknownText_0x18d520
closetext
@@ -173,9 +173,9 @@ UnknownScript_0x18d100: ; 0x18d100
closetext
loadmovesprites
applymovement $2, MovementData_0x18d2ce
spriteface $5, $1
spriteface $5, UP
applymovement $2, MovementData_0x18d2d1
spriteface $0, $1
spriteface $0, UP
loadfont
writetext UnknownText_0x18d5a3
closetext

View File

@@ -49,7 +49,7 @@ UnknownScript_0x18c8b8: ; 0x18c8b8
pause 30
loadmovesprites
showemote $0, $0, 15
spriteface $0, $2
spriteface $0, LEFT
playmusic MUSIC_CLAIR
applymovement $3, MovementData_0x18c9ae
loadfont

View File

@@ -40,7 +40,7 @@ GameboyKidScript_0x68a86: ; 0x68a86
writetext UnknownText_0x68dda
closetext
loadmovesprites
spriteface $4, $0
spriteface $4, DOWN
end
; 0x68a91
@@ -50,7 +50,7 @@ GameboyKidScript_0x68a91: ; 0x68a91
writetext UnknownText_0x68e07
closetext
loadmovesprites
spriteface $5, $0
spriteface $5, DOWN
end
; 0x68a9c

View File

@@ -26,15 +26,15 @@ UnknownScript_0x98e64: ; 0x98e64
waitbutton
applymovement $6, MovementData_0x98ec5
applymovement $0, MovementData_0x98ed4
spriteface $2, $1
spriteface $2, UP
pause 10
spriteface $2, $0
spriteface $2, DOWN
pause 30
spriteface $2, $1
spriteface $2, UP
pause 10
spriteface $2, $0
spriteface $2, DOWN
pause 20
spriteface $6, $0
spriteface $6, DOWN
pause 10
loadfont
writetext UnknownText_0x98ed8
@@ -46,7 +46,7 @@ UnknownScript_0x98e95: ; 0x98e95
writetext UnknownText_0x98f22
closetext
loadmovesprites
spriteface $0, $0
spriteface $0, DOWN
applymovement $6, MovementData_0x98ece
playsound SFX_EXIT_BUILDING
disappear $6

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