diff options
| author | yenatch <yenatch@gmail.com> | 2015-06-26 23:24:55 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-06-26 23:24:55 -0700 |
| commit | c00949dddf8498eb6483487792332f10dd074386 (patch) | |
| tree | b76277ccd89e5154a62f018858c9c1ebc4aeba1e | |
| parent | d6f7dc320612eccf9397df3d0777fcea9c589b4d (diff) | |
Labels for the heal machine; spriteface constants.
86 files changed, 341 insertions, 341 deletions
diff --git a/battle/core.asm b/battle/core.asm index c522bbd85..0d2f5f6d7 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -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 diff --git a/engine/specials.asm b/engine/specials.asm index 066767025..35af3160d 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -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 diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 7e6c3186a..fbe05c4e2 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -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 @@ -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 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 15bdcf56b..1e28fc03e 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -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 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index e03946cb1..73b5a1e80 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -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 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 06e4e526e..99c6f9934 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -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 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index c97adb11d..2810fdecb 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -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 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index e31136c60..7e7e96bed 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -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 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 10a537f9e..0a7dbf471 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -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: diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index f841c3769..be4d764d7 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -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 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index b6da8e22f..04b307b6a 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -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 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index b279a4310..42e2070a1 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -51,7 +51,7 @@ UnknownScript_0x1883de: ; 0x1883de waitbutton special RestartMapMusic pause 15 - spriteface $0, $0 + spriteface $0, DOWN pause 15 end ; 0x188432 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 0b2b1cf2f..f0f8401ad 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -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 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index ced71f656..46261da85 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -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 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index e924cf219..4f54f8bfe 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -14,7 +14,7 @@ ChuckScript_0x9d60f: ; 0x9d60f writetext UnknownText_0x9d6f9 closetext loadmovesprites - spriteface $2, $3 + spriteface $2, RIGHT loadfont writetext UnknownText_0x9d76f closetext diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 0cfec0681..0106c8062 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -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 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index c5e8344c8..aa241b968 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -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 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 6f5e7492c..27d0cce6c 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -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 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 3c5b9ec41..551871d60 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -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 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index f75441d63..5736a48bb 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -54,7 +54,7 @@ UnknownScript_0x78b8b: ; 0x78b8b UnknownScript_0x78b8c: ; 0x78b8c applymovement $0, MovementData_0x78f67 showemote $0, $2, 15 - spriteface $2, $3 + spriteface $2, RIGHT loadfont writetext UnknownText_0x78fb6 UnknownScript_0x78b9b: ; 0x78b9b @@ -73,20 +73,20 @@ UnknownScript_0x78ba5: ; 0x78ba5 playsound SFX_GLASS_TING pause 30 showemote $0, $2, 10 - spriteface $2, $0 + spriteface $2, DOWN loadfont writetext UnknownText_0x791ae closetext loadmovesprites loadfont - spriteface $2, $3 + spriteface $2, RIGHT writetext UnknownText_0x791df closetext loadmovesprites applymovement $2, MovementData_0x78fa0 - spriteface $0, $1 + spriteface $0, UP applymovement $2, MovementData_0x78fa2 - spriteface $0, $3 + spriteface $0, RIGHT loadfont writetext UnknownText_0x792ff closetext @@ -159,7 +159,7 @@ UnknownScript_0x78c41: ; 0x78c41 ; 0x78c65 LabTryToLeaveScript: ; 0x78c65 - spriteface $2, $0 + spriteface $2, DOWN loadfont writetext LabWhereGoingText closetext @@ -171,7 +171,7 @@ LabTryToLeaveScript: ; 0x78c65 CyndaquilPokeBallScript: ; 0x78c73 checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript - spriteface $2, $0 + spriteface $2, DOWN refreshscreen $0 pokepic CYNDAQUIL cry CYNDAQUIL @@ -202,7 +202,7 @@ CyndaquilPokeBallScript: ; 0x78c73 TotodilePokeBallScript: ; 0x78cb5 checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript - spriteface $2, $0 + spriteface $2, DOWN refreshscreen $0 pokepic TOTODILE cry TOTODILE @@ -231,7 +231,7 @@ TotodilePokeBallScript: ; 0x78cb5 ChikoritaPokeBallScript: ; 0x78cf1 checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript - spriteface $2, $0 + spriteface $2, DOWN refreshscreen $0 pokepic CHIKORITA cry CHIKORITA @@ -265,7 +265,7 @@ DidntChooseStarterScript: ; 0x78d2d ; 0x78d33 ElmDirectionsScript: ; 0x78d33 - spriteface $0, $1 + spriteface $0, UP loadfont writetext ElmDirectionsText1 closetext @@ -277,12 +277,12 @@ ElmDirectionsScript: ; 0x78d33 waitbutton closetext loadmovesprites - spriteface $2, $2 + spriteface $2, LEFT loadfont writetext ElmDirectionsText2 closetext loadmovesprites - spriteface $2, $0 + spriteface $2, DOWN loadfont writetext ElmDirectionsText3 closetext @@ -328,10 +328,10 @@ ElmsLabHealingMachine: UnknownScript_0x78d8a: ; 0x78d8a special Function1060a2 - special Functionc658 + special HealParty playmusic MUSIC_NONE writebyte $1 - special Function12324 + special HealMachineAnim pause 30 special RestartMapMusic loadmovesprites @@ -494,7 +494,7 @@ UnknownScript_0x78e79: ; 0x78e79 UnknownScript_0x78e7f: ; 0x78e7f applymovement $3, MovementData_0x78f7e - spriteface $0, $0 + spriteface $0, DOWN scall UnknownScript_0x78e9d applymovement $3, MovementData_0x78f87 end @@ -502,7 +502,7 @@ UnknownScript_0x78e7f: ; 0x78e7f UnknownScript_0x78e8e: ; 0x78e8e applymovement $3, MovementData_0x78f82 - spriteface $0, $0 + spriteface $0, DOWN scall UnknownScript_0x78e9d applymovement $3, MovementData_0x78f8b end @@ -522,7 +522,7 @@ UnknownScript_0x78e9d: ; 0x78e9d UnknownScript_0x78ead: ; 0x78ead applymovement $3, MovementData_0x78f7e - spriteface $0, $0 + spriteface $0, DOWN scall UnknownScript_0x78ecb applymovement $3, MovementData_0x78f87 end @@ -530,7 +530,7 @@ UnknownScript_0x78ead: ; 0x78ead UnknownScript_0x78ebc: ; 0x78ebc applymovement $3, MovementData_0x78f82 - spriteface $0, $0 + spriteface $0, DOWN scall UnknownScript_0x78ecb applymovement $3, MovementData_0x78f8b end @@ -598,7 +598,7 @@ UnknownScript_0x78f12: ; 0x78f12 MeetCopScript: ; 0x78f16 applymovement $0, MovementData_0x78f74 CopScript: ; 0x78f1a - spriteface $7, $2 + spriteface $7, LEFT loadfont writetext UnknownText_0x7a0f0 keeptextopen diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 6f8f2c513..34c156e38 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -144,7 +144,7 @@ UnknownScript_0x751eb: ; 0x751eb writetext UnknownText_0x75412 closetext loadmovesprites - spriteface $0, $3 + spriteface $0, RIGHT applymovement $5, MovementData_0x75222 disappear $5 dotrigger $0 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 9d16bd081..f23610f00 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -191,7 +191,7 @@ SailorScript_0x755f1: ; 0x755f1 loadtrainer SAILOR, STANLY startbattle reloadmap - special Functionc658 + special HealParty setevent $057d loadfont writetext UnknownText_0x758b1 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 316c9d298..90556c526 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -29,7 +29,7 @@ UnknownScript_0x75eb5: ; 0x75eb5 ; 0x75ebb TwinScript_0x75ebb: ; 0x75ebb - spriteface $5, $3 + spriteface $5, RIGHT loadfont writetext UnknownText_0x761e0 closetext @@ -45,13 +45,13 @@ TwinScript_0x75ebb: ; 0x75ebb applymovement $0, MovementData_0x76004 moveperson $4, $3, $13 appear $4 - spriteface $0, $1 - spriteface $4, $1 + spriteface $0, UP + spriteface $4, UP special Function8c0ab - spriteface $3, $0 + spriteface $3, DOWN showemote $0, $3, 15 applymovement $4, MovementData_0x7600c - spriteface $3, $3 + spriteface $3, RIGHT checkflag $0063 iftrue UnknownScript_0x75f03 loadfont @@ -67,7 +67,7 @@ UnknownScript_0x75f03: ; 0x75f03 closetext loadmovesprites UnknownScript_0x75f09: ; 0x75f09 - spriteface $5, $0 + spriteface $5, DOWN applymovement $3, MovementData_0x76010 loadfont writetext UnknownText_0x76143 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index ea85b8851..5c8027b26 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -140,7 +140,7 @@ FastShipBed: special Function8c0b6 special Functiond91 special Function1060a2 - special Functionc658 + special HealParty playmusic MUSIC_HEAL pause 60 special RestartMapMusic diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 6042ed76c..24a5ee167 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -200,7 +200,7 @@ RocketScript_0x198a1a: writetext UnknownText_0x198d2a closetext loadmovesprites - spriteface $9, $1 + spriteface $9, UP end RocketScript_0x198a29: diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 6f3eef57d..214865c77 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -24,7 +24,7 @@ GameboyKidScript_0x55ef7: writetext UnknownText_0x55f74 closetext loadmovesprites - spriteface $5, $0 + spriteface $5, DOWN end GoldenrodDeptStore4FDirectory: diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index e6348490e..d786e33b3 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -55,7 +55,7 @@ FisherScript_0x56749: ; 0x56749 writetext UnknownText_0x567d2 closetext loadmovesprites - spriteface $4, $1 + spriteface $4, UP end ; 0x56754 @@ -68,12 +68,12 @@ SuperNerdScript_0x56757: ; 0x56757 writetext UnknownText_0x56867 closetext loadmovesprites - spriteface $6, $1 + spriteface $6, UP loadfont writetext UnknownText_0x56871 closetext loadmovesprites - spriteface $6, $3 + spriteface $6, RIGHT end ; 0x5676a diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 0de3018f3..9e453e5c4 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -30,7 +30,7 @@ TeacherScript_0x5535d: ; 0x5535d ; 0x5538f UnknownScript_0x5538f: ; 0x5538f - spriteface $2, $2 + spriteface $2, LEFT loadfont writetext UnknownText_0x5552e closetext diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 1a54b2de5..32b03d65e 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -37,7 +37,7 @@ PokefanMScript_0x56c1a: ; 0x56c1a writetext UnknownText_0x5718a closetext loadmovesprites - spriteface $d, $3 + spriteface $d, RIGHT end ; 0x56c25 @@ -262,7 +262,7 @@ PharmacistScript_0x56df1: ; 0x56df1 writetext UnknownText_0x56f55 closetext loadmovesprites - spriteface $fe, $2 + spriteface $fe, LEFT end ; 0x56dfc @@ -272,7 +272,7 @@ PokefanMScript_0x56dfc: ; 0x56dfc writetext UnknownText_0x56f9e closetext loadmovesprites - spriteface $7, $3 + spriteface $7, RIGHT end ; 0x56e07 @@ -282,7 +282,7 @@ CooltrainerMScript_0x56e07: ; 0x56e07 writetext UnknownText_0x56ff4 closetext loadmovesprites - spriteface $8, $2 + spriteface $8, LEFT end ; 0x56e12 @@ -292,7 +292,7 @@ PokefanFScript_0x56e12: ; 0x56e12 writetext UnknownText_0x5702b closetext loadmovesprites - spriteface $9, $3 + spriteface $9, RIGHT end ; 0x56e1d @@ -306,7 +306,7 @@ GentlemanScript_0x56e20: ; 0x56e20 writetext UnknownText_0x570b1 closetext loadmovesprites - spriteface $b, $3 + spriteface $b, RIGHT end ; 0x56e2b diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index c11adf2ea..90ba6a051 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -127,7 +127,7 @@ LassCarrieScript: ; 0x54098 WhitneyCriesScript: ; 0x540a0 showemote $0, $4, 15 applymovement $4, BridgetWalksUpMovement - spriteface $0, $0 + spriteface $0, DOWN loadfont writetext BridgetWhitneyCriesText closetext diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index 2722dcff2..cc3fe2b68 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -26,7 +26,7 @@ UnknownScript_0x60f9e: ; 0x60f9e appear $3 playmusic MUSIC_SHOW_ME_AROUND applymovement $3, MovementData_0x6105a - spriteface $0, $1 + spriteface $0, UP loadfont writetext UnknownText_0x622f0 closetext @@ -60,7 +60,7 @@ UnknownScript_0x60fe3: ; 0x60fe3 appear $3 playmusic MUSIC_SHOW_ME_AROUND applymovement $3, MovementData_0x61065 - spriteface $0, $1 + spriteface $0, UP loadfont writetext UnknownText_0x622f0 closetext diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index a80947655..9d80e7acd 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -23,17 +23,17 @@ UnknownScript_0x181454: ; 0x181454 follow $2, $0 applymovement $2, MovementData_0x181499 stopfollow - spriteface $0, $3 + spriteface $0, RIGHT loadfont writetext UnknownText_0x1814a6 closetext loadmovesprites - spriteface $2, $1 + spriteface $2, UP applymovement $0, MovementData_0x1814a4 dotrigger $1 pause 15 writebyte $2 - special Function12324 + special HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER @@ -41,7 +41,7 @@ UnknownScript_0x181454: ; 0x181454 setevent $0737 clearevent $0738 domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1 - special Functionc658 + special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue UnknownScript_0x181497 specialphonecall $5 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index e4fb85aae..c4a63eae8 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -526,7 +526,7 @@ UnknownScript_0x6ee42: ; 0x6ee42 special Functionc48f applymovement $0, MovementData_0x6ef58 pause 30 - spriteface $0, $0 + spriteface $0, DOWN pause 20 clearflag $0064 special Function4989a diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 5a8039b27..b09f0b1d4 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -56,13 +56,13 @@ UnknownScript_0x180053: ; 0x180053 if_equal SATURDAY, UnknownScript_0x18012b moveperson $5, $11, $9 appear $5 - spriteface $0, $0 + spriteface $0, DOWN showemote $0, $0, 15 special Functionc48f pause 15 applymovement $5, MovementData_0x180164 playmusic MUSIC_RIVAL_ENCOUNTER - spriteface $0, $3 + spriteface $0, RIGHT jump UnknownScript_0x1800ce ; 0x180094 @@ -78,13 +78,13 @@ UnknownScript_0x180094: ; 0x180094 if_equal FRIDAY, UnknownScript_0x18012b if_equal SATURDAY, UnknownScript_0x18012b appear $5 - spriteface $0, $0 + spriteface $0, DOWN showemote $0, $0, 15 special Functionc48f pause 15 applymovement $5, MovementData_0x18016b playmusic MUSIC_RIVAL_ENCOUNTER - spriteface $0, $2 + spriteface $0, LEFT UnknownScript_0x1800ce: ; 0x1800ce loadfont writetext UnknownText_0x1801f5 @@ -130,7 +130,7 @@ UnknownScript_0x180113: ; 0x180113 writetext UnknownText_0x1802a4 closetext loadmovesprites - spriteface $0, $0 + spriteface $0, DOWN applymovement $5, MovementData_0x180172 disappear $5 dotrigger $0 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index f91fed524..938338c6b 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -25,7 +25,7 @@ UnknownScript_0x7a4d8: ; 0x7a4d8 UnknownScript_0x7a4db: ; 0x7a4db playmusic MUSIC_MOM showemote $0, $2, 15 - spriteface $0, $2 + spriteface $0, LEFT checkevent $0000 iffalse UnknownScript_0x7a4f2 applymovement $2, MovementData_0x7a5fc @@ -105,7 +105,7 @@ UnknownScript_0x7a564: ; 0x7a564 UnknownScript_0x7a56b: ; 0x7a56b special RestartMapMusic - spriteface $2, $2 + spriteface $2, LEFT end ; 0x7a572 @@ -196,7 +196,7 @@ NeighborScript: writetext NeighborText closetext loadmovesprites - spriteface $6, $3 + spriteface $6, RIGHT end TVScript: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index cfce2cbf0..a32aff0ae 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -47,7 +47,7 @@ KurtScript_0x18e178: ; 0x18e178 setevent $06fa checkcode $9 if_equal $1, UnknownScript_0x18e1ab - spriteface $0, $0 + spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e466 playsound SFX_EXIT_BUILDING @@ -58,7 +58,7 @@ KurtScript_0x18e178: ; 0x18e178 ; 0x18e1ab UnknownScript_0x18e1ab: ; 0x18e1ab - spriteface $0, $0 + spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e46c playsound SFX_EXIT_BUILDING @@ -324,14 +324,14 @@ UnknownScript_0x18e378: ; 0x18e378 showemote $0, $2, 30 checkcode $9 if_equal $1, UnknownScript_0x18e3a2 - spriteface $0, $0 + spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e466 jump UnknownScript_0x18e3ac ; 0x18e3a2 UnknownScript_0x18e3a2: ; 0x18e3a2 - spriteface $0, $0 + spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e46c UnknownScript_0x18e3ac: ; 0x18e3ac @@ -355,7 +355,7 @@ UnknownScript_0x18e3c5: ; 0x18e3c5 writetext UnknownText_0x18e7d8 closetext loadmovesprites - spriteface $5, $1 + spriteface $5, UP end ; 0x18e3d4 @@ -363,7 +363,7 @@ UnknownScript_0x18e3d4: ; 0x18e3d4 writetext UnknownText_0x18e863 closetext loadmovesprites - spriteface $5, $1 + spriteface $5, UP setevent $00bb end ; 0x18e3e0 @@ -371,7 +371,7 @@ UnknownScript_0x18e3d4: ; 0x18e3d4 UnknownScript_0x18e3e0: ; 0x18e3e0 writetext UnknownText_0x18e934 closetext - spriteface $5, $1 + spriteface $5, UP writetext UnknownText_0x18e949 closetext loadmovesprites @@ -428,14 +428,14 @@ KurtsGranddaughter2Subscript: writetext KurtsGranddaughterHelpText closetext loadmovesprites - spriteface $6, $3 + spriteface $6, RIGHT end .GSBall writetext KurtsGranddaughterGSBallText closetext loadmovesprites - spriteface $6, $3 + spriteface $6, RIGHT end KurtsGranddaughterFunScript: ; 0x18e448 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index e83e26c7e..313bdb623 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -58,7 +58,7 @@ UnknownScript_0x180e74: ; 0x180e74 special Functionc48f applymovement $0, MovementData_0x180f3c LanceScript_0x180e7b: ; 0x180e7b - spriteface $2, $2 + spriteface $2, LEFT loadfont writetext UnknownText_0x180f67 closetext @@ -82,9 +82,9 @@ LanceScript_0x180e7b: ; 0x180e7b musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10 pause 30 showemote $0, $2, 15 - spriteface $2, $0 + spriteface $2, DOWN pause 10 - spriteface $0, $0 + spriteface $0, DOWN appear $3 applymovement $3, MovementData_0x180f41 loadfont @@ -96,27 +96,27 @@ LanceScript_0x180e7b: ; 0x180e7b follow $3, $4 applymovement $3, MovementData_0x180f49 stopfollow - spriteface $4, $1 - spriteface $2, $2 + spriteface $4, UP + spriteface $2, LEFT loadfont writetext UnknownText_0x18121b closetext loadmovesprites applymovement $3, MovementData_0x180f4c - spriteface $0, $2 + spriteface $0, LEFT loadfont writetext UnknownText_0x18134b closetext loadmovesprites applymovement $2, MovementData_0x180f4f - spriteface $0, $1 + spriteface $0, UP loadfont writetext UnknownText_0x18137b closetext loadmovesprites follow $2, $0 - spriteface $3, $1 - spriteface $4, $1 + spriteface $3, UP + spriteface $4, UP applymovement $2, MovementData_0x180f53 stopfollow playsound SFX_EXIT_BUILDING diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 2cb6a8888..b7100eedf 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -100,7 +100,7 @@ UnknownScript_0x6c38f: ; 0x6c38f reloadmappart loadmovesprites setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART - spriteface $4, $2 + spriteface $4, LEFT loadfont writetext UnknownText_0x6c5ba closetext diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 534a6cffb..a0a38117c 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -28,7 +28,7 @@ UnknownScript_0x190013: follow $0, $2 applymovement $0, MovementData_0x1900a7 stopfollow - spriteface $0, $3 + spriteface $0, RIGHT scall UnknownScript_0x19002f applymovement $2, MovementData_0x1900ad end diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 89c617f06..bb8addd68 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x1935f4: ; 0x1935f4 refreshscreen $0 UnknownScript_0x19360d: ; 0x19360d special Function1060a2 - special Functionc658 + special HealParty special Function10383c iftrue UnknownScript_0x193624 UnknownScript_0x193619: ; 0x193619 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 73d0cb770..c2d1f8175 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -20,7 +20,7 @@ UnknownScript_0x7408d: ; 0x7408d ; 0x7408e UnknownScript_0x7408e: ; 0x7408e - spriteface $0, $3 + spriteface $0, RIGHT showemote $0, $0, 15 special Functionc48f pause 15 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 9946ec734..c4a64a986 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -41,7 +41,7 @@ UnknownScript_0x7709a: ; 0x7709a applymovement $0, MovementData_0x77121 pause 15 appear $4 - spriteface $2, $3 + spriteface $2, RIGHT cry CLEFAIRY waitbutton pause 30 @@ -61,10 +61,10 @@ UnknownScript_0x7709a: ; 0x7709a follow $2, $3 applymovement $2, MovementData_0x77132 stopfollow - spriteface $2, $0 + spriteface $2, DOWN pause 10 showemote $0, $2, 15 - spriteface $2, $0 + spriteface $2, DOWN cry CLEFAIRY pause 15 follow $2, $3 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 637a6513a..282cfbdfb 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -21,7 +21,7 @@ UnknownScript_0x196e55: ; 0x196e55 UnknownScript_0x196e56: ; 0x196e56 showemote $0, $2, 15 - spriteface $2, $0 + spriteface $2, DOWN loadfont writetext UnknownText_0x196f66 closetext @@ -40,11 +40,11 @@ UnknownScript_0x196e56: ; 0x196e56 blackoutmod GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY writetext UnknownText_0x196feb keeptextopen - spriteface $2, $3 + spriteface $2, RIGHT writetext UnknownText_0x197092 keeptextopen - spriteface $2, $0 - spriteface $3, $2 + spriteface $2, DOWN + spriteface $3, LEFT writetext UnknownText_0x1970b7 closetext loadmovesprites @@ -92,7 +92,7 @@ UnknownScript_0x196ec7: ; 0x196ec7 UnknownScript_0x196ec9: ; 0x196ec9 playmusic MUSIC_PROF_OAK applymovement $3, MovementData_0x196f5d - spriteface $0, $3 + spriteface $0, RIGHT loadfont writetext UnknownText_0x197185 keeptextopen @@ -104,14 +104,14 @@ UnknownScript_0x196ec9: ; 0x196ec9 writetext UnknownText_0x1973de closetext loadmovesprites - spriteface $0, $0 + spriteface $0, DOWN applymovement $3, MovementData_0x196f61 playsound SFX_EXIT_BUILDING disappear $3 waitbutton special RestartMapMusic pause 15 - spriteface $0, $1 + spriteface $0, UP loadfont writetext UnknownText_0x1970ed closetext @@ -120,7 +120,7 @@ UnknownScript_0x196ec9: ; 0x196ec9 special Functiond91 playmusic MUSIC_HEAL special Function1060a2 - special Functionc658 + special HealParty pause 60 special Function8c0ab special RestartMapMusic diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 90ac78de5..e936aa0af 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -60,7 +60,7 @@ GameboyKidScript_0x5c037: ; 0x5c037 writetext UnknownText_0x5c42a closetext loadmovesprites - spriteface $e, $0 + spriteface $e, DOWN end ; 0x5c042 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 48204c7f4..9c521c31a 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -25,12 +25,12 @@ NewBarkTown_MapScriptHeader: UnknownScript_0x1a8016: playmusic MUSIC_MOM - spriteface $2, $2 + spriteface $2, LEFT loadfont writetext UnknownText_0x1a8134 closetext loadmovesprites - spriteface $0, $3 + spriteface $0, RIGHT applymovement $2, MovementData_0x1a80d4 loadfont writetext UnknownText_0x1a813e @@ -48,14 +48,14 @@ UnknownScript_0x1a8016: UnknownScript_0x1a8041: playmusic MUSIC_MOM - spriteface $2, $2 + spriteface $2, LEFT loadfont writetext UnknownText_0x1a8134 closetext loadmovesprites - spriteface $0, $3 + spriteface $0, RIGHT applymovement $2, MovementData_0x1a80d9 - spriteface $0, $1 + spriteface $0, UP loadfont writetext UnknownText_0x1a813e closetext @@ -110,7 +110,7 @@ SilverScript_0x1a809e: writetext UnknownText_0x1a82a6 closetext loadmovesprites - spriteface $4, $2 + spriteface $4, LEFT loadfont writetext UnknownText_0x1a82cd closetext @@ -119,7 +119,7 @@ SilverScript_0x1a809e: applymovement $0, MovementData_0x1a80ed stopfollow pause 5 - spriteface $4, $0 + spriteface $4, DOWN pause 5 playsound SFX_TACKLE applymovement $0, MovementData_0x1a80f0 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index c2fc5448f..160e8cf5e 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -23,7 +23,7 @@ OlivineCity_MapScriptHeader: return UnknownScript_0x1a8833: - spriteface $0, $2 + spriteface $0, LEFT showemote $0, $0, 15 special Functionc48f pause 15 @@ -37,7 +37,7 @@ UnknownScript_0x1a8833: closetext loadmovesprites applymovement $0, MovementData_0x1a88f4 - spriteface $0, $3 + spriteface $0, RIGHT applymovement $5, MovementData_0x1a88db dotrigger $1 disappear $5 @@ -47,7 +47,7 @@ UnknownScript_0x1a8833: end UnknownScript_0x1a886b: - spriteface $0, $2 + spriteface $0, LEFT showemote $0, $0, 15 special Functionc48f pause 15 @@ -61,7 +61,7 @@ UnknownScript_0x1a886b: closetext loadmovesprites applymovement $0, MovementData_0x1a88f7 - spriteface $0, $3 + spriteface $0, RIGHT applymovement $5, MovementData_0x1a88e8 disappear $5 dotrigger $1 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index f1bf0c5fd..e23eb7eee 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -33,9 +33,9 @@ UnknownScript_0x60bab: ; 0x60bab writetext UnknownText_0x60dea closetext loadmovesprites - spriteface $2, $3 + spriteface $2, RIGHT pause 15 - spriteface $3, $2 + spriteface $3, LEFT loadfont playmusic MUSIC_HEAL writetext UnknownText_0x60e44 @@ -51,13 +51,13 @@ UnknownScript_0x60bab: ; 0x60bab writetext UnknownText_0x60f3d closetext loadmovesprites - spriteface $3, $3 + spriteface $3, RIGHT pause 10 - spriteface $3, $2 + spriteface $3, LEFT pause 10 - spriteface $3, $3 + spriteface $3, RIGHT pause 10 - spriteface $3, $2 + spriteface $3, LEFT pause 10 faceplayer loadfont @@ -90,9 +90,9 @@ UnknownScript_0x60c25: ; 0x60c25 writetext UnknownText_0x60edf closetext loadmovesprites - spriteface $2, $3 + spriteface $2, RIGHT pause 15 - spriteface $3, $2 + spriteface $3, LEFT loadfont writetext UnknownText_0x60ef1 closetext diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index e24328528..01f8c5526 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -36,7 +36,7 @@ SailorScript_0x748c0: ; 0x748c0 writetext UnknownText_0x74a55 closetext loadmovesprites - spriteface $2, $0 + spriteface $2, DOWN pause 10 playsound SFX_EXIT_BUILDING disappear $2 @@ -74,12 +74,12 @@ UnknownScript_0x74919: ; 0x74919 ; 0x7491f UnknownScript_0x7491f: ; 0x7491f - spriteface $4, $3 + spriteface $4, RIGHT checkevent $0000 iftrue UnknownScript_0x7498b checkevent $0001 iftrue UnknownScript_0x7498b - spriteface $0, $2 + spriteface $0, LEFT loadfont checkevent $0030 iffalse UnknownScript_0x7494e @@ -215,7 +215,7 @@ FishingGuruScript_0x74a01: ; 0x74a01 writetext UnknownText_0x74bf4 closetext loadmovesprites - spriteface $5, $1 + spriteface $5, UP end ; 0x74a0c @@ -225,7 +225,7 @@ FishingGuruScript_0x74a0c: ; 0x74a0c writetext UnknownText_0x74c35 closetext loadmovesprites - spriteface $6, $1 + spriteface $6, UP end ; 0x74a17 @@ -235,7 +235,7 @@ YoungsterScript_0x74a17: ; 0x74a17 writetext UnknownText_0x74c76 closetext loadmovesprites - spriteface $7, $0 + spriteface $7, DOWN end ; 0x74a22 @@ -245,7 +245,7 @@ CooltrainerFScript_0x74a22: ; 0x74a22 writetext UnknownText_0x74ca2 closetext loadmovesprites - spriteface $8, $0 + spriteface $8, DOWN end ; 0x74a2d diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 8bd060f52..ad6314ede 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -475,7 +475,7 @@ UnknownScript_0x192b12: ; 0x192b12 closetext loadmovesprites applymovement2 MovementData_0x192cdc - spriteface $0, $2 + spriteface $0, LEFT loadfont writetext UnknownText_0x193278 closetext @@ -592,7 +592,7 @@ UnknownScript_0x192c11: ; 0x192c11 loadmovesprites checkcode $9 if_not_equal $1, UnknownScript_0x192c20 - spriteface $0, $2 + spriteface $0, LEFT UnknownScript_0x192c20: ; 0x192c20 loadfont writetext UnknownText_0x193278 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 236285658..f06af7c3c 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -24,19 +24,19 @@ UnknownScript_0x188dc5: ; 0x188dc5 waitbutton pause 30 applymovement $2, MovementData_0x188ed5 - spriteface $3, $0 - spriteface $4, $0 + spriteface $3, DOWN + spriteface $4, DOWN loadfont writetext UnknownText_0x188f22 closetext loadmovesprites - spriteface $2, $2 - spriteface $0, $3 + spriteface $2, LEFT + spriteface $0, RIGHT loadfont writetext UnknownText_0x188f7f closetext loadmovesprites - spriteface $0, $0 + spriteface $0, DOWN applymovement $2, MovementData_0x188eda dotrigger $0 end diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 8e643ddb0..e44f1952e 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -189,17 +189,17 @@ Buena: writetext UnknownText_0x5de84 closetext loadmovesprites - spriteface $b, $3 + spriteface $b, RIGHT checkcode $9 if_not_equal $3, UnknownScript_0x5d7be applymovement $0, MovementData_0x5d921 UnknownScript_0x5d7be: ; 0x5d7be - spriteface $0, $3 + spriteface $0, RIGHT loadfont writetext UnknownText_0x5dedd closetext loadmovesprites - spriteface $b, $0 + spriteface $b, DOWN refreshscreen $0 special SpecialBuenasPassword loadmovesprites @@ -215,7 +215,7 @@ UnknownScript_0x5d7be: ; 0x5d7be playsound SFX_TRANSACTION setflag $0060 pause 20 - spriteface $b, $3 + spriteface $b, RIGHT loadfont writetext UnknownText_0x5e054 closetext @@ -242,7 +242,7 @@ UnknownScript_0x5d80a: ; 0x5d80a checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d81a: ; 0x5d81a - spriteface $b, $3 + spriteface $b, RIGHT end ; 0x5d81e @@ -250,7 +250,7 @@ UnknownScript_0x5d81e: ; 0x5d81e writetext UnknownText_0x5df29 closetext loadmovesprites - spriteface $b, $3 + spriteface $b, RIGHT special Functionc48f pause 20 special RestartMapMusic @@ -266,7 +266,7 @@ UnknownScript_0x5d82f: ; 0x5d82f checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d83f: ; 0x5d83f - spriteface $b, $3 + spriteface $b, RIGHT pause 10 end ; 0x5d845 @@ -277,13 +277,13 @@ UnknownScript_0x5d845: ; 0x5d845 writetext UnknownText_0x5e01c closetext loadmovesprites - spriteface $b, $3 + spriteface $b, RIGHT pause 20 loadfont writetext UnknownText_0x5e054 closetext loadmovesprites - spriteface $b, $3 + spriteface $b, RIGHT special Functionc48f pause 20 special RestartMapMusic @@ -306,7 +306,7 @@ UnknownScript_0x5d86b: ; 0x5d86b checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d87b: ; 0x5d87b - spriteface $b, $3 + spriteface $b, RIGHT end ; 0x5d87f @@ -319,7 +319,7 @@ UnknownScript_0x5d87f: ; 0x5d87f checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d88f: ; 0x5d88f - spriteface $b, $3 + spriteface $b, RIGHT end ; 0x5d893 @@ -339,9 +339,9 @@ UnknownScript_0x5d8a4: ; 0x5d8a4 checkcellnum $25 iftrue UnknownScript_0x5d8fe pause 20 - spriteface $b, $0 + spriteface $b, DOWN pause 15 - spriteface $0, $1 + spriteface $0, UP pause 15 checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc @@ -367,7 +367,7 @@ UnknownScript_0x5d8d0: ; 0x5d8d0 writetext UnknownText_0x5e310 closetext loadmovesprites - spriteface $b, $3 + spriteface $b, RIGHT addcellnum $25 end ; 0x5d8ed @@ -376,7 +376,7 @@ UnknownScript_0x5d8ed: ; 0x5d8ed writetext UnknownText_0x5e33c closetext loadmovesprites - spriteface $b, $3 + spriteface $b, RIGHT end ; 0x5d8f6 @@ -384,7 +384,7 @@ UnknownScript_0x5d8f6: ; 0x5d8f6 writetext UnknownText_0x5e35e closetext loadmovesprites - spriteface $b, $3 + spriteface $b, RIGHT UnknownScript_0x5d8fe: ; 0x5d8fe end ; 0x5d8ff diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 50cbbd773..8257692f1 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -24,7 +24,7 @@ UnknownScript_0x60010: ; 0x60010 ; 0x60011 UnknownScript_0x60011: ; 0x60011 - spriteface $2, $1 + spriteface $2, UP showemote $0, $2, 15 loadfont writetext UnknownText_0x60128 @@ -100,7 +100,7 @@ Executivef1Script: ; 0x60066 UnknownScript_0x6006e: ; 0x6006e applymovement $0, MovementData_0x60125 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $3, $3 + spriteface $3, RIGHT loadfont writetext UnknownText_0x603d1 closetext @@ -137,7 +137,7 @@ UnknownScript_0x6006e: ; 0x6006e moveperson $2, $c, $0 appear $2 applymovement $2, MovementData_0x6010f - spriteface $0, $3 + spriteface $0, RIGHT loadfont writetext UnknownText_0x605b2 keeptextopen diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index d306bda8a..e3ee47716 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -25,7 +25,7 @@ UnknownScript_0x733ed: ; 0x733ed UnknownScript_0x733f3: ; 0x733f3 showemote $0, $2, 15 - spriteface $0, $1 + spriteface $0, UP loadfont writetext UnknownText_0x73496 closetext diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index ce932c95d..e507fedb5 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -25,7 +25,7 @@ UnknownScript_0x73611: ; 0x73611 UnknownScript_0x73617: ; 0x73617 showemote $0, $2, 15 - spriteface $0, $1 + spriteface $0, UP loadfont writetext UnknownText_0x7364d closetext diff --git a/maps/Route25.asm b/maps/Route25.asm index 922b2750f..7babc5e90 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -22,21 +22,21 @@ UnknownScript_0x19eea0: ; 0x19eea0 showemote $4, $2, 15 pause 30 showemote $0, $3, 10 - spriteface $2, $0 + spriteface $2, DOWN applymovement $3, MovementData_0x19efe8 disappear $3 pause 15 playmusic MUSIC_BEAUTY_ENCOUNTER - spriteface $2, $1 + spriteface $2, UP pause 10 applymovement $2, MovementData_0x19efed loadfont writetext UnknownText_0x19f006 closetext loadmovesprites - spriteface $0, $0 + spriteface $0, DOWN applymovement $2, MovementData_0x19effa - spriteface $0, $2 + spriteface $0, LEFT applymovement $2, MovementData_0x19f000 disappear $2 clearevent EVENT_TRAINERS_IN_CERULEAN_GYM @@ -49,21 +49,21 @@ UnknownScript_0x19eee0: ; 0x19eee0 showemote $4, $2, 15 pause 30 showemote $0, $3, 10 - spriteface $2, $0 + spriteface $2, DOWN applymovement $3, MovementData_0x19efea disappear $3 pause 15 playmusic MUSIC_BEAUTY_ENCOUNTER - spriteface $2, $1 + spriteface $2, UP pause 10 applymovement $2, MovementData_0x19eff4 loadfont writetext UnknownText_0x19f006 closetext loadmovesprites - spriteface $0, $1 + spriteface $0, UP applymovement $2, MovementData_0x19effd - spriteface $0, $2 + spriteface $0, LEFT applymovement $2, MovementData_0x19f000 disappear $2 clearevent EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 284045fdb..c3036f37d 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -16,7 +16,7 @@ TeacherScript_0x7b125: ; 0x7b125 special Functiond91 special Function1060a2 playmusic MUSIC_HEAL - special Functionc658 + special HealParty pause 60 special Function8c0ab special RestartMapMusic diff --git a/maps/Route27.asm b/maps/Route27.asm index 260184ee6..dc7e3e3c6 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -19,18 +19,18 @@ UnknownScript_0x1a0872: ; 0x1a0872 ; 0x1a0873 UnknownScript_0x1a0873: ; 0x1a0873 - spriteface $a, $2 + spriteface $a, LEFT showemote $0, $a, 15 applymovement $a, MovementData_0x1a0a66 jump UnknownScript_0x1a088c ; 0x1a0881 UnknownScript_0x1a0881: ; 0x1a0881 - spriteface $a, $2 + spriteface $a, LEFT showemote $0, $a, 15 applymovement $a, MovementData_0x1a0a69 UnknownScript_0x1a088c: ; 0x1a088c - spriteface $0, $3 + spriteface $0, RIGHT loadfont writetext UnknownText_0x1a0a6b keeptextopen diff --git a/maps/Route29.asm b/maps/Route29.asm index ec769ecc3..5566e946a 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -36,10 +36,10 @@ TuscanyCallback: return UnknownScript_0x1a0f6d: ; 0x1a0f6d - spriteface $2, $1 + spriteface $2, UP showemote $0, $2, 15 applymovement $2, MovementData_0x1a108d - spriteface $0, $2 + spriteface $0, LEFT setevent EVENT_DUDE_TALKED_TO_YOU loadfont writetext UnknownText_0x1a10df @@ -51,7 +51,7 @@ UnknownScript_0x1a0f6d: ; 0x1a0f6d stopfollow loadpokedata RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL - spriteface $2, $1 + spriteface $2, UP loadfont writetext UnknownText_0x1a114d closetext @@ -62,10 +62,10 @@ UnknownScript_0x1a0f6d: ; 0x1a0f6d ; 0x1a0fa3 UnknownScript_0x1a0fa3: ; 0x1a0fa3 - spriteface $2, $1 + spriteface $2, UP showemote $0, $2, 15 applymovement $2, MovementData_0x1a1094 - spriteface $0, $2 + spriteface $0, LEFT setevent EVENT_DUDE_TALKED_TO_YOU loadfont writetext UnknownText_0x1a10df @@ -77,7 +77,7 @@ UnknownScript_0x1a0fa3: ; 0x1a0fa3 stopfollow loadpokedata RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL - spriteface $2, $1 + spriteface $2, UP loadfont writetext UnknownText_0x1a114d closetext diff --git a/maps/Route30.asm b/maps/Route30.asm index b3737a7e1..812c65533 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -19,7 +19,7 @@ YoungsterScript_0x1a1673: ; 0x1a1673 faceplayer writetext UnknownText_0x1a181c closetext - spriteface $2, $1 + spriteface $2, UP loadmovesprites playsound SFX_TACKLE applymovement $7, MovementData_0x1a1802 diff --git a/maps/Route32.asm b/maps/Route32.asm index c663ff15c..3898a667f 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -76,8 +76,8 @@ UnknownScript_0x1904a9: end UnknownScript_0x1904ab: - spriteface $9, $2 - spriteface $0, $3 + spriteface $9, LEFT + spriteface $0, RIGHT loadfont writetext UnknownText_0x190790 closetext @@ -85,7 +85,7 @@ UnknownScript_0x1904ab: follow $0, $9 applymovement $0, MovementData_0x190789 stopfollow - spriteface $0, $0 + spriteface $0, DOWN scall UnknownScript_0x190470 applymovement $9, MovementData_0x19078c applymovement $9, MovementData_0x19078e @@ -109,8 +109,8 @@ UnknownScript_0x1904e7: end UnknownScript_0x1904e9: - spriteface $b, $0 - spriteface $0, $1 + spriteface $b, DOWN + spriteface $0, UP jump UnknownScript_0x1904f3 FisherScript_0x1904f2: diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 5197082e5..ef9a38b66 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -28,12 +28,12 @@ UnknownScript_0x62d3d: ; 0x62d3d checkevent $00c0 iffalse UnknownScript_0x62d62 showemote $0, $5, 20 - spriteface $5, $2 - spriteface $0, $3 + spriteface $5, LEFT + spriteface $0, RIGHT follow $0, $5 applymovement $0, MovementData_0x62d97 stopfollow - spriteface $0, $0 + spriteface $0, DOWN loadfont writetext UnknownText_0x62e41 closetext diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index b45ecddc4..54a2115ee 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -64,7 +64,7 @@ UnknownScript_0x6a1ca: ; 0x6a1ca UnknownScript_0x6a1d1: ; 0x6a1d1 applymovement $0, MovementData_0x6a2e2 - spriteface $2, $3 + spriteface $2, RIGHT loadfont checkcode $11 addvar $1 diff --git a/maps/Route36.asm b/maps/Route36.asm index 555dd5ca3..b63d9dbfe 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -35,10 +35,10 @@ UnknownScript_0x19401b: ; 0x19401b showemote $0, $0, 15 pause 15 playsound SFX_WARP_FROM - spriteface $0, $1 + spriteface $0, UP applymovement $a, MovementData_0x194262 disappear $a - spriteface $0, $0 + spriteface $0, DOWN pause 10 dotrigger $0 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 42293f109..9c9a4ef9a 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -64,7 +64,7 @@ UnknownScript_0x6ab46: ; 0x6ab46 ; 0x6ab47 UnknownScript_0x6ab47: ; 0x6ab47 - spriteface $0, $1 + spriteface $0, UP loadfont checkcode $11 addvar $1 @@ -90,7 +90,7 @@ UnknownScript_0x6ab76: ; 0x6ab76 writetext UnknownText_0x6b300 closetext loadmovesprites - spriteface $0, $2 + spriteface $0, LEFT playsound SFX_EXIT_BUILDING special Function8c084 waitbutton @@ -175,7 +175,7 @@ UnknownScript_0x6ac10: ; 0x6ac10 loadmovesprites setflag $0011 special Function135db - spriteface $0, $2 + spriteface $0, LEFT playsound SFX_EXIT_BUILDING special Function8c084 waitbutton diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 19fe0ca23..0ee245ac9 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -14,7 +14,7 @@ TwinScript_0x9cc76: ; 0x9cc76 writetext UnknownText_0x9cd2e closetext loadmovesprites - spriteface $2, $3 + spriteface $2, RIGHT end ; 0x9cc87 @@ -22,7 +22,7 @@ UnknownScript_0x9cc87: ; 0x9cc87 writetext UnknownText_0x9cd5a closetext loadmovesprites - spriteface $2, $3 + spriteface $2, RIGHT end ; 0x9cc90 @@ -34,7 +34,7 @@ TwinScript_0x9cc90: ; 0x9cc90 writetext UnknownText_0x9cd2e closetext loadmovesprites - spriteface $3, $2 + spriteface $3, LEFT end ; 0x9cca1 @@ -42,7 +42,7 @@ UnknownScript_0x9cca1: ; 0x9cca1 writetext UnknownText_0x9cd5a closetext loadmovesprites - spriteface $3, $2 + spriteface $3, LEFT end ; 0x9ccaa diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 9e6a606a0..d15ec4617 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -48,7 +48,7 @@ UnknownScript_0x19abea: ; 0x19abea applymovement $0, MovementData_0x19aca2 showemote $0, $4, 15 applymovement $4, MovementData_0x19acbb - spriteface $3, $1 + spriteface $3, UP showemote $0, $3, 15 applymovement $3, MovementData_0x19aca4 loadfont @@ -84,7 +84,7 @@ UnknownScript_0x19ac28: ; 0x19ac28 UnknownScript_0x19ac38: ; 0x19ac38 showemote $0, $3, 15 applymovement $3, MovementData_0x19acaf - spriteface $4, $0 + spriteface $4, DOWN showemote $0, $4, 15 applymovement $4, MovementData_0x19acc7 loadfont diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 897c7be5c..f93bc9dd6 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -111,7 +111,7 @@ UnknownScript_0x587c0: ; 0x587c0 writetext UnknownText_0x588f5 closetext loadmovesprites - spriteface $3, $1 + spriteface $3, UP end ; 0x587c9 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 5282fed21..48a14622e 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -49,14 +49,14 @@ UnknownScript_0x5802c: ; 0x5802c ; 0x58031 UnknownScript_0x58031: ; 0x58031 - spriteface $3, $1 - spriteface $0, $0 + spriteface $3, UP + spriteface $0, DOWN jump UnknownScript_0x58044 ; 0x5803a UnknownScript_0x5803a: ; 0x5803a - spriteface $3, $2 - spriteface $0, $3 + spriteface $3, LEFT + spriteface $0, RIGHT jump UnknownScript_0x58044 ; 0x58043 @@ -108,7 +108,7 @@ YoungsterScript_0x5807e: ; 0x5807e writetext UnknownText_0x5848e closetext loadmovesprites - spriteface $6, $1 + spriteface $6, UP end ; 0x58089 diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 0a0b22a97..b7c08255c 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -45,7 +45,7 @@ UnknownScript_0x59192: ; 0x59192 pause 30 playsound SFX_TRANSACTION pause 30 - spriteface $4, $0 + spriteface $4, DOWN loadfont writetext UnknownText_0x59278 closetext diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 5cd1358ac..3e48a663c 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -29,7 +29,7 @@ RedScript_0x18c603: ; 0x18c603 pause 15 special Function8c0ab pause 30 - special Functionc658 + special HealParty refreshscreen $0 credits end diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 2884889bf..fe9c388b2 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -76,7 +76,7 @@ GruntM1Script: ; 0x5a5f8 moveperson $8, $b, $6 appear $8 applymovement $8, KurtSlowpokeWellVictoryMovementData - spriteface $0, $3 + spriteface $0, RIGHT loadfont writetext KurtLeaveSlowpokeWellText closetext @@ -94,7 +94,7 @@ GruntM1Script: ; 0x5a5f8 clearevent $06fd clearevent $073e special Function8c084 - special Functionc658 + special HealParty pause 15 warp GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE, $3, $3 end diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 5d07da973..e34714ad4 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -19,7 +19,7 @@ UnknownScript_0x184946: ; 0x184946 ; 0x184947 UnknownScript_0x184947: ; 0x184947 - spriteface $0, $1 + spriteface $0, UP showemote $0, $0, 15 special Functionc48f playsound SFX_TACKLE @@ -36,7 +36,7 @@ UnknownScript_0x184947: ; 0x184947 closetext loadmovesprites showemote $0, $8, 15 - spriteface $8, $0 + spriteface $8, DOWN pause 15 applymovement $8, MovementData_0x184a24 playmusic MUSIC_RIVAL_ENCOUNTER @@ -44,7 +44,7 @@ UnknownScript_0x184947: ; 0x184947 writetext UnknownText_0x184aec closetext loadmovesprites - spriteface $8, $1 + spriteface $8, UP loadfont writetext UnknownText_0x184bc8 pause 15 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 5a5e7990b..32f621a00 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -32,7 +32,7 @@ SecurityCamera1a: ; 0x6c65e playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $2 appear $2 - spriteface $0, $2 + spriteface $0, LEFT applymovement $2, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera @@ -58,7 +58,7 @@ SecurityCamera1b: ; 0x6c6a7 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $3 appear $2 - spriteface $0, $2 + spriteface $0, LEFT applymovement $2, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera @@ -84,14 +84,14 @@ SecurityCamera2a: ; 0x6c6f0 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $4, $7 appear $2 - spriteface $0, $2 + spriteface $0, LEFT applymovement $2, SecurityCameraMovement2 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $0, $3 + spriteface $0, RIGHT moveperson $2, $c, $5 appear $2 applymovement $2, SecurityCameraMovement3 @@ -111,14 +111,14 @@ SecurityCamera2b: ; 0x6c73c playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $4, $8 appear $2 - spriteface $0, $2 + spriteface $0, LEFT applymovement $2, SecurityCameraMovement4 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $0, $3 + spriteface $0, RIGHT moveperson $2, $c, $5 appear $2 applymovement $2, SecurityCameraMovement5 @@ -138,14 +138,14 @@ SecurityCamera3a: ; 0x6c788 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $6 appear $2 - spriteface $0, $2 + spriteface $0, LEFT applymovement $2, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $0, $3 + spriteface $0, RIGHT moveperson $2, $19, $b appear $2 applymovement $2, SecurityCameraMovement6 @@ -165,14 +165,14 @@ SecurityCamera3b: ; 0x6c7d4 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $7 appear $2 - spriteface $0, $2 + spriteface $0, LEFT applymovement $2, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $0, $3 + spriteface $0, RIGHT moveperson $2, $19, $c appear $2 applymovement $2, SecurityCameraMovement7 @@ -192,14 +192,14 @@ SecurityCamera4: ; 0x6c820 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $11, $10 appear $2 - spriteface $0, $2 + spriteface $0, LEFT applymovement $2, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $0, $3 + spriteface $0, RIGHT moveperson $2, $19, $b appear $2 applymovement $2, SecurityCameraMovement8 @@ -219,14 +219,14 @@ SecurityCamera5: ; 0x6c86c playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $3, $10 appear $2 - spriteface $0, $2 + spriteface $0, LEFT applymovement $2, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $0, $3 + spriteface $0, RIGHT moveperson $2, $e, $10 appear $2 applymovement $2, SecurityCameraMovement9 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 1cbaae9c6..cf5ef5261 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -60,20 +60,20 @@ UnknownScript_0x6cfac: ; 0x6cfac writetext UnknownText_0x6d2ad closetext loadmovesprites - spriteface $0, $0 + spriteface $0, DOWN showemote $0, $0, 15 applymovement $0, MovementData_0x6d21f playmusic MUSIC_ROCKET_ENCOUNTER applymovement $3, MovementData_0x6d224 - spriteface $0, $1 + spriteface $0, UP applymovement $2, MovementData_0x6d22f loadfont writetext UnknownText_0x6d2c3 closetext loadmovesprites cry DRAGONITE - spriteface $3, $2 - spriteface $0, $2 + spriteface $3, LEFT + spriteface $0, LEFT appear $5 applymovement $5, MovementData_0x6d236 applymovement $3, MovementData_0x6d23b @@ -84,7 +84,7 @@ UnknownScript_0x6cfac: ; 0x6cfac writetext UnknownText_0x6d38c closetext loadmovesprites - spriteface $0, $3 + spriteface $0, RIGHT applymovement $3, MovementData_0x6d241 loadfont writetext UnknownText_0x6d3bd @@ -117,13 +117,13 @@ UnknownScript_0x6cfac: ; 0x6cfac special Function8c0ab dotrigger $2 clearevent $06d6 - spriteface $4, $0 + spriteface $4, DOWN loadfont writetext UnknownText_0x6d5d8 closetext loadmovesprites applymovement $4, MovementData_0x6d250 - spriteface $0, $1 + spriteface $0, UP loadfont writetext UnknownText_0x6d64e closetext @@ -155,13 +155,13 @@ UnknownScript_0x6d07a: ; 0x6d07a ; 0x6d085 UnknownScript_0x6d085: ; 0x6d085 - spriteface $0, $1 + spriteface $0, UP jump UnknownScript_0x6d091 ; 0x6d08b UnknownScript_0x6d08b: ; 0x6d08b - spriteface $0, $3 - spriteface $4, $2 + spriteface $0, RIGHT + spriteface $4, LEFT UnknownScript_0x6d091: ; 0x6d091 loadfont writetext UnknownText_0x6da97 @@ -170,7 +170,7 @@ UnknownScript_0x6d091: ; 0x6d091 special Function8c084 special Function1060a2 playsound SFX_FULL_HEAL - special Functionc658 + special HealParty special Function8c079 loadfont writetext UnknownText_0x6daf7 @@ -344,7 +344,7 @@ UnknownScript_0x6d184: ; 0x6d184 moveperson $4, $12, $6 appear $4 applymovement $4, MovementData_0x6d27a - spriteface $0, $3 + spriteface $0, RIGHT loadfont writetext UnknownText_0x6d809 keeptextopen @@ -353,12 +353,12 @@ UnknownScript_0x6d184: ; 0x6d184 writetext UnknownText_0x6d8f8 closetext loadmovesprites - spriteface $4, $0 + spriteface $4, DOWN loadfont writetext UnknownText_0x6d994 closetext loadmovesprites - spriteface $0, $0 + spriteface $0, DOWN applymovement $4, MovementData_0x6d283 disappear $4 setevent EVENT_CLEARED_ROCKET_HIDEOUT diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 4ba63faf1..b2018735f 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -45,9 +45,9 @@ UnknownScript_0x6dff7: ; 0x6dff7 ; 0x6dffc LanceScript_0x6dffc: ; 0x6dffc - spriteface $0, $2 + spriteface $0, LEFT pause 5 - spriteface $4, $3 + spriteface $4, RIGHT pause 20 applymovement $2, MovementData_0x6e12a loadfont @@ -61,12 +61,12 @@ LanceScript_0x6dffc: ; 0x6dffc ; 0x6e019 UnknownScript_0x6e019: ; 0x6e019 - spriteface $0, $2 + spriteface $0, LEFT showemote $0, $0, 15 special Functionc48f appear $a applymovement $a, MovementData_0x6e164 - spriteface $0, $2 + spriteface $0, LEFT playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x6e267 @@ -96,7 +96,7 @@ UnknownScript_0x6e056: ; 0x6e056 pause 30 showemote $0, $3, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $3, $0 + spriteface $3, DOWN loadfont writetext UnknownText_0x6e400 closetext diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index a5e118384..f26d2496c 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -93,7 +93,7 @@ UnknownScript_0x18508f: ; 0x18508f special SpecialMonCheck iftrue UnknownScript_0x1850b6 applymovement $3, MovementData_0x1851d0 - spriteface $0, $2 + spriteface $0, LEFT cry RAIKOU pause 10 playsound SFX_WARP_FROM @@ -106,7 +106,7 @@ UnknownScript_0x1850b6: ; 0x1850b6 special SpecialMonCheck iftrue UnknownScript_0x1850d7 applymovement $4, MovementData_0x1851da - spriteface $0, $3 + spriteface $0, RIGHT cry ENTEI pause 10 playsound SFX_WARP_FROM @@ -115,7 +115,7 @@ UnknownScript_0x1850b6: ; 0x1850b6 playsound SFX_EXIT_BUILDING waitbutton UnknownScript_0x1850d7: ; 0x1850d7 - spriteface $0, $1 + spriteface $0, UP pause 10 applymovement $0, MovementData_0x1851e8 applymovement $2, MovementData_0x1851e4 @@ -137,7 +137,7 @@ UnknownScript_0x1850d7: ; 0x1850d7 clearevent EVENT_SET_WHEN_FOUGHT_HO_OH returnafterbattle pause 20 - spriteface $0, $0 + spriteface $0, DOWN playmusic MUSIC_MYSTICALMAN_ENCOUNTER playsound SFX_ENTER_DOOR moveperson $5, $a, $f @@ -158,7 +158,7 @@ UnknownScript_0x1850d7: ; 0x1850d7 moveperson $6, $7, $d moveperson $7, $9, $d moveperson $8, $b, $d - spriteface $0, $3 + spriteface $0, RIGHT loadfont writetext UnknownText_0x185203 closetext diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 4accd0088..bc01b8ca6 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -14,7 +14,7 @@ UnknownScript_0x9b38a: ; 0x9b38a ; 0x9b38b UnknownScript_0x9b38b: ; 0x9b38b - spriteface $0, $1 + spriteface $0, UP loadfont checkflag $0057 iftrue UnknownScript_0x9b3f7 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 1bf2974f8..87ab575b4 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -84,7 +84,7 @@ TeacherScript_0x7ca7d: ; 0x7ca7d ; 0x7ca80 UnknownScript_0x7ca80: ; 0x7ca80 - spriteface $0, $3 + spriteface $0, RIGHT showemote $0, $0, 15 special Functionc48f pause 15 @@ -92,7 +92,7 @@ UnknownScript_0x7ca80: ; 0x7ca80 appear $c waitbutton applymovement $c, MovementData_0x7ce87 - spriteface $0, $3 + spriteface $0, RIGHT scall UnknownScript_0x7cad4 applymovement $c, MovementData_0x7ce92 playsound SFX_EXIT_BUILDING @@ -104,7 +104,7 @@ UnknownScript_0x7ca80: ; 0x7ca80 ; 0x7caaa UnknownScript_0x7caaa: ; 0x7caaa - spriteface $0, $3 + spriteface $0, RIGHT showemote $0, $0, 15 special Functionc48f pause 15 @@ -112,7 +112,7 @@ UnknownScript_0x7caaa: ; 0x7caaa appear $c waitbutton applymovement $c, MovementData_0x7ce8c - spriteface $0, $3 + spriteface $0, RIGHT scall UnknownScript_0x7cad4 applymovement $c, MovementData_0x7ce97 playsound SFX_EXIT_BUILDING diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index f01546648..69c67b427 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -44,7 +44,7 @@ SailorScript_0x74dc4: writetext UnknownText_0x74f06 closetext loadmovesprites - spriteface $2, $0 + spriteface $2, DOWN pause 10 playsound SFX_EXIT_BUILDING disappear $2 @@ -78,12 +78,12 @@ UnknownScript_0x74e1a: end UnknownScript_0x74e20: - spriteface $3, $3 + spriteface $3, RIGHT checkevent $0000 iftrue UnknownScript_0x74e86 checkevent $0001 iftrue UnknownScript_0x74e86 - spriteface $0, $2 + spriteface $0, LEFT loadfont checkcode $b if_equal MONDAY, UnknownScript_0x74e72 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index d94a94be6..6f9b2c371 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -20,7 +20,7 @@ UnknownScript_0x74491: ; 0x74491 UnknownScript_0x74492: ; 0x74492 moveperson $2, $12, $b - spriteface $0, $0 + spriteface $0, DOWN showemote $0, $0, 15 special Functionc48f pause 15 @@ -35,7 +35,7 @@ UnknownScript_0x74492: ; 0x74492 ; 0x744b5 UnknownScript_0x744b5: ; 0x744b5 - spriteface $0, $0 + spriteface $0, DOWN showemote $0, $0, 15 special Functionc48f pause 15 @@ -50,7 +50,7 @@ UnknownScript_0x744b5: ; 0x744b5 ; 0x744d4 UnknownScript_0x744d4: ; 0x744d4 - spriteface $0, $0 + spriteface $0, DOWN playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x7455f diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 04fa8a1bc..4b49a3b7e 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -19,7 +19,7 @@ UnknownScript_0x9b9fc: ; 0x9b9fc ; 0x9b9fd UnknownScript_0x9b9fd: ; 0x9b9fd - spriteface $0, $2 + spriteface $0, LEFT jump UnknownScript_0x9ba04 ; 0x9ba03 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index f3769cc7c..5f617a8ab 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -34,7 +34,7 @@ UnknownScript_0x1a83d1: playmusic MUSIC_SHOW_ME_AROUND follow $2, $0 applymovement $2, MovementData_0x1a842a - spriteface $0, $1 + spriteface $0, UP applymovement $2, MovementData_0x1a8465 stopfollow special RestartMapMusic diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 5b80e7d01..4960ba22e 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -33,7 +33,7 @@ UnknownScript_0x694d7: ; 0x694d7 loadmovesprites checkcode $9 if_equal $1, .UnknownScript_0x69511 - spriteface $0, $0 + spriteface $0, DOWN applymovement $6, MovementData_0x69549 playsound SFX_EXIT_BUILDING disappear $6 @@ -42,7 +42,7 @@ UnknownScript_0x694d7: ; 0x694d7 .UnknownScript_0x69511 ; 0x69511 applymovement $6, MovementData_0x6954e - spriteface $0, $0 + spriteface $0, DOWN applymovement $6, MovementData_0x69551 playsound SFX_EXIT_BUILDING disappear $6 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 204dca627..780e96573 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -59,19 +59,19 @@ SageScript_0x985a0: ; 0x985a0 ; 0x985a3 UnknownScript_0x985a3: ; 0x985a3 - spriteface $4, $1 - spriteface $0, $0 + spriteface $4, UP + spriteface $0, DOWN showemote $0, $4, 20 follow $0, $4 applymovement $0, MovementData_0x98622 stopfollow - spriteface $0, $3 + spriteface $0, RIGHT loadfont writetext UnknownText_0x98712 closetext loadmovesprites applymovement $4, MovementData_0x98625 - spriteface $4, $2 + spriteface $4, LEFT end ; 0x985c6 @@ -163,7 +163,7 @@ SageKojiScript: ; 0x985f8 closetext loadmovesprites applymovement $7, MovementData_0x98628 - spriteface $7, $1 + spriteface $7, UP setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER dotrigger $1 end diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index eabc7e704..c894f3610 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -22778,12 +22778,12 @@ Function17024d: ; 17024d xor a ld [InLinkBattle], a callba Function1060a2 - callba Functionc658 + callba HealParty call Function1702b7 call Function170bf7 predef StartBattle callba Function1500c - callba Functionc658 + callba HealParty ld a, [wd0ee] ld [ScriptVar], a and a |