diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-17 12:29:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-17 12:29:37 -0500 |
| commit | 4bfe086ef6412e5fdba99e6143db6de75c7c9458 (patch) | |
| tree | b4d9a8740825ac37cfc2c0fc33169834118cc727 /maps | |
| parent | 0b8fe4bac31c83a8164567da6d7889a18ab3eb4b (diff) | |
Phone scripts and specials
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/CeladonDeptStore6F.asm | 4 | ||||
| -rw-r--r-- | maps/IlexForest.asm | 2 | ||||
| -rw-r--r-- | maps/PokeCenter2F.asm | 20 | ||||
| -rw-r--r-- | maps/RadioTower2F.asm | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index e876c09d8..25f92be00 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -7,9 +7,9 @@ CeladonDeptStore6F_MapScriptHeader: ; callbacks - dbw 1, UnknownScript_0x71175 + dbw 1, .Callback -UnknownScript_0x71175: +.Callback: changeblock $c, $0, $3 return diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index cc5b19bf0..b87a3a179 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -460,7 +460,7 @@ UnknownScript_0x6ee42: startbattle returnafterbattle pause 20 - special Function49bf9 + special CheckCaughtCelebi iffalse UnknownScript_0x6ee8e appear $7 applymovement $7, MovementData_0x6ef4e diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 3177d3963..1684dce98 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -431,8 +431,8 @@ PokeCenter2F_CheckGender: loadmovesprites playsound SFX_TINGLE applymovement PLAYER, MovementData_0x192d17 - writebyte $80 - special Functionc225 + writebyte (1 << 7) | (PAL_OW_RED << 4) + special Special_SetPlayerPalette applymovement PLAYER, MovementData_0x192d1c setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite @@ -458,8 +458,8 @@ Script_CleanUpFemaleFlagAfterTrade: clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE applymovement PLAYER, MovementData_0x192d17 - writebyte $90 - special Functionc225 + writebyte (1 << 7) | (PAL_OW_BLUE << 4) + special Special_SetPlayerPalette applymovement PLAYER, MovementData_0x192d1c special ReplaceKrisSprite applymovement PLAYER, MovementData_0x192d2a @@ -480,8 +480,8 @@ Script_CleanUpFemaleFlagAfterBattle: clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE applymovement PLAYER, MovementData_0x192d17 - writebyte $90 - special Functionc225 + writebyte (1 << 7) | (PAL_OW_BLUE << 4) + special Special_SetPlayerPalette applymovement PLAYER, MovementData_0x192d1c special ReplaceKrisSprite applymovement PLAYER, MovementData_0x192d2a @@ -539,8 +539,8 @@ TimeCapsuleScript_CheckPlayerGender: loadmovesprites playsound SFX_TINGLE applymovement PLAYER, MovementData_0x192d17 - writebyte $80 - special Functionc225 + writebyte (1 << 7) | (PAL_OW_RED << 4) + special Special_SetPlayerPalette applymovement PLAYER, MovementData_0x192d22 faceperson PLAYER, $4 setflag ENGINE_KRIS_IN_CABLE_CLUB @@ -568,8 +568,8 @@ Script_LeftTimeCapsule: clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE applymovement PLAYER, MovementData_0x192d17 - writebyte $90 - special Functionc225 + writebyte (1 << 7) | (PAL_OW_BLUE << 4) + special Special_SetPlayerPalette applymovement PLAYER, MovementData_0x192d1c special ReplaceKrisSprite applymovement PLAYER, MovementData_0x192cfc diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index eb81f7579..22619d10c 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -104,7 +104,7 @@ Buena: if_equal 30, UnknownScript_0x5d87f playmusic MUSIC_BUENAS_PASSWORD writetext UnknownText_0x5de35 - special Function4ae12 + special AskRememberPassword iffalse UnknownScript_0x5d81e writetext UnknownText_0x5de84 closetext |