diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/more_phone_scripts.asm | 10 | ||||
| -rw-r--r-- | engine/phone_scripts.asm | 10 | ||||
| -rw-r--r-- | engine/std_scripts.asm | 36 |
3 files changed, 28 insertions, 28 deletions
diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index 55b5f98c3..96a9e58f2 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -1,5 +1,5 @@ UnknownScript_0xa0000: - special $005d + special RandomPhoneMon farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xa0013 farscall UnknownScript_0xbe51e @@ -9,7 +9,7 @@ UnknownScript_0xa0013: farjump UnknownScript_0xa002e UnknownScript_0xa0017: - special $005d + special RandomPhoneMon farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xa002a farscall UnknownScript_0xbe5d0 @@ -27,7 +27,7 @@ UnknownScript_0xa0036: farjump UnknownScript_0xa0055 UnknownScript_0xa003e: - special $005c + special Function2a51f farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xa0051 farscall UnknownScript_0xa017a @@ -37,7 +37,7 @@ UnknownScript_0xa0051: farjump UnknownScript_0xa006c UnknownScript_0xa0055: - special $005c + special Function2a51f farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xa0068 farscall UnknownScript_0xa0226 @@ -851,7 +851,7 @@ UnknownScript_0xa059c: farjump UnknownScript_0xa053a UnknownScript_0xa05a0: - special $005b + special Function2a4ab end UnknownScript_0xa05a4: diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 7dbb246e3..c66781cdd 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -381,7 +381,7 @@ UnknownScript_0xbd17c: iftrue UnknownScript_0xbd1cd UnknownScript_0xbd19b: - special $005d + special RandomPhoneMon farjump UnknownScript_0xa0908 UnknownScript_0xbd1a2: @@ -608,7 +608,7 @@ UnknownScript_0xbd373: iftrue UnknownScript_0xbd3c4 UnknownScript_0xbd392: - special $005d + special RandomPhoneMon farjump UnknownScript_0xa0930 UnknownScript_0xbd399: @@ -808,7 +808,7 @@ UnknownScript_0xbd544: pokenamemem QWILFISH, $1 displaylocation ROUTE_32, $2 writebyte $1 - special $0048 + special Functionc3fc farjump UnknownScript_0xa05d6 UnknownScript_0xbd55c: @@ -827,7 +827,7 @@ UnknownScript_0xbd560: iftrue UnknownScript_0xbd5c3 UnknownScript_0xbd57f: - special $005d + special RandomPhoneMon farjump UnknownScript_0xa0948 UnknownScript_0xbd586: @@ -3079,7 +3079,7 @@ UnknownScript_0xbe61c: end UnknownScript_0xbe622: - special $005d + special RandomPhoneMon farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbe636 farwritetext UnknownText_0x1b518b diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index b6fd9f686..98602bd8a 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -122,16 +122,16 @@ PokeCenterNurseScript: ; bc09c ; Go ahead and heal farwritetext UnknownText_0x1b01bd pause 20 - special $009d + special Function1060a2 ; Turn to the machine spriteface $fe, $2 pause 10 - special $001b + special Functionc658 playmusic MUSIC_NONE writebyte $0 - special $003e + special Function12324 pause 30 - special $003d + special RestartMapMusic spriteface $fe, $0 pause 10 ; Has Elm already phoned you about Pokerus? @@ -141,7 +141,7 @@ PokeCenterNurseScript: ; bc09c checkflag $000d iftrue .done ; Check for Pokerus - special $004e ; SPECIAL_CHECKPOKERUS + special SpecialCheckPokerus ; SPECIAL_CHECKPOKERUS iftrue .pokerus .done ; Thank you for waiting. ... @@ -212,7 +212,7 @@ UnknownScript_0xbc17a: ; 0xbc17a loadfont farwritetext UnknownText_0x1b048d closetext - special $0026 + special Functionc2c0 loadmovesprites end ; 0xbc185 @@ -236,7 +236,7 @@ UnknownScript_0xbc191: ; 0xbc191 UnknownScript_0xbc195: ; 0xbc195 loadfont writebyte $0 - special $0028 + special Functionc355 loadmovesprites end ; 0xbc19d @@ -244,7 +244,7 @@ UnknownScript_0xbc195: ; 0xbc195 UnknownScript_0xbc19d: ; 0xbc19d loadfont writebyte $4 - special $0028 + special Functionc355 loadmovesprites end ; 0xbc1a5 @@ -255,7 +255,7 @@ UnknownScript_0xbc1a5: ; 0xbc1a5 UnknownScript_0xbc1a9: ; 0xbc1a9 loadfont - special $001c + special Function1559a loadmovesprites end ; 0xbc1af @@ -371,7 +371,7 @@ UnknownScript_0xbc242: ; 0xbc242 ; 0xbc25c UnknownScript_0xbc25c: ; 0xbc25c - special $0034 + special WhiteBGMap scall UnknownScript_0xbc380 setevent $0747 clearevent $0748 @@ -389,7 +389,7 @@ UnknownScript_0xbc274: ; bc274 loadfont farwritetext UnknownText_0x1b05bf closetext - special $0014 + special Functionc34a RAM2MEM $0 if_equal $1, UnknownScript_0xbc31e if_equal $2, UnknownScript_0xbc332 @@ -415,9 +415,9 @@ UnknownScript_0xbc2b6: iffalse UnknownScript_0xbc2c4 farwritetext UnknownText_0x1b06d9 closetext - special $0017 + special Function13a31 UnknownScript_0xbc2c4: - special $0015 + special Function4d9e5 if_equal $0, UnknownScript_0xbc2d4 if_equal $2, UnknownScript_0xbc2d4 farwritetext UnknownText_0x1b070d @@ -447,7 +447,7 @@ UnknownScript_0xbc2d4: setevent $0728 setevent $0729 setflag $0051 - special $003c + special PlayMapMusic end ; 0xbc31e @@ -692,7 +692,7 @@ UnknownScript_0xbc3db: ; 0xbc3db ; 0xbc574 UnknownScript_0xbc574: ; 0xbc574 - special $005d + special RandomPhoneMon checkcode $17 if_equal $5, UnknownScript_0xbc5c9 if_equal $7, UnknownScript_0xbc5ce @@ -816,7 +816,7 @@ UnknownScript_0xbc628: ; 0xbc628 ; 0xbc62d UnknownScript_0xbc62d: ; 0xbc62d - special $005d + special RandomPhoneMon checkcode $17 if_equal $5, UnknownScript_0xbc682 if_equal $7, UnknownScript_0xbc687 @@ -2257,7 +2257,7 @@ UnknownScript_0xbcde0: ; 0xbcde0 farwritetext UnknownText_0x1b07e3 UnknownScript_0xbcde4: ; 0xbcde4 - special $0050 + special Function24b4e loadmenudata MenuDataHeader_0xbce54 interpretmenu2 writebackup @@ -2336,7 +2336,7 @@ MenuData2_0xbce5c: ; 0xbce5c UnknownScript_0xbce7f: ; 0xbce7f faceplayer loadfont - special $0059 + special Function718d if_less_than 50, UnknownScript_0xbce9a if_less_than 150, UnknownScript_0xbce93 farwritetext UnknownText_0x1b092a |