diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/billspc.asm | 2 | ||||
| -rwxr-xr-x | engine/card_flip.asm | 2 | ||||
| -rwxr-xr-x | engine/compose_mail.asm | 2 | ||||
| -rwxr-xr-x | engine/dummy_game.asm | 2 | ||||
| -rwxr-xr-x | engine/healmachineanim.asm | 2 | ||||
| -rw-r--r-- | engine/more_phone_scripts.asm | 364 | ||||
| -rw-r--r-- | engine/phone_scripts.asm | 516 | ||||
| -rw-r--r-- | engine/pokedex.asm | 30 | ||||
| -rwxr-xr-x | engine/pokegear.asm | 291 | ||||
| -rw-r--r-- | engine/predef.asm | 2 | ||||
| -rw-r--r-- | engine/save.asm | 4 | ||||
| -rw-r--r-- | engine/scripting.asm | 350 | ||||
| -rw-r--r-- | engine/specials.asm | 14 | ||||
| -rwxr-xr-x | engine/startmenu.asm | 2 | ||||
| -rwxr-xr-x | engine/town_map.asm | 2 | ||||
| -rwxr-xr-x | engine/trade/animation.asm | 6 | ||||
| -rwxr-xr-x | engine/wildmons.asm | 126 |
17 files changed, 862 insertions, 855 deletions
diff --git a/engine/billspc.asm b/engine/billspc.asm index a4dd02876..ace4eb873 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -2293,7 +2293,7 @@ Functione33d0: ; e33d0 (38:73d0) ld a, $e4 call DmgToCgbBGPals ld a, $fc - call Functioncf8 + call DmgToCgbObjPal0 ret Functione33df: ; e33df (38:73df) diff --git a/engine/card_flip.asm b/engine/card_flip.asm index df9d895d1..7720cfaf5 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -1756,7 +1756,7 @@ Functione1190: ; e1190 ld a, $e4 call DmgToCgbBGPals ld a, $24 - call Functioncf8 + call DmgToCgbObjPal0 xor a ld [wd0ec], a call DelayFrame diff --git a/engine/compose_mail.asm b/engine/compose_mail.asm index 0f67377b0..5c604ee5c 100755 --- a/engine/compose_mail.asm +++ b/engine/compose_mail.asm @@ -57,7 +57,7 @@ _ComposeMailMessage: ; 11e75 (mail?) ld a, %11100100 call DmgToCgbBGPals ld a, %11100100 - call Functioncf8 + call DmgToCgbObjPal0 call Function11be0 ld hl, wc6d0 ld e, [hl] diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm index 6313fdc38..cc188598f 100755 --- a/engine/dummy_game.asm +++ b/engine/dummy_game.asm @@ -39,7 +39,7 @@ Functione1e67: ; e1e67 (38:5e67) ld a, $e4 call DmgToCgbBGPals ld a, $e0 - call Functioncf8 + call DmgToCgbObjPal0 ret Functione1ebb: ; e1ebb (38:5ebb) diff --git a/engine/healmachineanim.asm b/engine/healmachineanim.asm index 174d1ae5a..57f03a8df 100755 --- a/engine/healmachineanim.asm +++ b/engine/healmachineanim.asm @@ -13,7 +13,7 @@ HealMachineAnim: ; 12324 ld [Buffer2], a call .DoJumptableFunctions ld a, [Buffer2] - call Functiond24 + call DmgToCgbObjPal1 ret ; 1233e diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index 6d9233402..d44f5b475 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -1,8 +1,8 @@ UnknownScript_0xa0000: special RandomPhoneMon - farscall UnknownScript_0xbde3f - if_equal $0, UnknownScript_0xa0013 - farscall UnknownScript_0xbe51e + farscall PhoneScript_Random2 + if_equal 0, UnknownScript_0xa0013 + farscall PhoneScript_Generic_Male farjump UnknownScript_0xa003e UnknownScript_0xa0013: @@ -10,9 +10,9 @@ UnknownScript_0xa0013: UnknownScript_0xa0017: special RandomPhoneMon - farscall UnknownScript_0xbde3f - if_equal $0, UnknownScript_0xa002a - farscall UnknownScript_0xbe5d0 + farscall PhoneScript_Random2 + if_equal 0, UnknownScript_0xa002a + farscall PhoneScript_Generic_Female farjump UnknownScript_0xa0055 UnknownScript_0xa002a: @@ -28,31 +28,31 @@ UnknownScript_0xa0036: UnknownScript_0xa003e: special RandomPhoneWildMon - farscall UnknownScript_0xbde3f - if_equal $0, UnknownScript_0xa0051 + farscall PhoneScript_Random2 + if_equal 0, UnknownScript_0xa0051 farscall UnknownScript_0xa017a - farjump UnknownScript_0xa0484 + farjump PhoneScript_HangupText_Male UnknownScript_0xa0051: farjump UnknownScript_0xa006c UnknownScript_0xa0055: special RandomPhoneWildMon - farscall UnknownScript_0xbde3f - if_equal $0, UnknownScript_0xa0068 + farscall PhoneScript_Random2 + if_equal 0, UnknownScript_0xa0068 farscall UnknownScript_0xa0226 - farjump UnknownScript_0xa053a + farjump PhoneScript_HangupText_Female UnknownScript_0xa0068: farjump UnknownScript_0xa0074 UnknownScript_0xa006c: farscall UnknownScript_0xa0278 - farjump UnknownScript_0xa0484 + farjump PhoneScript_HangupText_Male UnknownScript_0xa0074: farscall UnknownScript_0xa0324 - farjump UnknownScript_0xa053a + farjump PhoneScript_HangupText_Female UnknownScript_0xa007c: checkcode VAR_CALLERID @@ -523,14 +523,14 @@ UnknownScript_0xa0324: end UnknownScript_0xa0376: - farscall UnknownScript_0xa0386 - farjump UnknownScript_0xa0484 + farscall PhoneScript_RematchText_Male + farjump PhoneScript_HangupText_Male UnknownScript_0xa037e: - farscall UnknownScript_0xa0432 - farjump UnknownScript_0xa053a + farscall PhoneScript_RematchText_Female + farjump PhoneScript_HangupText_Female -UnknownScript_0xa0386: +PhoneScript_RematchText_Male: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -635,7 +635,7 @@ UnknownScript_0xa0386: buttonsound end -UnknownScript_0xa0432: +PhoneScript_RematchText_Female: checkcode VAR_CALLERID if_equal PHONE_COOLTRAINERF_BETH, .Beth if_equal PHONE_COOLTRAINERF_REENA, .Reena @@ -688,7 +688,7 @@ UnknownScript_0xa047f: farwritetext UnknownText_0x66796 end -UnknownScript_0xa0484: +PhoneScript_HangupText_Male: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -791,7 +791,7 @@ UnknownScript_0xa0484: farwritetext UnknownText_0x670eb end -UnknownScript_0xa053a: +PhoneScript_HangupText_Female: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -840,7 +840,7 @@ UnknownScript_0xa0584: farjump UnknownScript_0xa0000 UnknownScript_0xa058e: - farjump UnknownScript_0xa0484 + farjump PhoneScript_HangupText_Male UnknownScript_0xa0592: scall UnknownScript_0xa05a0 @@ -848,7 +848,7 @@ UnknownScript_0xa0592: farjump UnknownScript_0xa0017 UnknownScript_0xa059c: - farjump UnknownScript_0xa053a + farjump PhoneScript_HangupText_Female UnknownScript_0xa05a0: special RandomPhoneRareWildMon @@ -862,37 +862,37 @@ UnknownScript_0xa05a4: .Wade: farwritetext UnknownText_0x1759f7 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male .Derek: farwritetext UnknownText_0x65c66 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa05be: farwritetext UnknownText_0x64032 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa05c6: farwritetext UnknownText_0x177378 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa05ce: farwritetext UnknownText_0x64b5f buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa05d6: farwritetext UnknownText_0x175dd9 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa05de: farwritetext UnknownText_0x176c61 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa05e6: checkcode VAR_CALLERID @@ -953,270 +953,270 @@ UnknownScript_0xa061e: UnknownScript_0xa0644: farwritetext UnknownText_0x176feb buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa064c: farwritetext UnknownText_0x66dc5 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0654: - random $b - if_equal $0, UnknownScript_0xa0682 - if_equal $1, UnknownScript_0xa068a - if_equal $2, UnknownScript_0xa0692 - if_equal $3, UnknownScript_0xa069a - if_equal $4, UnknownScript_0xa06a2 - if_equal $5, UnknownScript_0xa06aa - if_equal $6, UnknownScript_0xa06b2 - if_equal $7, UnknownScript_0xa06ba - if_equal $8, UnknownScript_0xa06c2 - if_equal $9, UnknownScript_0xa06ca - if_equal $a, UnknownScript_0xa06d2 + random 11 + if_equal 0, UnknownScript_0xa0682 + if_equal 1, UnknownScript_0xa068a + if_equal 2, UnknownScript_0xa0692 + if_equal 3, UnknownScript_0xa069a + if_equal 4, UnknownScript_0xa06a2 + if_equal 5, UnknownScript_0xa06aa + if_equal 6, UnknownScript_0xa06b2 + if_equal 7, UnknownScript_0xa06ba + if_equal 8, UnknownScript_0xa06c2 + if_equal 9, UnknownScript_0xa06ca + if_equal 10, UnknownScript_0xa06d2 UnknownScript_0xa0682: farwritetext UnknownText_0x174261 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa068a: farwritetext UnknownText_0x17429d buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0692: farwritetext UnknownText_0x1742ee buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa069a: farwritetext UnknownText_0x174340 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa06a2: farwritetext UnknownText_0x174391 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa06aa: farwritetext UnknownText_0x1743e3 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa06b2: farwritetext UnknownText_0x174433 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa06ba: farwritetext UnknownText_0x174485 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa06c2: farwritetext UnknownText_0x1744d6 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa06ca: farwritetext UnknownText_0x174522 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa06d2: farwritetext UnknownText_0x174571 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa06da: - random $a - if_equal $0, UnknownScript_0xa0704 - if_equal $1, UnknownScript_0xa070c - if_equal $2, UnknownScript_0xa0714 - if_equal $3, UnknownScript_0xa071c - if_equal $4, UnknownScript_0xa0724 - if_equal $5, UnknownScript_0xa072c - if_equal $6, UnknownScript_0xa0734 - if_equal $7, UnknownScript_0xa073c - if_equal $8, UnknownScript_0xa0744 - if_equal $9, UnknownScript_0xa074c + random 10 + if_equal 0, UnknownScript_0xa0704 + if_equal 1, UnknownScript_0xa070c + if_equal 2, UnknownScript_0xa0714 + if_equal 3, UnknownScript_0xa071c + if_equal 4, UnknownScript_0xa0724 + if_equal 5, UnknownScript_0xa072c + if_equal 6, UnknownScript_0xa0734 + if_equal 7, UnknownScript_0xa073c + if_equal 8, UnknownScript_0xa0744 + if_equal 9, UnknownScript_0xa074c UnknownScript_0xa0704: farwritetext UnknownText_0x176223 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa070c: farwritetext UnknownText_0x1762c3 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0714: farwritetext UnknownText_0x17638a buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa071c: farwritetext UnknownText_0x176424 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0724: farwritetext UnknownText_0x1764eb buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa072c: farwritetext UnknownText_0x176599 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0734: farwritetext UnknownText_0x1766ac buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa073c: farwritetext UnknownText_0x17674f buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0744: farwritetext UnknownText_0x176816 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa074c: farwritetext UnknownText_0x17686d buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0754: - random $a - if_equal $0, UnknownScript_0xa077e - if_equal $1, UnknownScript_0xa0786 - if_equal $2, UnknownScript_0xa078e - if_equal $3, UnknownScript_0xa0796 - if_equal $4, UnknownScript_0xa079e - if_equal $5, UnknownScript_0xa07a6 - if_equal $6, UnknownScript_0xa07ae - if_equal $7, UnknownScript_0xa07b6 - if_equal $8, UnknownScript_0xa07be - if_equal $9, UnknownScript_0xa07c6 + random 10 + if_equal 0, UnknownScript_0xa077e + if_equal 1, UnknownScript_0xa0786 + if_equal 2, UnknownScript_0xa078e + if_equal 3, UnknownScript_0xa0796 + if_equal 4, UnknownScript_0xa079e + if_equal 5, UnknownScript_0xa07a6 + if_equal 6, UnknownScript_0xa07ae + if_equal 7, UnknownScript_0xa07b6 + if_equal 8, UnknownScript_0xa07be + if_equal 9, UnknownScript_0xa07c6 UnknownScript_0xa077e: farwritetext UnknownText_0x65481 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0786: farwritetext UnknownText_0x654ea buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa078e: farwritetext UnknownText_0x65555 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0796: farwritetext UnknownText_0x655c7 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa079e: farwritetext UnknownText_0x65628 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa07a6: farwritetext UnknownText_0x6569b buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa07ae: farwritetext UnknownText_0x6574a buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa07b6: farwritetext UnknownText_0x65810 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa07be: farwritetext UnknownText_0x658c6 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa07c6: farwritetext UnknownText_0x65969 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa07ce: - random $a - if_equal $0, UnknownScript_0xa07f8 - if_equal $1, UnknownScript_0xa0800 - if_equal $2, UnknownScript_0xa0808 - if_equal $3, UnknownScript_0xa0810 - if_equal $4, UnknownScript_0xa0818 - if_equal $5, UnknownScript_0xa0820 - if_equal $6, UnknownScript_0xa0828 - if_equal $7, UnknownScript_0xa0830 - if_equal $8, UnknownScript_0xa0838 - if_equal $9, UnknownScript_0xa0840 + random 10 + if_equal 0, UnknownScript_0xa07f8 + if_equal 1, UnknownScript_0xa0800 + if_equal 2, UnknownScript_0xa0808 + if_equal 3, UnknownScript_0xa0810 + if_equal 4, UnknownScript_0xa0818 + if_equal 5, UnknownScript_0xa0820 + if_equal 6, UnknownScript_0xa0828 + if_equal 7, UnknownScript_0xa0830 + if_equal 8, UnknownScript_0xa0838 + if_equal 9, UnknownScript_0xa0840 UnknownScript_0xa07f8: farwritetext UnknownText_0x662bc buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0800: farwritetext UnknownText_0x662fc buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0808: farwritetext UnknownText_0x66335 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0810: farwritetext UnknownText_0x66366 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0818: farwritetext UnknownText_0x663a1 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0820: farwritetext UnknownText_0x663e6 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0828: farwritetext UnknownText_0x66421 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0830: farwritetext UnknownText_0x6645f buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0838: farwritetext UnknownText_0x6649b buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0840: farwritetext UnknownText_0x664dd buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0848: checkevent EVENT_OPENED_MT_SILVER @@ -1245,231 +1245,231 @@ UnknownScript_0xa0848: iftrue UnknownScript_0xa0898 farwritetext UnknownText_0x646a3 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0898: farwritetext UnknownText_0x64099 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08a0: farwritetext UnknownText_0x640e6 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08a8: farwritetext UnknownText_0x6416d buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08b0: farwritetext UnknownText_0x641e8 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08b8: farwritetext UnknownText_0x64247 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08c0: farwritetext UnknownText_0x642bb buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08c8: farwritetext UnknownText_0x643d4 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08d0: farwritetext UnknownText_0x64448 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08d8: farwritetext UnknownText_0x6455b buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08e0: farwritetext UnknownText_0x645ff buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08e8: farwritetext UnknownText_0x646df buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08f0: farwritetext UnknownText_0x647d8 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa08f8: farwritetext UnknownText_0x1745c2 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0900: farwritetext UnknownText_0x17485b buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0908: farwritetext UnknownText_0x17496b buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0910: farwritetext UnknownText_0x174c29 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0918: farwritetext UnknownText_0x174ec5 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0920: farwritetext UnknownText_0x17519b buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0928: farwritetext UnknownText_0x17549b buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0930: farwritetext UnknownText_0x17571d buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0938: farwritetext UnknownText_0x175abe buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0940: farwritetext UnknownText_0x175eaf buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0948: farwritetext UnknownText_0x1768b0 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0950: farwritetext UnknownText_0x176d32 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0958: farwritetext UnknownText_0x1770fb buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0960: farwritetext UnknownText_0x177465 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0968: farwritetext UnknownText_0x64bc6 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0970: farwritetext UnknownText_0x64e90 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0978: farwritetext UnknownText_0x65161 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0980: farwritetext UnknownText_0x65a23 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0988: farwritetext UnknownText_0x65d5c buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0990: farwritetext UnknownText_0x65ff2 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0998: farwritetext UnknownText_0x6651e buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa09a0: farwritetext UnknownText_0x66882 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa09a8: farwritetext UnknownText_0x66aa5 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa09b0: farwritetext UnknownText_0x66ca7 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa09b8: farwritetext UnknownText_0x67106 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa09c0: farwritetext UnknownText_0x67294 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa09c8: - random $3 - if_equal $0, UnknownScript_0xa09d6 - if_equal $1, UnknownScript_0xa09de - if_equal $2, UnknownScript_0xa09e6 + random 3 + if_equal 0, UnknownScript_0xa09d6 + if_equal 1, UnknownScript_0xa09de + if_equal 2, UnknownScript_0xa09e6 UnknownScript_0xa09d6: farwritetext UnknownText_0x64846 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa09de: farwritetext UnknownText_0x64881 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa09e6: farwritetext UnknownText_0x648dc buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa09ee: checkcode VAR_KENJI_BREAK - if_equal $2, UnknownScript_0xa0a00 - if_equal $1, UnknownScript_0xa0a08 + if_equal 2, UnknownScript_0xa0a00 + if_equal 1, UnknownScript_0xa0a08 farwritetext UnknownText_0x66e17 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0a00: farwritetext UnknownText_0x66e67 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0a08: checkmorn @@ -1479,17 +1479,17 @@ UnknownScript_0xa0a08: setevent EVENT_KENJI_ON_BREAK farwritetext UnknownText_0x66f11 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0a1d: farwritetext UnknownText_0x66ed3 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0a25: farwritetext UnknownText_0x66f52 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0a2d: farwritetext UnknownText_0x174638 @@ -1590,52 +1590,52 @@ UnknownScript_0xa0aa0: UnknownScript_0xa0aa5: farwritetext UnknownText_0x174895 buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0aad: farwritetext UnknownText_0x17529c buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0ab5: farwritetext UnknownText_0x175b6d buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0abd: farwritetext UnknownText_0x17750e buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0ac5: farwritetext UnknownText_0x64f1a buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0acd: farwritetext UnknownText_0x6520f buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0ad5: farwritetext UnknownText_0x65da6 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0add: farwritetext UnknownText_0x66087 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0ae5: farwritetext UnknownText_0x6691d buttonsound - jump UnknownScript_0xa053a + jump PhoneScript_HangupText_Female UnknownScript_0xa0aed: farwritetext UnknownText_0x66d45 buttonsound - jump UnknownScript_0xa0484 + jump PhoneScript_HangupText_Male UnknownScript_0xa0af5: farwritetext UnknownText_0x175f70 diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 156cf670b..e8af05f36 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1,3 +1,6 @@ +SWARM_DUNSPARCE EQU 0 +SWARM_YANMA EQU 1 + UnusedPhoneScript: ; 0xbcea5 farwritetext UnusedPhoneText end @@ -53,13 +56,13 @@ UnknownScript_0xbcee7: ; 0xbcee7 jump UnknownScript_0xbcf37 .violet ; 0xbcf15 - displaylocation SPROUT_TOWER, 1 + landmarktotext SPROUT_TOWER, 1 jump UnknownScript_0xbcedf .azalea ; 0xbcf1b - displaylocation SLOWPOKE_WELL, 1 + landmarktotext SLOWPOKE_WELL, 1 jump UnknownScript_0xbcedf .goldenrod ; 0xbcf21 - displaylocation RADIO_TOWER, 1 + landmarktotext RADIO_TOWER, 1 jump UnknownScript_0xbcedf UnknownScript_0xbcf27: ; 0xbcf27 @@ -302,7 +305,7 @@ JackPhoneScript1: trainertotext SCHOOLBOY, JACK1, $0 checkflag ENGINE_JACK iftrue UnknownScript_0xbd0f3 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JACK_MONDAY_MORNING iftrue UnknownScript_0xbd0ef checkcode VAR_WEEKDAY @@ -314,23 +317,23 @@ UnknownScript_0xbd0ef: farjump UnknownScript_0xa08f8 UnknownScript_0xbd0f3: - displaylocation NATIONAL_PARK, $2 + landmarktotext NATIONAL_PARK, $2 farjump UnknownScript_0xa0a2d JackPhoneScript2: trainertotext SCHOOLBOY, JACK1, $0 - farscall UnknownScript_0xbe1b6 - farscall UnknownScript_0xbde3f + farscall PhoneScript_GreetPhone_Male + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd13b checkflag ENGINE_JACK iftrue UnknownScript_0xbd11e checkflag ENGINE_JACK_MONDAY_MORNING iftrue UnknownScript_0xbd11e - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd12d UnknownScript_0xbd11e: - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd137 farjump UnknownScript_0xa0000 @@ -338,7 +341,7 @@ UnknownScript_0xbd12a: setflag ENGINE_JACK_MONDAY_MORNING UnknownScript_0xbd12d: - displaylocation NATIONAL_PARK, $2 + landmarktotext NATIONAL_PARK, $2 setflag ENGINE_JACK farjump UnknownScript_0xa0376 @@ -352,21 +355,21 @@ UnknownScript_0xbd13b: BeverlyPhoneScript1: trainertotext POKEFANF, BEVERLY1, $0 - farscall UnknownScript_0xbe0b6 + farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0xbd151 farjump UnknownScript_0xa0900 UnknownScript_0xbd151: - displaylocation NATIONAL_PARK, $2 + landmarktotext NATIONAL_PARK, $2 farjump UnknownScript_0xa0aa5 BeverlyPhoneScript2: trainertotext POKEFANF, BEVERLY1, $0 - farscall UnknownScript_0xbe41e + farscall PhoneScript_GreetPhone_Female checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0xbd16e - farscall UnknownScript_0xbde45 + farscall PhoneScript_Random4 if_equal $0, UnknownScript_0xbd172 UnknownScript_0xbd16e: @@ -374,7 +377,7 @@ UnknownScript_0xbd16e: UnknownScript_0xbd172: setflag ENGINE_BEVERLY_HAS_NUGGET - displaylocation NATIONAL_PARK, $2 + landmarktotext NATIONAL_PARK, $2 farjump UnknownScript_0xa061e ; Huey @@ -383,7 +386,7 @@ HueyPhoneScript1: trainertotext SAILOR, HUEY1, $0 checkflag ENGINE_HUEY iftrue UnknownScript_0xbd1a2 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_HUEY_WEDNESDAY_NIGHT iftrue UnknownScript_0xbd19b checkcode VAR_WEEKDAY @@ -396,28 +399,28 @@ UnknownScript_0xbd19b: farjump UnknownScript_0xa0908 UnknownScript_0xbd1a2: - displaylocation LIGHTHOUSE, $2 + landmarktotext LIGHTHOUSE, $2 farjump UnknownScript_0xa0a32 HueyPhoneScript2: trainertotext SAILOR, HUEY1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_HUEY iftrue UnknownScript_0xbd1c9 checkflag ENGINE_HUEY_WEDNESDAY_NIGHT iftrue UnknownScript_0xbd1c9 - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd1d0 if_equal $1, UnknownScript_0xbd1d0 UnknownScript_0xbd1c9: - farjump UnknownScript_0xbe622 + farjump PhoneScript_MonFlavorText UnknownScript_0xbd1cd: setflag ENGINE_HUEY_WEDNESDAY_NIGHT UnknownScript_0xbd1d0: - displaylocation LIGHTHOUSE, $2 + landmarktotext LIGHTHOUSE, $2 setflag ENGINE_HUEY farjump UnknownScript_0xa0376 @@ -427,7 +430,7 @@ GavenPhoneScript1: trainertotext COOLTRAINERM, GAVEN3, $0 checkflag ENGINE_GAVEN iftrue UnknownScript_0xbd1fd - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_GAVEN_THURSDAY_MORNING iftrue UnknownScript_0xbd1f9 checkcode VAR_WEEKDAY @@ -439,21 +442,21 @@ UnknownScript_0xbd1f9: farjump UnknownScript_0xa0910 UnknownScript_0xbd1fd: - displaylocation ROUTE_26, $2 + landmarktotext ROUTE_26, $2 farjump UnknownScript_0xa0a37 GavenPhoneScript2: trainertotext COOLTRAINERM, GAVEN3, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_GAVEN iftrue UnknownScript_0xbd220 checkflag ENGINE_GAVEN_THURSDAY_MORNING iftrue UnknownScript_0xbd220 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd22f UnknownScript_0xbd220: - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd239 farjump UnknownScript_0xa0000 @@ -461,7 +464,7 @@ UnknownScript_0xbd22c: setflag ENGINE_GAVEN_THURSDAY_MORNING UnknownScript_0xbd22f: - displaylocation ROUTE_26, $2 + landmarktotext ROUTE_26, $2 setflag ENGINE_GAVEN farjump UnknownScript_0xa0376 @@ -474,7 +477,7 @@ BethPhoneScript1: trainertotext COOLTRAINERF, BETH1, $0 checkflag ENGINE_BETH iftrue UnknownScript_0xbd260 - farscall UnknownScript_0xbe0b6 + farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_BETH_FRIDAY_AFTERNOON iftrue UnknownScript_0xbd25c checkcode VAR_WEEKDAY @@ -486,17 +489,17 @@ UnknownScript_0xbd25c: farjump UnknownScript_0xa0918 UnknownScript_0xbd260: - displaylocation ROUTE_26, $2 + landmarktotext ROUTE_26, $2 farjump UnknownScript_0xa0a3c BethPhoneScript2: trainertotext COOLTRAINERF, BETH1, $0 - farscall UnknownScript_0xbe41e + farscall PhoneScript_GreetPhone_Female checkflag ENGINE_BETH iftrue UnknownScript_0xbd283 checkflag ENGINE_BETH_FRIDAY_AFTERNOON iftrue UnknownScript_0xbd283 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd28a UnknownScript_0xbd283: @@ -506,7 +509,7 @@ UnknownScript_0xbd287: setflag ENGINE_BETH_FRIDAY_AFTERNOON UnknownScript_0xbd28a: - displaylocation ROUTE_26, $2 + landmarktotext ROUTE_26, $2 setflag ENGINE_BETH farjump UnknownScript_0xa037e @@ -516,7 +519,7 @@ JosePhoneScript1: trainertotext BIRD_KEEPER, JOSE2, $0 checkflag ENGINE_JOSE iftrue UnknownScript_0xbd2bd - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JOSE_SATURDAY_NIGHT iftrue UnknownScript_0xbd2b9 checkflag ENGINE_JOSE_HAS_STAR_PIECE @@ -530,29 +533,29 @@ UnknownScript_0xbd2b9: farjump UnknownScript_0xa0920 UnknownScript_0xbd2bd: - displaylocation ROUTE_27, $2 + landmarktotext ROUTE_27, $2 farjump UnknownScript_0xa0a41 UnknownScript_0xbd2c4: - displaylocation ROUTE_27, $2 + landmarktotext ROUTE_27, $2 farjump UnknownScript_0xa0a41 JosePhoneScript2: trainertotext BIRD_KEEPER, JOSE2, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_JOSE iftrue UnknownScript_0xbd2f5 checkflag ENGINE_JOSE_SATURDAY_NIGHT iftrue UnknownScript_0xbd2f5 checkflag ENGINE_JOSE_HAS_STAR_PIECE iftrue UnknownScript_0xbd2f5 - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd304 - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd312 UnknownScript_0xbd2f5: - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd30e farjump UnknownScript_0xa0000 @@ -560,7 +563,7 @@ UnknownScript_0xbd301: setflag ENGINE_JOSE_SATURDAY_NIGHT UnknownScript_0xbd304: - displaylocation ROUTE_27, $2 + landmarktotext ROUTE_27, $2 setflag ENGINE_JOSE farjump UnknownScript_0xa0376 @@ -569,7 +572,7 @@ UnknownScript_0xbd30e: UnknownScript_0xbd312: setflag ENGINE_JOSE_HAS_STAR_PIECE - displaylocation ROUTE_27, $2 + landmarktotext ROUTE_27, $2 farjump UnknownScript_0xa05e6 ; Reena @@ -578,7 +581,7 @@ ReenaPhoneScript1: trainertotext COOLTRAINERF, REENA1, $0 checkflag ENGINE_REENA iftrue UnknownScript_0xbd33f - farscall UnknownScript_0xbe0b6 + farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_REENA_SUNDAY_MORNING iftrue UnknownScript_0xbd33b checkcode VAR_WEEKDAY @@ -590,17 +593,17 @@ UnknownScript_0xbd33b: farjump UnknownScript_0xa0928 UnknownScript_0xbd33f: - displaylocation ROUTE_27, $2 + landmarktotext ROUTE_27, $2 farjump UnknownScript_0xa0a46 ReenaPhoneScript2: trainertotext COOLTRAINERF, REENA1, $0 - farscall UnknownScript_0xbe41e + farscall PhoneScript_GreetPhone_Female checkflag ENGINE_REENA iftrue UnknownScript_0xbd362 checkflag ENGINE_REENA_SUNDAY_MORNING iftrue UnknownScript_0xbd362 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd369 UnknownScript_0xbd362: @@ -610,7 +613,7 @@ UnknownScript_0xbd366: setflag ENGINE_REENA_SUNDAY_MORNING UnknownScript_0xbd369: - displaylocation ROUTE_27, $2 + landmarktotext ROUTE_27, $2 setflag ENGINE_REENA farjump UnknownScript_0xa037e @@ -620,7 +623,7 @@ JoeyPhoneScript1: trainertotext YOUNGSTER, JOEY1, $0 checkflag ENGINE_JOEY iftrue UnknownScript_0xbd399 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JOEY_MONDAY_AFTERNOON iftrue UnknownScript_0xbd392 checkcode VAR_WEEKDAY @@ -633,17 +636,17 @@ UnknownScript_0xbd392: farjump UnknownScript_0xa0930 UnknownScript_0xbd399: - displaylocation ROUTE_30, $2 + landmarktotext ROUTE_30, $2 farjump UnknownScript_0xa0a4b JoeyPhoneScript2: trainertotext YOUNGSTER, JOEY1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_JOEY iftrue UnknownScript_0xbd3c0 checkflag ENGINE_JOEY_MONDAY_AFTERNOON iftrue UnknownScript_0xbd3c0 - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd3c7 if_equal $1, UnknownScript_0xbd3c7 @@ -654,7 +657,7 @@ UnknownScript_0xbd3c4: setflag ENGINE_JOEY_MONDAY_AFTERNOON UnknownScript_0xbd3c7: - displaylocation ROUTE_30, $2 + landmarktotext ROUTE_30, $2 setflag ENGINE_JOEY farjump UnknownScript_0xa0376 @@ -664,7 +667,7 @@ WadePhoneScript1: trainertotext BUG_CATCHER, WADE1, $0 checkflag ENGINE_WADE iftrue UnknownScript_0xbd41a - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_WADE_TUESDAY_NIGHT iftrue UnknownScript_0xbd3f6 checkflag ENGINE_WADE_HAS_ITEM @@ -675,7 +678,7 @@ WadePhoneScript1: iftrue UnknownScript_0xbd484 UnknownScript_0xbd3f6: - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd412 checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0xbd412 @@ -691,17 +694,17 @@ UnknownScript_0xbd416: farjump UnknownScript_0xa05a4 UnknownScript_0xbd41a: - displaylocation ROUTE_31, $2 + landmarktotext ROUTE_31, $2 farjump UnknownScript_0xa0a50 UnknownScript_0xbd421: - displaylocation ROUTE_31, $2 + landmarktotext ROUTE_31, $2 farjump UnknownScript_0xa0ab5 WadePhoneScript2: trainertotext BUG_CATCHER, WADE1, $0 - farscall UnknownScript_0xbe1b6 - farscall UnknownScript_0xbde3f + farscall PhoneScript_GreetPhone_Male + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd44c checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0xbd44c @@ -717,15 +720,15 @@ UnknownScript_0xbd44c: iftrue UnknownScript_0xbd474 checkflag ENGINE_WADE_HAS_ITEM iftrue UnknownScript_0xbd474 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd495 checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd474 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd487 UnknownScript_0xbd474: - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd491 farjump UnknownScript_0xa0000 @@ -736,7 +739,7 @@ UnknownScript_0xbd484: setflag ENGINE_WADE_TUESDAY_NIGHT UnknownScript_0xbd487: - displaylocation ROUTE_31, $2 + landmarktotext ROUTE_31, $2 setflag ENGINE_WADE farjump UnknownScript_0xa0376 @@ -745,7 +748,7 @@ UnknownScript_0xbd491: UnknownScript_0xbd495: setflag ENGINE_WADE_HAS_ITEM - displaylocation ROUTE_31, $2 + landmarktotext ROUTE_31, $2 clearevent EVENT_WADE_HAS_BERRY clearevent EVENT_WADE_HAS_PSNCUREBERRY clearevent EVENT_WADE_HAS_PRZCUREBERRY @@ -779,59 +782,56 @@ UnknownScript_0xbd4ce: RalphPhoneScript1: trainertotext FISHER, RALPH1, $0 checkflag ENGINE_RALPH - iftrue UnknownScript_0xbd4fb - farscall UnknownScript_0xbde4e + iftrue Ralph_Rematch + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_RALPH_WEDNESDAY_MORNING - iftrue UnknownScript_0xbd4f1 + iftrue Ralph_CheckSwarm checkcode VAR_WEEKDAY - if_not_equal WEDNESDAY, UnknownScript_0xbd4f1 + if_not_equal WEDNESDAY, Ralph_CheckSwarm checkmorn - iftrue UnknownScript_0xbd537 - -UnknownScript_0xbd4f1: + iftrue Ralph_WednesdayMorning +Ralph_CheckSwarm: checkflag ENGINE_SPECIAL_WILDDATA - iftrue UnknownScript_0xbd502 + iftrue Ralph_ReportSwarm farjump UnknownScript_0xa0940 -UnknownScript_0xbd4fb: - displaylocation ROUTE_32, $2 +Ralph_Rematch: + landmarktotext ROUTE_32, $2 farjump UnknownScript_0xa0a55 -UnknownScript_0xbd502: - displaylocation ROUTE_32, $2 +Ralph_ReportSwarm: + landmarktotext ROUTE_32, $2 farjump UnknownScript_0xa0af5 RalphPhoneScript2: trainertotext FISHER, RALPH1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_FLYPOINT_GOLDENROD - iffalse UnknownScript_0xbd52b + iffalse Ralph_CheckSwarm2 checkflag ENGINE_RALPH - iftrue UnknownScript_0xbd52b + iftrue Ralph_CheckSwarm2 checkflag ENGINE_RALPH_WEDNESDAY_MORNING - iftrue UnknownScript_0xbd52b - farscall UnknownScript_0xbde3f - if_equal $0, UnknownScript_0xbd53a - -UnknownScript_0xbd52b: - farscall UnknownScript_0xbde48 - if_equal $0, UnknownScript_0xbd544 + iftrue Ralph_CheckSwarm2 + farscall PhoneScript_Random2 + if_equal $0, Ralph_FightMe +Ralph_CheckSwarm2: + farscall PhoneScript_Random5 + if_equal $0, Ralph_SetUpSwarm farjump UnknownScript_0xa0000 -UnknownScript_0xbd537: +Ralph_WednesdayMorning: setflag ENGINE_RALPH_WEDNESDAY_MORNING - -UnknownScript_0xbd53a: - displaylocation ROUTE_32, $2 +Ralph_FightMe: + landmarktotext ROUTE_32, $2 setflag ENGINE_RALPH farjump UnknownScript_0xa0376 -UnknownScript_0xbd544: +Ralph_SetUpSwarm: checkflag ENGINE_SPECIAL_WILDDATA iftrue UnknownScript_0xbd55c setflag ENGINE_SPECIAL_WILDDATA pokenamemem QWILFISH, $1 - displaylocation ROUTE_32, $2 + landmarktotext ROUTE_32, $2 writebyte $1 special Special_ActivateFishingSwarm farjump UnknownScript_0xa05d6 @@ -845,7 +845,7 @@ LizPhoneScript1: trainertotext PICNICKER, LIZ1, $0 checkflag ENGINE_LIZ iftrue UnknownScript_0xbd586 - farscall UnknownScript_0xbe0b6 + farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_LIZ_THURSDAY_AFTERNOON iftrue UnknownScript_0xbd57f checkcode VAR_WEEKDAY @@ -858,25 +858,25 @@ UnknownScript_0xbd57f: farjump UnknownScript_0xa0948 UnknownScript_0xbd586: - displaylocation ROUTE_32, $2 + landmarktotext ROUTE_32, $2 farjump UnknownScript_0xa0a5a LizPhoneScript2: trainertotext PICNICKER, LIZ1, $0 - farscall UnknownScript_0xbde45 + farscall PhoneScript_Random4 if_equal $0, UnknownScript_0xbd5d0 - farscall UnknownScript_0xbe41e + farscall PhoneScript_GreetPhone_Female checkflag ENGINE_LIZ iftrue UnknownScript_0xbd5a9 checkflag ENGINE_LIZ_THURSDAY_AFTERNOON iftrue UnknownScript_0xbd5a9 UnknownScript_0xbd5a9: - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd5d4 checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd5bf - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd5c6 UnknownScript_0xbd5bf: @@ -886,7 +886,7 @@ UnknownScript_0xbd5c3: setflag ENGINE_LIZ_THURSDAY_AFTERNOON UnknownScript_0xbd5c6: - displaylocation ROUTE_32, $2 + landmarktotext ROUTE_32, $2 setflag ENGINE_LIZ farjump UnknownScript_0xa037e @@ -950,7 +950,7 @@ AnthonyPhoneScript1: trainertotext HIKER, ANTHONY2, $0 checkflag ENGINE_ANTHONY iftrue UnknownScript_0xbd65d - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ANTHONY_FRIDAY_NIGHT iftrue UnknownScript_0xbd653 checkcode VAR_WEEKDAY @@ -964,27 +964,27 @@ UnknownScript_0xbd653: farjump UnknownScript_0xa0950 UnknownScript_0xbd65d: - displaylocation ROUTE_33, $2 + landmarktotext ROUTE_33, $2 farjump UnknownScript_0xa0a5f UnknownScript_0xbd664: - displaylocation ROUTE_33, $2 + landmarktotext ROUTE_33, $2 farjump UnknownScript_0xa0afa AnthonyPhoneScript2: trainertotext HIKER, ANTHONY2, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd68d checkflag ENGINE_ANTHONY iftrue UnknownScript_0xbd68d checkflag ENGINE_ANTHONY_FRIDAY_NIGHT iftrue UnknownScript_0xbd68d - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd69c UnknownScript_0xbd68d: - farscall UnknownScript_0xbde48 + farscall PhoneScript_Random5 if_equal $0, UnknownScript_0xbd6a6 farjump UnknownScript_0xa0000 @@ -992,7 +992,7 @@ UnknownScript_0xbd699: setflag ENGINE_ANTHONY_FRIDAY_NIGHT UnknownScript_0xbd69c: - displaylocation ROUTE_33, $2 + landmarktotext ROUTE_33, $2 setflag ENGINE_ANTHONY farjump UnknownScript_0xa0376 @@ -1001,8 +1001,8 @@ UnknownScript_0xbd6a6: iftrue UnknownScript_0xbd6bd setflag ENGINE_DUNSPARCE_SWARM pokenamemem DUNSPARCE, $1 - loadwilddata $0, DARK_CAVE_VIOLET_ENTRANCE - displaylocation DARK_CAVE, $2 + swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE + landmarktotext DARK_CAVE, $2 farjump UnknownScript_0xa05de UnknownScript_0xbd6bd: @@ -1014,7 +1014,7 @@ ToddPhoneScript1: trainertotext CAMPER, TODD1, $0 checkflag ENGINE_TODD iftrue UnknownScript_0xbd6ea - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_TODD_SATURDAY_MORNING iftrue UnknownScript_0xbd6e0 checkcode VAR_WEEKDAY @@ -1028,7 +1028,7 @@ UnknownScript_0xbd6e0: farjump UnknownScript_0xa0958 UnknownScript_0xbd6ea: - displaylocation ROUTE_34, $2 + landmarktotext ROUTE_34, $2 farjump UnknownScript_0xa0a64 UnknownScript_0xbd6f1: @@ -1036,22 +1036,22 @@ UnknownScript_0xbd6f1: ToddPhoneScript2: trainertotext CAMPER, TODD1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_TODD iftrue UnknownScript_0xbd717 checkflag ENGINE_TODD_SATURDAY_MORNING iftrue UnknownScript_0xbd717 checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd71f - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd72e UnknownScript_0xbd717: - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd73c UnknownScript_0xbd71f: - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd738 farjump UnknownScript_0xa0000 @@ -1059,7 +1059,7 @@ UnknownScript_0xbd72b: setflag ENGINE_TODD_SATURDAY_MORNING UnknownScript_0xbd72e: - displaylocation ROUTE_34, $2 + landmarktotext ROUTE_34, $2 setflag ENGINE_TODD farjump UnknownScript_0xa0376 @@ -1076,7 +1076,7 @@ GinaPhoneScript1: trainertotext PICNICKER, GINA1, $0 checkflag ENGINE_GINA iftrue UnknownScript_0xbd776 - farscall UnknownScript_0xbe0b6 + farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_GINA_SUNDAY_AFTERNOON iftrue UnknownScript_0xbd768 checkflag ENGINE_GINA_HAS_LEAF_STONE @@ -1095,16 +1095,16 @@ UnknownScript_0xbd772: farjump UnknownScript_0xa05c6 UnknownScript_0xbd776: - displaylocation ROUTE_34, $2 + landmarktotext ROUTE_34, $2 farjump UnknownScript_0xa0a69 UnknownScript_0xbd77d: - displaylocation ROUTE_34, $2 + landmarktotext ROUTE_34, $2 farjump UnknownScript_0xa0abd GinaPhoneScript2: trainertotext PICNICKER, GINA1, $0 - farscall UnknownScript_0xbe41e + farscall PhoneScript_GreetPhone_Female checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0xbd7d9 checkflag ENGINE_GINA @@ -1115,15 +1115,15 @@ GinaPhoneScript2: iftrue UnknownScript_0xbd7c8 checkevent EVENT_GINA_GAVE_LEAF_STONE iftrue UnknownScript_0xbd7b2 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd7dd UnknownScript_0xbd7b2: - farscall UnknownScript_0xbde4b + farscall PhoneScript_Random11 if_equal $0, UnknownScript_0xbd7dd checkflag ENGINE_FLYPOINT_GOLDENROD iffalse UnknownScript_0xbd7c8 - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd7cf UnknownScript_0xbd7c8: @@ -1133,7 +1133,7 @@ UnknownScript_0xbd7cc: setflag ENGINE_GINA_SUNDAY_AFTERNOON UnknownScript_0xbd7cf: - displaylocation ROUTE_34, $2 + landmarktotext ROUTE_34, $2 setflag ENGINE_GINA farjump UnknownScript_0xa037e @@ -1142,14 +1142,14 @@ UnknownScript_0xbd7d9: UnknownScript_0xbd7dd: setflag ENGINE_GINA_HAS_LEAF_STONE - displaylocation ROUTE_34, $2 + landmarktotext ROUTE_34, $2 farjump UnknownScript_0xa061e ; Irwin IrwinPhoneScript1: trainertotext JUGGLER, IRWIN1, $0 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0xbd7f9 farjump UnknownScript_0xa09c8 @@ -1159,7 +1159,7 @@ UnknownScript_0xbd7f9: IrwinPhoneScript2: trainertotext JUGGLER, IRWIN1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0xbd80f farjump UnknownScript_0xa0848 @@ -1173,7 +1173,7 @@ ArniePhoneScript1: trainertotext BUG_CATCHER, ARNIE1, $0 checkflag ENGINE_ARNIE iftrue UnknownScript_0xbd83c - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ARNIE_TUESDAY_MORNING iftrue UnknownScript_0xbd832 checkcode VAR_WEEKDAY @@ -1187,27 +1187,27 @@ UnknownScript_0xbd832: farjump UnknownScript_0xa0968 UnknownScript_0xbd83c: - displaylocation ROUTE_35, $2 + landmarktotext ROUTE_35, $2 farjump UnknownScript_0xa0a6e UnknownScript_0xbd843: - displaylocation ROUTE_35, $2 + landmarktotext ROUTE_35, $2 farjump UnknownScript_0xa0aff ArniePhoneScript2: trainertotext BUG_CATCHER, ARNIE1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ARNIE iftrue UnknownScript_0xbd866 checkflag ENGINE_ARNIE_TUESDAY_MORNING iftrue UnknownScript_0xbd866 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd87d UnknownScript_0xbd866: - farscall UnknownScript_0xbde48 + farscall PhoneScript_Random5 if_equal $0, UnknownScript_0xbd887 - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd89e farjump UnknownScript_0xa0000 @@ -1215,17 +1215,17 @@ UnknownScript_0xbd87a: setflag ENGINE_ARNIE_TUESDAY_MORNING UnknownScript_0xbd87d: - displaylocation ROUTE_35, $2 + landmarktotext ROUTE_35, $2 setflag ENGINE_ARNIE farjump UnknownScript_0xa0376 -UnknownScript_0xbd887: +UnknownScript_0xbd887: ; start swarm checkflag ENGINE_YANMA_SWARM iftrue UnknownScript_0xbd8a2 setflag ENGINE_YANMA_SWARM pokenamemem YANMA, $1 - loadwilddata $1, ROUTE_35 - displaylocation ROUTE_35, $2 + swarm SWARM_YANMA, ROUTE_35 + landmarktotext ROUTE_35, $2 farjump UnknownScript_0xa05ce UnknownScript_0xbd89e: @@ -1240,7 +1240,7 @@ AlanPhoneScript1: trainertotext SCHOOLBOY, ALAN1, $0 checkflag ENGINE_ALAN iftrue UnknownScript_0xbd8cf - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON iftrue UnknownScript_0xbd8cb checkflag ENGINE_ALAN_HAS_FIRE_STONE @@ -1254,31 +1254,31 @@ UnknownScript_0xbd8cb: farjump UnknownScript_0xa0970 UnknownScript_0xbd8cf: - displaylocation ROUTE_36, $2 + landmarktotext ROUTE_36, $2 farjump UnknownScript_0xa0a73 UnknownScript_0xbd8d6: - displaylocation ROUTE_36, $2 + landmarktotext ROUTE_36, $2 farjump UnknownScript_0xa0ac5 AlanPhoneScript2: trainertotext SCHOOLBOY, ALAN1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ALAN iftrue UnknownScript_0xbd915 checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON iftrue UnknownScript_0xbd915 checkflag ENGINE_ALAN_HAS_FIRE_STONE iftrue UnknownScript_0xbd915 - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd91c checkevent EVENT_ALAN_GAVE_FIRE_STONE iftrue UnknownScript_0xbd90d - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd926 UnknownScript_0xbd90d: - farscall UnknownScript_0xbde4b + farscall PhoneScript_Random11 if_equal $0, UnknownScript_0xbd926 UnknownScript_0xbd915: @@ -1288,13 +1288,13 @@ UnknownScript_0xbd919: setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON UnknownScript_0xbd91c: - displaylocation ROUTE_36, $2 + landmarktotext ROUTE_36, $2 setflag ENGINE_ALAN farjump UnknownScript_0xa0376 UnknownScript_0xbd926: setflag ENGINE_ALAN_HAS_FIRE_STONE - displaylocation ROUTE_36, $2 + landmarktotext ROUTE_36, $2 farjump UnknownScript_0xa05e6 ; Dana @@ -1303,7 +1303,7 @@ DanaPhoneScript1: trainertotext LASS, DANA1, $0 checkflag ENGINE_DANA iftrue UnknownScript_0xbd959 - farscall UnknownScript_0xbe0b6 + farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_DANA_THURSDAY_NIGHT iftrue UnknownScript_0xbd955 checkflag ENGINE_DANA_HAS_THUNDERSTONE @@ -1317,35 +1317,35 @@ UnknownScript_0xbd955: farjump UnknownScript_0xa0978 UnknownScript_0xbd959: - displaylocation ROUTE_38, $2 + landmarktotext ROUTE_38, $2 farjump UnknownScript_0xa0a78 UnknownScript_0xbd960: - displaylocation ROUTE_38, $2 + landmarktotext ROUTE_38, $2 farjump UnknownScript_0xa0acd DanaPhoneScript2: trainertotext LASS, DANA1, $0 - farscall UnknownScript_0xbe41e + farscall PhoneScript_GreetPhone_Female checkflag ENGINE_DANA iftrue UnknownScript_0xbd99f checkflag ENGINE_DANA_THURSDAY_NIGHT iftrue UnknownScript_0xbd99f checkflag ENGINE_DANA_HAS_THUNDERSTONE iftrue UnknownScript_0xbd99f - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd9ae checkevent EVENT_DANA_GAVE_THUNDERSTONE iftrue UnknownScript_0xbd997 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd9bc UnknownScript_0xbd997: - farscall UnknownScript_0xbde4b + farscall PhoneScript_Random11 if_equal $0, UnknownScript_0xbd9bc UnknownScript_0xbd99f: - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd9b8 farjump UnknownScript_0xa0017 @@ -1353,7 +1353,7 @@ UnknownScript_0xbd9ab: setflag ENGINE_DANA_THURSDAY_NIGHT UnknownScript_0xbd9ae: - displaylocation ROUTE_38, $2 + landmarktotext ROUTE_38, $2 setflag ENGINE_DANA farjump UnknownScript_0xa037e @@ -1362,7 +1362,7 @@ UnknownScript_0xbd9b8: UnknownScript_0xbd9bc: setflag ENGINE_DANA_HAS_THUNDERSTONE - displaylocation ROUTE_38, $2 + landmarktotext ROUTE_38, $2 farjump UnknownScript_0xa061e ; Chad @@ -1371,7 +1371,7 @@ ChadPhoneScript1: trainertotext SCHOOLBOY, CHAD1, $0 checkflag ENGINE_CHAD iftrue UnknownScript_0xbd9e9 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_CHAD_FRIDAY_MORNING iftrue UnknownScript_0xbd9e5 checkcode VAR_WEEKDAY @@ -1383,23 +1383,23 @@ UnknownScript_0xbd9e5: farjump UnknownScript_0xa0980 UnknownScript_0xbd9e9: - displaylocation ROUTE_38, $2 + landmarktotext ROUTE_38, $2 farjump UnknownScript_0xa0a7d ChadPhoneScript2: trainertotext SCHOOLBOY, CHAD1, $0 - farscall UnknownScript_0xbe1b6 - farscall UnknownScript_0xbde3f + farscall PhoneScript_GreetPhone_Male + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbda31 checkflag ENGINE_CHAD iftrue UnknownScript_0xbda14 checkflag ENGINE_CHAD_FRIDAY_MORNING iftrue UnknownScript_0xbda14 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbda23 UnknownScript_0xbda14: - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbda2d farjump UnknownScript_0xa0000 @@ -1407,7 +1407,7 @@ UnknownScript_0xbda20: setflag ENGINE_CHAD_FRIDAY_MORNING UnknownScript_0xbda23: - displaylocation ROUTE_38, $2 + landmarktotext ROUTE_38, $2 setflag ENGINE_CHAD farjump UnknownScript_0xa0376 @@ -1419,10 +1419,10 @@ UnknownScript_0xbda31: DerekPhoneScript1: trainertotext POKEFANM, DEREK1, $0 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_DEREK_HAS_NUGGET iftrue UnknownScript_0xbda67 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbda5f checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0xbda5f @@ -1438,13 +1438,13 @@ UnknownScript_0xbda63: farjump UnknownScript_0xa05a4 UnknownScript_0xbda67: - displaylocation ROUTE_39, $2 + landmarktotext ROUTE_39, $2 farjump UnknownScript_0xa0ad5 DerekPhoneScript2: trainertotext POKEFANM, DEREK1, $0 - farscall UnknownScript_0xbe1b6 - farscall UnknownScript_0xbde3f + farscall PhoneScript_GreetPhone_Male + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbda92 checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0xbda92 @@ -1454,7 +1454,7 @@ DerekPhoneScript2: if_equal SATURDAY, UnknownScript_0xbda9e UnknownScript_0xbda92: - farscall UnknownScript_0xbde45 + farscall PhoneScript_Random4 if_equal $0, UnknownScript_0xbdaa2 farjump UnknownScript_0xa0000 @@ -1463,14 +1463,14 @@ UnknownScript_0xbda9e: UnknownScript_0xbdaa2: setflag ENGINE_DEREK_HAS_NUGGET - displaylocation ROUTE_39, $2 + landmarktotext ROUTE_39, $2 farjump UnknownScript_0xa05e6 TullyPhoneScript1: trainertotext FISHER, TULLY1, $0 checkflag ENGINE_TULLY iftrue UnknownScript_0xbdad5 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_TULLY_SUNDAY_NIGHT iftrue UnknownScript_0xbdad1 checkflag ENGINE_TULLY_HAS_WATER_STONE @@ -1484,31 +1484,31 @@ UnknownScript_0xbdad1: farjump UnknownScript_0xa0990 UnknownScript_0xbdad5: - displaylocation ROUTE_42, $2 + landmarktotext ROUTE_42, $2 farjump UnknownScript_0xa0a82 UnknownScript_0xbdadc: - displaylocation ROUTE_42, $2 + landmarktotext ROUTE_42, $2 farjump UnknownScript_0xa0add TullyPhoneScript2: trainertotext FISHER, TULLY1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_TULLY iftrue UnknownScript_0xbdb1b checkflag ENGINE_TULLY_SUNDAY_NIGHT iftrue UnknownScript_0xbdb1b checkflag ENGINE_TULLY_HAS_WATER_STONE iftrue UnknownScript_0xbdb1b - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbdb22 checkevent EVENT_TULLY_GAVE_WATER_STONE iftrue UnknownScript_0xbdb13 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbdb2c UnknownScript_0xbdb13: - farscall UnknownScript_0xbde4b + farscall PhoneScript_Random11 if_equal $0, UnknownScript_0xbdb2c UnknownScript_0xbdb1b: @@ -1518,20 +1518,20 @@ UnknownScript_0xbdb1f: setflag ENGINE_TULLY_SUNDAY_NIGHT UnknownScript_0xbdb22: - displaylocation ROUTE_42, $2 + landmarktotext ROUTE_42, $2 setflag ENGINE_TULLY farjump UnknownScript_0xa0376 UnknownScript_0xbdb2c: setflag ENGINE_TULLY_HAS_WATER_STONE - displaylocation ROUTE_42, $2 + landmarktotext ROUTE_42, $2 farjump UnknownScript_0xa05e6 BrentPhoneScript1: trainertotext POKEMANIAC, BRENT1, $0 checkflag ENGINE_BRENT iftrue UnknownScript_0xbdb59 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_BRENT_MONDAY_MORNING iftrue UnknownScript_0xbdb55 checkcode VAR_WEEKDAY @@ -1543,19 +1543,19 @@ UnknownScript_0xbdb55: farjump UnknownScript_0xa0998 UnknownScript_0xbdb59: - displaylocation ROUTE_43, $2 + landmarktotext ROUTE_43, $2 farjump UnknownScript_0xa0a87 BrentPhoneScript2: trainertotext POKEMANIAC, BRENT1, $0 - farscall UnknownScript_0xbe1b6 - farscall UnknownScript_0xbde3f + farscall PhoneScript_GreetPhone_Male + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbdb95 checkflag ENGINE_BRENT iftrue UnknownScript_0xbdb84 checkflag ENGINE_BRENT_MONDAY_MORNING iftrue UnknownScript_0xbdb84 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbdb8b UnknownScript_0xbdb84: @@ -1565,7 +1565,7 @@ UnknownScript_0xbdb88: setflag ENGINE_BRENT_MONDAY_MORNING UnknownScript_0xbdb8b: - displaylocation ROUTE_43, $2 + landmarktotext ROUTE_43, $2 setflag ENGINE_BRENT farjump UnknownScript_0xa0376 @@ -1576,7 +1576,7 @@ TiffanyPhoneScript1: trainertotext PICNICKER, TIFFANY3, $0 checkflag ENGINE_TIFFANY iftrue UnknownScript_0xbdbc2 - farscall UnknownScript_0xbe0b6 + farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON iftrue UnknownScript_0xbdbbe checkflag ENGINE_TIFFANY_HAS_PINK_BOW @@ -1590,33 +1590,33 @@ UnknownScript_0xbdbbe: farjump UnknownScript_0xa09a0 UnknownScript_0xbdbc2: - displaylocation ROUTE_43, $2 + landmarktotext ROUTE_43, $2 farjump UnknownScript_0xa0a8c UnknownScript_0xbdbc9: - displaylocation ROUTE_43, $2 + landmarktotext ROUTE_43, $2 farjump UnknownScript_0xa0ae5 TiffanyPhoneScript2: trainertotext PICNICKER, TIFFANY3, $0 - farscall UnknownScript_0xbde45 + farscall PhoneScript_Random4 if_equal $0, UnknownScript_0xbdc21 - farscall UnknownScript_0xbe41e + farscall PhoneScript_GreetPhone_Female checkflag ENGINE_TIFFANY iftrue UnknownScript_0xbdc10 checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON iftrue UnknownScript_0xbdc10 checkflag ENGINE_TIFFANY_HAS_PINK_BOW iftrue UnknownScript_0xbdc10 - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbdc17 checkevent EVENT_TIFFANY_GAVE_PINK_BOW iftrue UnknownScript_0xbdc08 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbdc69 UnknownScript_0xbdc08: - farscall UnknownScript_0xbde4b + farscall PhoneScript_Random11 if_equal $0, UnknownScript_0xbdc69 UnknownScript_0xbdc10: @@ -1626,7 +1626,7 @@ UnknownScript_0xbdc14: setflag ENGINE_TIFFANY_TUESDAY_AFTERNOON UnknownScript_0xbdc17: - displaylocation ROUTE_43, $2 + landmarktotext ROUTE_43, $2 setflag ENGINE_TIFFANY farjump UnknownScript_0xa037e @@ -1668,7 +1668,7 @@ UnknownScript_0xbdc65: UnknownScript_0xbdc69: setflag ENGINE_TIFFANY_HAS_PINK_BOW - displaylocation ROUTE_43, $2 + landmarktotext ROUTE_43, $2 farjump UnknownScript_0xa061e ; Vance @@ -1677,7 +1677,7 @@ VancePhoneScript1: trainertotext BIRD_KEEPER, VANCE1, $0 checkflag ENGINE_VANCE iftrue UnknownScript_0xbdc96 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_VANCE_WEDNESDAY_NIGHT iftrue UnknownScript_0xbdc92 checkcode VAR_WEEKDAY @@ -1689,17 +1689,17 @@ UnknownScript_0xbdc92: farjump UnknownScript_0xa09a8 UnknownScript_0xbdc96: - displaylocation ROUTE_44, $2 + landmarktotext ROUTE_44, $2 farjump UnknownScript_0xa0a91 VancePhoneScript2: trainertotext BIRD_KEEPER, VANCE1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_VANCE iftrue UnknownScript_0xbdcbd checkflag ENGINE_VANCE_WEDNESDAY_NIGHT iftrue UnknownScript_0xbdcbd - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbdcc4 if_equal $1, UnknownScript_0xbdcc4 @@ -1710,7 +1710,7 @@ UnknownScript_0xbdcc1: setflag ENGINE_VANCE_WEDNESDAY_NIGHT UnknownScript_0xbdcc4: - displaylocation ROUTE_44, $2 + landmarktotext ROUTE_44, $2 setflag ENGINE_VANCE farjump UnknownScript_0xa0376 @@ -1718,7 +1718,7 @@ WiltonPhoneScript1: trainertotext FISHER, WILTON1, $0 checkflag ENGINE_WILTON iftrue UnknownScript_0xbdcf7 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_WILTON_THRUSDAY_MORNING iftrue UnknownScript_0xbdcf3 checkflag ENGINE_WILTON_HAS_ITEM @@ -1732,25 +1732,25 @@ UnknownScript_0xbdcf3: farjump UnknownScript_0xa09b0 UnknownScript_0xbdcf7: - displaylocation ROUTE_44, $2 + landmarktotext ROUTE_44, $2 farjump UnknownScript_0xa0a96 UnknownScript_0xbdcfe: - displaylocation ROUTE_44, $2 + landmarktotext ROUTE_44, $2 farjump UnknownScript_0xa0aed WiltonPhoneScript2: trainertotext FISHER, WILTON1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_WILTON iftrue UnknownScript_0xbdd2f checkflag ENGINE_WILTON_THRUSDAY_MORNING iftrue UnknownScript_0xbdd2f checkflag ENGINE_WILTON_HAS_ITEM iftrue UnknownScript_0xbdd2f - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbdd36 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbdd40 UnknownScript_0xbdd2f: @@ -1760,13 +1760,13 @@ UnknownScript_0xbdd33: setflag ENGINE_WILTON_THRUSDAY_MORNING UnknownScript_0xbdd36: - displaylocation ROUTE_44, $2 + landmarktotext ROUTE_44, $2 setflag ENGINE_WILTON farjump UnknownScript_0xa0376 UnknownScript_0xbdd40: setflag ENGINE_WILTON_HAS_ITEM - displaylocation ROUTE_44, $2 + landmarktotext ROUTE_44, $2 clearevent EVENT_WILTON_HAS_ULTRA_BALL clearevent EVENT_WILTON_HAS_GREAT_BALL clearevent EVENT_WILTON_HAS_POKE_BALL @@ -1794,12 +1794,12 @@ UnknownScript_0xbdd6d: KenjiPhoneScript1: trainertotext BLACKBELT_T, KENJI3, $0 - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male farjump UnknownScript_0xa09ee KenjiPhoneScript2: trainertotext BLACKBELT_T, KENJI3, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male farjump UnknownScript_0xa064c ; Parry @@ -1808,7 +1808,7 @@ ParryPhoneScript1: trainertotext HIKER, PARRY1, $0 checkflag ENGINE_PARRY iftrue UnknownScript_0xbddac - farscall UnknownScript_0xbde4e + farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_PARRY_FRIDAY_AFTERNOON iftrue UnknownScript_0xbdda8 checkcode VAR_WEEKDAY @@ -1820,17 +1820,17 @@ UnknownScript_0xbdda8: farjump UnknownScript_0xa09b8 UnknownScript_0xbddac: - displaylocation ROUTE_45, $2 + landmarktotext ROUTE_45, $2 farjump UnknownScript_0xa0a9b ParryPhoneScript2: trainertotext HIKER, PARRY1, $0 - farscall UnknownScript_0xbe1b6 + farscall PhoneScript_GreetPhone_Male checkflag ENGINE_PARRY iftrue UnknownScript_0xbddd3 checkflag ENGINE_PARRY_FRIDAY_AFTERNOON iftrue UnknownScript_0xbddd3 - farscall UnknownScript_0xbde3f + farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbddda if_equal $1, UnknownScript_0xbddda @@ -1841,7 +1841,7 @@ UnknownScript_0xbddd7: setflag ENGINE_PARRY_FRIDAY_AFTERNOON UnknownScript_0xbddda: - displaylocation ROUTE_45, $2 + landmarktotext ROUTE_45, $2 setflag ENGINE_PARRY farjump UnknownScript_0xa0376 @@ -1851,7 +1851,7 @@ ErinPhoneScript1: trainertotext PICNICKER, ERIN1, $0 checkflag ENGINE_ERIN iftrue UnknownScript_0xbde07 - farscall UnknownScript_0xbe0b6 + farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_ERIN_SATURDAY_NIGHT iftrue UnknownScript_0xbde03 checkcode VAR_WEEKDAY @@ -1863,17 +1863,17 @@ UnknownScript_0xbde03: farjump UnknownScript_0xa09c0 UnknownScript_0xbde07: - displaylocation ROUTE_46, $2 + landmarktotext ROUTE_46, $2 farjump UnknownScript_0xa0aa0 ErinPhoneScript2: trainertotext PICNICKER, ERIN1, $0 - farscall UnknownScript_0xbe41e + farscall PhoneScript_GreetPhone_Female checkflag ENGINE_ERIN iftrue UnknownScript_0xbde2e checkflag ENGINE_ERIN_SATURDAY_NIGHT iftrue UnknownScript_0xbde2e - farscall UnknownScript_0xbde42 + farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbde35 if_equal $1, UnknownScript_0xbde35 @@ -1884,35 +1884,35 @@ UnknownScript_0xbde32: setflag ENGINE_ERIN_SATURDAY_NIGHT UnknownScript_0xbde35: - displaylocation ROUTE_46, $2 + landmarktotext ROUTE_46, $2 setflag ENGINE_ERIN farjump UnknownScript_0xa037e -UnknownScript_0xbde3f: - random $2 +PhoneScript_Random2: + random 2 end -UnknownScript_0xbde42: - random $3 +PhoneScript_Random3: + random 3 end -UnknownScript_0xbde45: - random $4 +PhoneScript_Random4: + random 4 end -UnknownScript_0xbde48: - random $5 +PhoneScript_Random5: + random 5 end -UnknownScript_0xbde4b: - random $b +PhoneScript_Random11: + random 11 end -UnknownScript_0xbde4e: +PhoneScript_AnswerPhone_Male: checkday - iftrue UnknownScript_0xbdf22 + iftrue PhoneScript_AnswerPhone_Male_Day checknite - iftrue UnknownScript_0xbdfec + iftrue PhoneScript_AnswerPhone_Male_Nite checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -2035,7 +2035,7 @@ UnknownScript_0xbde4e: buttonsound end -UnknownScript_0xbdf22: +PhoneScript_AnswerPhone_Male_Day: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -2158,7 +2158,7 @@ UnknownScript_0xbdf22: buttonsound end -UnknownScript_0xbdfec: +PhoneScript_AnswerPhone_Male_Nite: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -2281,11 +2281,11 @@ UnknownScript_0xbdfec: buttonsound end -UnknownScript_0xbe0b6: +PhoneScript_AnswerPhone_Female: checkday - iftrue UnknownScript_0xbe112 + iftrue PhoneScript_AnswerPhone_Female_Day checknite - iftrue UnknownScript_0xbe164 + iftrue PhoneScript_AnswerPhone_Female_Nite checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -2336,7 +2336,7 @@ UnknownScript_0xbe0b6: buttonsound end -UnknownScript_0xbe112: +PhoneScript_AnswerPhone_Female_Day: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -2387,7 +2387,7 @@ UnknownScript_0xbe112: buttonsound end -UnknownScript_0xbe164: +PhoneScript_AnswerPhone_Female_Nite: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -2438,11 +2438,11 @@ UnknownScript_0xbe164: buttonsound end -UnknownScript_0xbe1b6: +PhoneScript_GreetPhone_Male: checkday - iftrue UnknownScript_0xbe28a + iftrue PhoneScript_GreetPhone_Male_Day checknite - iftrue UnknownScript_0xbe354 + iftrue PhoneScript_GreetPhone_Male_Nite checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -2565,7 +2565,7 @@ UnknownScript_0xbe1b6: buttonsound end -UnknownScript_0xbe28a: +PhoneScript_GreetPhone_Male_Day: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -2688,7 +2688,7 @@ UnknownScript_0xbe28a: buttonsound end -UnknownScript_0xbe354: +PhoneScript_GreetPhone_Male_Nite: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -2811,11 +2811,11 @@ UnknownScript_0xbe354: buttonsound end -UnknownScript_0xbe41e: +PhoneScript_GreetPhone_Female: checkday - iftrue UnknownScript_0xbe47a + iftrue PhoneScript_GreetPhone_Female_Day checknite - iftrue UnknownScript_0xbe4cc + iftrue PhoneScript_GreetPhone_Female_Nite checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -2866,7 +2866,7 @@ UnknownScript_0xbe41e: buttonsound end -UnknownScript_0xbe47a: +PhoneScript_GreetPhone_Female_Day: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -2917,7 +2917,7 @@ UnknownScript_0xbe47a: buttonsound end -UnknownScript_0xbe4cc: +PhoneScript_GreetPhone_Female_Nite: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -2968,7 +2968,7 @@ UnknownScript_0xbe4cc: buttonsound end -UnknownScript_0xbe51e: +PhoneScript_Generic_Male: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -3078,7 +3078,7 @@ UnknownScript_0xbe51e: buttonsound end -UnknownScript_0xbe5d0: +PhoneScript_Generic_Female: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -3129,21 +3129,21 @@ UnknownScript_0xbe5d0: buttonsound end -UnknownScript_0xbe622: +PhoneScript_MonFlavorText: special RandomPhoneMon - farscall UnknownScript_0xbde3f - if_equal $0, UnknownScript_0xbe636 + farscall PhoneScript_Random2 + if_equal $0, .TooEnergetic farwritetext UnknownText_0x1b518b buttonsound - farjump UnknownScript_0xa0484 + farjump PhoneScript_HangupText_Male -UnknownScript_0xbe636: - farjump UnknownScript_0xbe63a +.TooEnergetic: + farjump .unnecessary -UnknownScript_0xbe63a: +.unnecessary: farwritetext UnknownText_0x1b522b buttonsound - farjump UnknownScript_0xa0484 + farjump PhoneScript_HangupText_Male ; be643 diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 25111dea1..14b1ebbce 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -339,7 +339,7 @@ Function40217: ; 40217 (10:4217) ret Function40258: ; 40258 (10:4258) - ld de, Unknown_402e8 + ld de, DexEntryPage_JoypadCoords call Function4135a ld hl, hJoyPressed ; $ffa7 ld a, [hl] @@ -355,7 +355,7 @@ Function40258: ; 40258 (10:4258) .a ld a, [wc7d8] - ld hl, Jumptable_402f2 + ld hl, DexEntryPage_Jumptable call Pokedex_LoadPointer jp [hl] @@ -373,7 +373,7 @@ Function40258: ; 40258 (10:4258) ret ; 40292 (10:4292) -Function40292: ; 40292 +Pokedex_Page: ; 40292 ld a, [wPokedexStatus] xor $1 ld [wPokedexStatus], a @@ -410,7 +410,7 @@ Function402aa: ; 402aa (10:42aa) ret ; 402e8 (10:42e8) -Unknown_402e8: ; 402e8 +DexEntryPage_JoypadCoords: ; 402e8 db D_RIGHT | D_LEFT, 4 dwcoord 1, 17 dwcoord 6, 17 @@ -419,14 +419,14 @@ Unknown_402e8: ; 402e8 ; 402f2 -Jumptable_402f2: ; 402f2 - dw Function40292 - dw Function402fa - dw Function40340 - dw Function4034f +DexEntryPage_Jumptable: ; 402f2 + dw Pokedex_Page + dw .Area + dw .Cry + dw .Print ; 402fa -Function402fa: ; 402fa +.Area: ; 402fa call Function41401 xor a ld [hSCX], a @@ -438,7 +438,7 @@ Function402fa: ; 402fa call Pokedex_GetMonAtCursorPosition ld a, [wDexCurrentLocation] ld e, a - predef Function91d11 + predef _Area call Function41401 call DelayFrame xor a @@ -458,7 +458,7 @@ Function402fa: ; 402fa ret ; 40340 -Function40340: ; 40340 +.Cry: ; 40340 call Pokedex_GetMonAtCursorPosition ld a, [wd265] call GetCryIndex @@ -468,7 +468,7 @@ Function40340: ; 40340 ret ; 4034f -Function4034f: ; 4034f +.Print: ; 4034f call Function41415 xor a ld [hSCX], a @@ -2393,7 +2393,7 @@ Function41415: ; 41415 ld a, $ff call DmgToCgbBGPals ld a, $ff - call Functioncf8 + call DmgToCgbObjPal0 call DelayFrame ret @@ -2405,7 +2405,7 @@ Function41427: ; 41427 ld a, $e4 call DmgToCgbBGPals ld a, $e0 - call Functioncf8 + call DmgToCgbObjPal0 ret ; 41432 diff --git a/engine/pokegear.asm b/engine/pokegear.asm index 8eda1d9b8..6fb446c1a 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -60,7 +60,7 @@ Function90bea: ; 90bea (24:4bea) ld [hWX], a call Function90c4e callba ClearSpriteAnims - call Function90d32 + call InitPokegearModeIndicatorArrow ld a, 8 call SkipMusic ld a, $e3 @@ -85,8 +85,8 @@ Function90bea: ; 90bea (24:4bea) ld a, [hCGB] and a ret z - ld a, $e4 - call Functioncf8 + ld a, %11100100 + call DmgToCgbObjPal0 ret Function90c4e: ; 90c4e @@ -121,6 +121,7 @@ Function90c4e: ; 90c4e ld l, e ld a, b + ; standing sprite push af ld de, VTiles0 tile $10 ld bc, 4 tiles @@ -129,7 +130,8 @@ Function90c4e: ; 90c4e pop hl - ld de, $c0 + ; walking sprite + ld de, 12 tiles add hl, de ld de, VTiles0 tile $14 ld bc, 4 tiles @@ -148,11 +150,11 @@ FastShipGFX: ; 90cb2 INCBIN "gfx/misc/fast_ship.2bpp" ; 90d32 -Function90d32: ; 90d32 (24:4d32) +InitPokegearModeIndicatorArrow: ; 90d32 (24:4d32) depixel 4, 2, 4, 0 ld a, SPRITE_ANIM_INDEX_0D call _InitSpriteAnimStruct - ld hl, $3 + ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $0 ret @@ -199,10 +201,10 @@ Function90d70: ; 90d70 (24:4d70) call GetWorldMapLocation cp FAST_SHIP - jr z, .asm_90d95 + jr z, .FastShip cp SPECIAL_MAP - jr nz, .asm_90d8e + jr nz, .LoadLandmark ld a, [BackupMapGroup] ld b, a @@ -210,12 +212,12 @@ Function90d70: ; 90d70 (24:4d70) ld c, a call GetWorldMapLocation -.asm_90d8e +.LoadLandmark ld [wc6d8], a ld [wc6d7], a ret -.asm_90d95 +.FastShip ld [wc6d8], a ld a, NEW_BARK_TOWN ld [wc6d7], a @@ -670,7 +672,7 @@ Function9102f: ; 9102f (24:502f) Function9106a: ; 9106a push af - ld de, 0 + depixel 0, 0 ld b, SPRITE_ANIM_INDEX_0A ld a, [PlayerGender] bit 0, a @@ -680,7 +682,7 @@ Function9106a: ; 9106a .asm_91079 ld a, b call _InitSpriteAnimStruct - ld hl, $3 + ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $10 pop af @@ -688,10 +690,10 @@ Function9106a: ; 9106a push bc callba GetLandmarkCoords pop bc - ld hl, $4 + ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld [hl], e - ld hl, $5 + ld hl, SPRITEANIMSTRUCT_YCOORD add hl, bc ld [hl], d ret @@ -699,15 +701,15 @@ Function9106a: ; 9106a Function91098: ; 91098 push af - ld de, 0 + depixel 0, 0 ld a, SPRITE_ANIM_INDEX_0D call _InitSpriteAnimStruct - ld hl, $3 + ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $4 - ld hl, $2 + ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc - ld [hl], $0 + ld [hl], SPRITE_ANIM_SEQ_00 pop af push bc call Function910d4 @@ -736,10 +738,10 @@ Function910d4: ; 910d4 ld e, a callba GetLandmarkCoords pop bc - ld hl, $4 + ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld [hl], e - ld hl, $5 + ld hl, SPRITEANIMSTRUCT_YCOORD add hl, bc ld [hl], d ret @@ -765,7 +767,7 @@ Function910f9: ; 910f9 (24:50f9) depixel 4, 10, 4, 4 ld a, SPRITE_ANIM_INDEX_14 call _InitSpriteAnimStruct - ld hl, $3 + ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $8 call _UpdateRadioStation @@ -1925,12 +1927,12 @@ PokegearMap: ; 91ae1 ld a, e and a jr nz, .kanto - call Function91ff2 + call LoadTownMapGFX call FillJohtoMap ret .kanto - call Function91ff2 + call LoadTownMapGFX call FillKantoMap ret ; 91af3 @@ -1946,13 +1948,13 @@ _FlyMap: ; 91af3 xor a ld [hBGMapMode], a callba ClearSpriteAnims - call Function91ff2 - ld de, GFX_922e1 + call LoadTownMapGFX + ld de, FlyMapLabelBorderGFX ld hl, VTiles2 tile $30 - lb bc, BANK(GFX_922e1), 6 + lb bc, BANK(FlyMapLabelBorderGFX), 6 call Request1bpp call FlyMap - call Function91c8f + call ret_91c8f ld b, SCGB_02 call GetSGBLayout call SetPalettes @@ -2182,10 +2184,6 @@ Flypoints: ; 91c5e const_def flypoint: MACRO -; \1\@FLY EQUS "FLY_\1" -; \1\@SPAWN EQUS "SPAWN_\1" - ; const \1\@FLY - ; db \2, \1\@SPAWN const FLY_\1 db \2, SPAWN_\1 ENDM @@ -2223,7 +2221,7 @@ KANTO_FLYPOINT EQU const_value db -1 ; 91c8f -Function91c8f: ; 91c8f +ret_91c8f: ; 91c8f ret ; 91c90 @@ -2344,7 +2342,8 @@ FlyMap: ; 91c90 ret ; 91d11 -Function91d11: ; 91d11 +_Area: ; 91d11 +; e: Current landmark ld a, [wd002] push af ld a, [wd003] @@ -2357,25 +2356,24 @@ Function91d11: ; 91d11 ld a, $1 ld [hInMenu], a - ld de, GFX_922d1 + ld de, PokedexNestIconGFX ld hl, VTiles0 tile $7f - lb bc, BANK(GFX_922d1), 1 - call Request2bpp ; actually 1bpp - - call Function91ed0 + lb bc, BANK(PokedexNestIconGFX), 1 + call Request2bpp + call .GetPlayerOrFastShipIcon ld hl, VTiles0 tile $78 - ld c, $4 + ld c, 4 call Request2bpp - call Function91ff2 + call LoadTownMapGFX call FillKantoMap - call Function91de9 + call .PlaceString_MonsNest call TownMapPals hlbgcoord 0, 0, VBGMap1 call TownMapBGUpdate call FillJohtoMap - call Function91de9 + call .PlaceString_MonsNest call TownMapPals hlbgcoord 0, 0 call TownMapBGUpdate @@ -2384,8 +2382,8 @@ Function91d11: ; 91d11 call SetPalettes xor a ld [hBGMapMode], a - xor a - call Function91e1e + xor a ; Johto + call .GetAndPlaceNest .loop call JoyTextDelay ld hl, hJoyPressed @@ -2395,12 +2393,12 @@ Function91d11: ; 91d11 ld a, [hJoypadDown] and SELECT jr nz, .select - call Function91d9b - call Function91dcd + call .LeftRightInput + call .BlinkNestIcons jr .next .select - call Function91e5a + call .HideNestsShowPlayer .next call DelayFrame @@ -2415,27 +2413,27 @@ Function91d11: ; 91d11 ret ; 91d9b -Function91d9b: ; 91d9b +.LeftRightInput: ; 91d9b ld a, [hl] - and $20 - jr nz, .asm_91da6 + and D_LEFT + jr nz, .left ld a, [hl] - and $10 - jr nz, .asm_91db7 + and D_RIGHT + jr nz, .right ret -.asm_91da6 +.left ld a, [hWY] cp $90 ret z call ClearSprites ld a, $90 ld [hWY], a - xor a - call Function91e1e + xor a ; Johto + call .GetAndPlaceNest ret -.asm_91db7 +.right ld a, [StatusFlags] bit 6, a ; hall of fame ret z @@ -2445,39 +2443,39 @@ Function91d9b: ; 91d9b call ClearSprites xor a ld [hWY], a - ld a, $1 - call Function91e1e + ld a, 1 ; Kanto + call .GetAndPlaceNest ret ; 91dcd -Function91dcd: ; 91dcd +.BlinkNestIcons: ; 91dcd ld a, [hVBlankCounter] ld e, a and $f ret nz ld a, e and $10 - jr nz, .asm_91ddc + jr nz, .copy_sprites call ClearSprites ret -.asm_91ddc +.copy_sprites hlcoord 0, 0 ld de, Sprites - ld bc, $a0 + ld bc, SpritesEnd - Sprites call CopyBytes ret ; 91de9 -Function91de9: ; 91de9 +.PlaceString_MonsNest: ; 91de9 hlcoord 0, 0 ld bc, SCREEN_WIDTH - ld a, $7f + ld a, " " call ByteFill hlcoord 0, 1 ld a, $6 ld [hli], a - ld bc, SCREEN_HEIGHT + ld bc, SCREEN_WIDTH - 2 ld a, $7 call ByteFill ld [hl], $17 @@ -2486,54 +2484,56 @@ Function91de9: ; 91de9 call PlaceString ld h, b ld l, c - ld de, String_91e16 + ld de, .String_SNest call PlaceString ret ; 91e16 -String_91e16: +.String_SNest: db "'S NEST@" ; 91e1e -Function91e1e: ; 91e1e +.GetAndPlaceNest: ; 91e1e ld [wd003], a ld e, a - callba Function2a01f + callba FindNest ; load nest landmarks into TileMap[0,0] decoord 0, 0 ld hl, Sprites -.asm_91e2e +.nestloop ld a, [de] and a - jr z, .asm_91e4d + jr z, .done_nest push de ld e, a push hl callba GetLandmarkCoords pop hl + ; load into OAM ld a, d - sub $4 + sub 4 ld [hli], a ld a, e - sub $4 + sub 4 ld [hli], a - ld a, $7f + ld a, $7f ; nest icon in this context ld [hli], a xor a ld [hli], a + ; next pop de inc de - jr .asm_91e2e + jr .nestloop -.asm_91e4d +.done_nest ld hl, Sprites decoord 0, 0 - ld bc, $a0 + ld bc, SpritesEnd - Sprites call CopyBytes ret ; 91e5a -Function91e5a: ; 91e5a - call Function91ea9 +.HideNestsShowPlayer: ; 91e5a + call .CheckPlayerLocation ret c ld a, [wd002] @@ -2541,12 +2541,12 @@ Function91e5a: ; 91e5a callba GetLandmarkCoords ld c, e ld b, d - ld de, Unknown_91e9c + ld de, .PlayerOAM ld hl, Sprites -.asm_91e70 +.ShowPlayerLoop ld a, [de] cp $80 - jr z, .asm_91e91 + jr z, .copy add b ld [hli], a @@ -2558,24 +2558,24 @@ Function91e5a: ; 91e5a inc de ld a, [de] - add $78 + add $78 ; where the player's sprite is loaded ld [hli], a inc de push bc - ld c, 0 + ld c, 0 ; RED ld a, [PlayerGender] bit 0, a - jr z, .asm_91e8c - inc c -.asm_91e8c + jr z, .got_gender + inc c ; BLUE +.got_gender ld a, c ld [hli], a pop bc - jr .asm_91e70 + jr .ShowPlayerLoop -.asm_91e91 +.copy ld hl, Sprites + $10 ld bc, SpritesEnd - (Sprites + $10) xor a @@ -2583,15 +2583,18 @@ Function91e5a: ; 91e5a ret ; 91e9c -Unknown_91e9c: ; 91e9c - db -8, -8, 0 - db -8, 0, 1 - db 0, -8, 2 - db 0, 0, 3 +.PlayerOAM: ; 91e9c + db -1 * 8, -1 * 8, 0 ; top left + db -1 * 8, 0 * 8, 1 ; top right + db 0 * 8, -1 * 8, 2 ; bottom left + db 0 * 8, 0 * 8, 3 ; bottom right db $80 ; terminator ; 91ea9 -Function91ea9: ; 91ea9 +.CheckPlayerLocation: ; 91ea9 +; Don't show the player's sprite if you're +; not in the same region as what's currently +; on the screen. ld a, [wd002] cp FAST_SHIP jr z, .johto @@ -2622,14 +2625,14 @@ Function91ea9: ; 91ea9 ret ; 91ed0 -Function91ed0: ; 91ed0 +.GetPlayerOrFastShipIcon: ; 91ed0 ld a, [wd002] cp FAST_SHIP - jr z, .asm_91ede + jr z, .FastShip callba GetPlayerIcon ret -.asm_91ede +.FastShip ld de, FastShipGFX ld b, BANK(FastShipGFX) ret @@ -2679,7 +2682,7 @@ FillTownMap: ; 91f07 hlcoord 0, 0 .loop ld a, [de] - cp $ff + cp -1 ret z ld a, [de] ld [hli], a @@ -2692,7 +2695,7 @@ TownMapPals: ; 91f13 hlcoord 0, 0 decoord 0, 0, AttrMap - ld bc, 360 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT .loop ; Current tile ld a, [hli] @@ -2744,10 +2747,12 @@ TownMapPals: ; 91f13 ret TownMapPalMap: - db $11, $21, $22, $00, $11, $13, $54, $54, $11, $21, $22, $00 - db $11, $10, $01, $00, $11, $21, $22, $00, $00, $00, $00, $00 - db $00, $00, $44, $04, $00, $00, $00, $00, $33, $33, $33, $33 - db $33, $33, $33, $03, $33, $33, $33, $33, $00, $00, $00, $00 + dn 1, 1, 2, 1, 2, 2, 0, 0, 1, 1, 1, 3, 5, 4, 5, 4 + dn 1, 1, 2, 1, 2, 2, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0 + dn 1, 1, 2, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + dn 0, 0, 0, 0, 4, 4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0 + dn 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3 + dn 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0 ; 91f7b TownMapMon: ; 91f7b @@ -2767,16 +2772,16 @@ TownMapMon: ; 91f7b callba GetSpeciesIcon ; Animation/palette - ld de, 0 - ld a, $0 + depixel 0, 0 + ld a, SPRITE_ANIM_INDEX_00 call _InitSpriteAnimStruct - ld hl, 3 + ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc - ld [hl], 8 - ld hl, 2 + ld [hl], $8 + ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc - ld [hl], 0 + ld [hl], SPRITE_ANIM_SEQ_00 ret ; 91fa6 @@ -2802,17 +2807,17 @@ TownMapPlayerIcon: ; 91fa6 call Request2bpp ; Animation/palette - ld de, 0 - ld b, $0a ; Male + depixel 0, 0 + ld b, SPRITE_ANIM_INDEX_0A ; Male ld a, [PlayerGender] bit 0, a - jr z, .asm_91fd3 - ld b, $1e ; Female -.asm_91fd3 + jr z, .got_gender + ld b, SPRITE_ANIM_INDEX_1E ; Female +.got_gender ld a, b call _InitSpriteAnimStruct - ld hl, $3 + ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $10 @@ -2822,16 +2827,16 @@ TownMapPlayerIcon: ; 91fa6 callba GetLandmarkCoords pop bc - ld hl, 4 + ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld [hl], e - ld hl, 5 + ld hl, SPRITEANIMSTRUCT_YCOORD add hl, bc ld [hl], d ret ; 0x91ff2 -Function91ff2: ; 91ff2 +LoadTownMapGFX: ; 91ff2 ld hl, TownMapGFX ld de, VTiles2 lb bc, BANK(TownMapGFX), $30 @@ -2848,14 +2853,14 @@ KantoMap: ; 92168 INCBIN "gfx/misc/kanto.bin" ; 922d1 +PokedexNestIconGFX: ; 922d1 +INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp" + +FlyMapLabelBorderGFX: ; 922e1 +INCBIN "gfx/pokegear/flymap_label_border.2bpp" -GFX_922d1: ; 922d1 -INCBIN "gfx/unknown/0922d1.2bpp" -GFX_922e1: ; 922e1 -INCBIN "gfx/unknown/0922e1.2bpp" -GFX_92301: ; 92301 -INCBIN "gfx/unknown/092301.2bpp" -Function92311: ; unreferenced +Function92311: ; 92311 +; unreferenced xor a ld [wd002], a call ClearBGPalettes @@ -2868,10 +2873,10 @@ Function92311: ; unreferenced xor a ld [hBGMapMode], a callba ClearSpriteAnims - call Function91ff2 - ld de, GFX_922e1 + call LoadTownMapGFX + ld de, FlyMapLabelBorderGFX ld hl, VTiles2 tile $30 - lb bc, BANK(GFX_922e1), 6 + lb bc, BANK(FlyMapLabelBorderGFX), 6 call Request1bpp call FillKantoMap call TownMapBubble @@ -2900,7 +2905,7 @@ Function92311: ; unreferenced ld a, [hl] and A_BUTTON jr nz, .pressedA - call Function923b8 + call .HandleDPad call GetMapCursorCoordinates callba PlaySpriteAnimations call DelayFrame @@ -2935,36 +2940,36 @@ Function92311: ; unreferenced ret ; 923b8 -Function923b8: ; 923b8 +.HandleDPad: ; 923b8 ld hl, hJoyLast ld a, [hl] and D_DOWN | D_RIGHT - jr nz, .asm_923c6 + jr nz, .down_right ld a, [hl] and D_UP | D_LEFT - jr nz, .asm_923d3 + jr nz, .up_left ret -.asm_923c6 +.down_right ld hl, wd002 ld a, [hl] cp FLY_INDIGO - jr c, .asm_923d0 + jr c, .okay_dr ld [hl], -1 -.asm_923d0 +.okay_dr inc [hl] - jr .asm_923dd + jr .continue -.asm_923d3 +.up_left ld hl, wd002 ld a, [hl] and a - jr nz, .asm_923dc + jr nz, .okay_ul ld [hl], FLY_INDIGO + 1 -.asm_923dc +.okay_ul dec [hl] -.asm_923dd +.continue ld a, [wd002] cp KANTO_FLYPOINT jr c, .johto @@ -2972,14 +2977,14 @@ Function923b8: ; 923b8 call FillKantoMap xor a ld b, $9c - jr .asm_923f3 + jr .finish .johto call FillJohtoMap ld a, $90 ld b, $98 -.asm_923f3 +.finish ld [hWY], a ld a, b ld [hBGMapAddress + 1], a diff --git a/engine/predef.asm b/engine/predef.asm index fcc347fa6..f812d1d9e 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -80,7 +80,7 @@ PredefPointers:: ; 856b add_predef Predef2F add_predef Function9853 ; $30 add_predef Predef_LoadSGBLayout - add_predef Function91d11 + add_predef _Area add_predef CheckContestMon add_predef Predef_StartBattle add_predef Predef35 diff --git a/engine/save.asm b/engine/save.asm index 0feb9fd84..b46dd9277 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -18,7 +18,7 @@ SaveMenu: ; 14a1a .refused call ExitMenu - call Functiond90 + call ret_d90 callba SaveMenu_LoadEDTile scf ret @@ -217,7 +217,7 @@ SaveTheGame_yesorno: ; 14baf dec a call WriteBackup push af - call Functiond90 + call ret_d90 pop af and a ret diff --git a/engine/scripting.asm b/engine/scripting.asm index 1ba592edc..db56e2f9e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -70,178 +70,178 @@ RunScriptCommand: ; 96ca9 ScriptCommandTable: ; 96cb1 - dw Script_scall - dw Script_farscall - dw Script_ptcall - dw Script_jump - dw Script_farjump - dw Script_ptjump - dw Script_if_equal - dw Script_if_not_equal - dw Script_iffalse - dw Script_iftrue - dw Script_if_greater_than - dw Script_if_less_than - dw Script_jumpstd - dw Script_callstd - dw Script_callasm - dw Script_special - dw Script_ptcallasm - dw Script_checkmaptriggers - dw Script_domaptrigger - dw Script_checktriggers - dw Script_dotrigger - dw Script_writebyte - dw Script_addvar - dw Script_random - dw Script_checkver - dw Script_copybytetovar - dw Script_copyvartobyte - dw Script_loadvar - dw Script_checkcode - dw Script_writevarcode - dw Script_writecode - dw Script_giveitem - dw Script_takeitem - dw Script_checkitem - dw Script_givemoney - dw Script_takemoney - dw Script_checkmoney - dw Script_givecoins - dw Script_takecoins - dw Script_checkcoins - dw Script_addcellnum - dw Script_delcellnum - dw Script_checkcellnum - dw Script_checktime - dw Script_checkpoke - dw Script_givepoke - dw Script_giveegg - dw Script_givepokeitem - dw Script_checkpokeitem - dw Script_checkevent - dw Script_clearevent - dw Script_setevent - dw Script_checkflag - dw Script_clearflag - dw Script_setflag - dw Script_wildon - dw Script_wildoff - dw Script_xycompare - dw Script_warpmod - dw Script_blackoutmod - dw Script_warp - dw Script_readmoney - dw Script_readcoins - dw Script_RAM2MEM - dw Script_pokenamemem - dw Script_itemtotext - dw Script_mapnametotext - dw Script_trainertotext - dw Script_stringtotext - dw Script_itemnotify - dw Script_pocketisfull - dw Script_loadfont - dw Script_refreshscreen - dw Script_closetext - dw Script_loadbytec2cf - dw Script_farwritetext - dw Script_writetext - dw Script_repeattext - dw Script_yesorno - dw Script_loadmenudata - dw Script_writebackup - dw Script_jumptextfaceplayer + dw Script_scall ; 00 + dw Script_farscall ; 01 + dw Script_ptcall ; 02 + dw Script_jump ; 03 + dw Script_farjump ; 04 + dw Script_ptjump ; 05 + dw Script_if_equal ; 06 + dw Script_if_not_equal ; 07 + dw Script_iffalse ; 08 + dw Script_iftrue ; 09 + dw Script_if_greater_than ; 0a + dw Script_if_less_than ; 0b + dw Script_jumpstd ; 0c + dw Script_callstd ; 0d + dw Script_callasm ; 0e + dw Script_special ; 0f + dw Script_ptcallasm ; 10 + dw Script_checkmaptriggers ; 11 + dw Script_domaptrigger ; 12 + dw Script_checktriggers ; 13 + dw Script_dotrigger ; 14 + dw Script_writebyte ; 15 + dw Script_addvar ; 16 + dw Script_random ; 17 + dw Script_checkver ; 18 + dw Script_copybytetovar ; 19 + dw Script_copyvartobyte ; 1a + dw Script_loadvar ; 1b + dw Script_checkcode ; 1c + dw Script_writevarcode ; 1d + dw Script_writecode ; 1e + dw Script_giveitem ; 1f + dw Script_takeitem ; 20 + dw Script_checkitem ; 21 + dw Script_givemoney ; 22 + dw Script_takemoney ; 23 + dw Script_checkmoney ; 24 + dw Script_givecoins ; 25 + dw Script_takecoins ; 26 + dw Script_checkcoins ; 27 + dw Script_addcellnum ; 28 + dw Script_delcellnum ; 29 + dw Script_checkcellnum ; 2a + dw Script_checktime ; 2b + dw Script_checkpoke ; 2c + dw Script_givepoke ; 2d + dw Script_giveegg ; 2e + dw Script_givepokeitem ; 2f + dw Script_checkpokeitem ; 30 + dw Script_checkevent ; 31 + dw Script_clearevent ; 32 + dw Script_setevent ; 33 + dw Script_checkflag ; 34 + dw Script_clearflag ; 35 + dw Script_setflag ; 36 + dw Script_wildon ; 37 + dw Script_wildoff ; 38 + dw Script_xycompare ; 39 + dw Script_warpmod ; 3a + dw Script_blackoutmod ; 3b + dw Script_warp ; 3c + dw Script_readmoney ; 3d + dw Script_readcoins ; 3e + dw Script_RAM2MEM ; 3f + dw Script_pokenamemem ; 40 + dw Script_itemtotext ; 41 + dw Script_mapnametotext ; 42 + dw Script_trainertotext ; 43 + dw Script_stringtotext ; 44 + dw Script_itemnotify ; 45 + dw Script_pocketisfull ; 46 + dw Script_loadfont ; 47 + dw Script_refreshscreen ; 48 + dw Script_closetext ; 49 + dw Script_loadbytec2cf ; 4a + dw Script_farwritetext ; 4b + dw Script_writetext ; 4c + dw Script_repeattext ; 4d + dw Script_yesorno ; 4e + dw Script_loadmenudata ; 4f + dw Script_writebackup ; 50 + dw Script_jumptextfaceplayer ; 51 IF _CRYSTAL - dw Script_farjumptext + dw Script_farjumptext ; 52 ENDC - dw Script_jumptext - dw Script_waitbutton - dw Script_buttonsound - dw Script_pokepic - dw Script_closepokepic - dw Script_interpretmenu - dw Script_interpretmenu2 - dw Script_loadpikachudata - dw Script_randomwildmon - dw Script_loadmemtrainer - dw Script_loadwildmon - dw Script_loadtrainer - dw Script_startbattle - dw Script_returnafterbattle - dw Script_catchtutorial - dw Script_trainertext - dw Script_trainerflagaction - dw Script_winlosstext - dw Script_scripttalkafter - dw Script_end_if_just_battled - dw Script_check_just_battled - dw Script_setlasttalked - dw Script_applymovement - dw Script_applymovement2 - dw Script_faceplayer - dw Script_faceperson - dw Script_variablesprite - dw Script_disappear - dw Script_appear - dw Script_follow - dw Script_stopfollow - dw Script_moveperson - dw Script_writepersonxy - dw Script_loademote - dw Script_showemote - dw Script_spriteface - dw Script_follownotexact - dw Script_earthquake - dw Script_changemap - dw Script_changeblock - dw Script_reloadmap - dw Script_reloadmappart - dw Script_writecmdqueue - dw Script_delcmdqueue - dw Script_playmusic - dw Script_encountermusic - dw Script_musicfadeout - dw Script_playmapmusic - dw Script_reloadmapmusic - dw Script_cry - dw Script_playsound - dw Script_waitsfx - dw Script_warpsound - dw Script_specialsound - dw Script_passtoengine - dw Script_newloadmap - dw Script_pause - dw Script_deactivatefacing - dw Script_priorityjump - dw Script_warpcheck - dw Script_ptpriorityjump - dw Script_return - dw Script_end - dw Script_reloadandreturn - dw Script_resetfuncs - dw Script_pokemart - dw Script_elevator - dw Script_trade - dw Script_askforphonenumber - dw Script_phonecall - dw Script_hangup - dw Script_describedecoration - dw Script_fruittree - dw Script_specialphonecall - dw Script_checkphonecall - dw Script_verbosegiveitem - dw Script_verbosegiveitem2 - dw Script_loadwilddata - dw Script_halloffame - dw Script_credits - dw Script_warpfacing - dw Script_battletowertext - dw Script_displaylocation - dw Script_trainerclassname - dw Script_name - dw Script_wait - dw Script_check_save + dw Script_jumptext ; 53 + dw Script_waitbutton ; 54 + dw Script_buttonsound ; 55 + dw Script_pokepic ; 56 + dw Script_closepokepic ; 57 + dw Script_interpretmenu ; 58 + dw Script_interpretmenu2 ; 59 + dw Script_loadpikachudata ; 5a + dw Script_randomwildmon ; 5b + dw Script_loadmemtrainer ; 5c + dw Script_loadwildmon ; 5d + dw Script_loadtrainer ; 5e + dw Script_startbattle ; 5f + dw Script_returnafterbattle ; 60 + dw Script_catchtutorial ; 61 + dw Script_trainertext ; 62 + dw Script_trainerflagaction ; 63 + dw Script_winlosstext ; 64 + dw Script_scripttalkafter ; 65 + dw Script_end_if_just_battled ; 66 + dw Script_check_just_battled ; 67 + dw Script_setlasttalked ; 68 + dw Script_applymovement ; 69 + dw Script_applymovement2 ; 6a + dw Script_faceplayer ; 6b + dw Script_faceperson ; 6c + dw Script_variablesprite ; 6d + dw Script_disappear ; 6e + dw Script_appear ; 6f + dw Script_follow ; 70 + dw Script_stopfollow ; 71 + dw Script_moveperson ; 72 + dw Script_writepersonxy ; 73 + dw Script_loademote ; 74 + dw Script_showemote ; 75 + dw Script_spriteface ; 76 + dw Script_follownotexact ; 77 + dw Script_earthquake ; 78 + dw Script_changemap ; 79 + dw Script_changeblock ; 7a + dw Script_reloadmap ; 7b + dw Script_reloadmappart ; 7c + dw Script_writecmdqueue ; 7d + dw Script_delcmdqueue ; 7e + dw Script_playmusic ; 7f + dw Script_encountermusic ; 80 + dw Script_musicfadeout ; 81 + dw Script_playmapmusic ; 82 + dw Script_reloadmapmusic ; 83 + dw Script_cry ; 84 + dw Script_playsound ; 85 + dw Script_waitsfx ; 86 + dw Script_warpsound ; 87 + dw Script_specialsound ; 88 + dw Script_passtoengine ; 89 + dw Script_newloadmap ; 8a + dw Script_pause ; 8b + dw Script_deactivatefacing ; 8c + dw Script_priorityjump ; 8d + dw Script_warpcheck ; 8e + dw Script_ptpriorityjump ; 8f + dw Script_return ; 90 + dw Script_end ; 91 + dw Script_reloadandreturn ; 92 + dw Script_end_all ; 93 + dw Script_pokemart ; 94 + dw Script_elevator ; 95 + dw Script_trade ; 96 + dw Script_askforphonenumber ; 97 + dw Script_phonecall ; 98 + dw Script_hangup ; 99 + dw Script_describedecoration ; 9a + dw Script_fruittree ; 9b + dw Script_specialphonecall ; 9c + dw Script_checkphonecall ; 9d + dw Script_verbosegiveitem ; 9e + dw Script_verbosegiveitem2 ; 9f + dw Script_swarm ; a0 + dw Script_halloffame ; a1 + dw Script_credits ; a2 + dw Script_warpfacing ; a3 + dw Script_battletowertext ; a4 + dw Script_landmarktotext ; a5 + dw Script_trainerclassname ; a6 + dw Script_name ; a7 + dw Script_wait ; a8 + dw Script_check_save ; a9 ; 96e05 StartScript: ; 96e05 @@ -836,7 +836,7 @@ Script_fruittree: ; 970ee jp ScriptJump ; 970fc -Script_loadwilddata: ; 970fc +Script_swarm: ; 970fc ; script command 0xa0 ; parameters: ; flag (SingleByteParam) @@ -849,7 +849,7 @@ Script_loadwilddata: ; 970fc ld d, a call GetScriptByte ld e, a - callba LoadWildData + callba StoreSwarmMapIndices ret ; 9710f @@ -2186,7 +2186,7 @@ ConvertLandmarkToText: ; 976f4 jp ConvertMemToText ; 97701 -Script_displaylocation: ; 97701 +Script_landmarktotext: ; 97701 ; script command 0xa5 ; parameters: ; id (SingleByteParam) @@ -3187,7 +3187,7 @@ endr ret ; 97bc0 -Script_resetfuncs: ; 97bc0 +Script_end_all: ; 97bc0 ; script command 0x93 xor a @@ -3219,7 +3219,7 @@ Script_credits: ; 97bf3 callba RedCredits DisplayCredits: - call Script_resetfuncs + call Script_end_all ld a, $3 call LoadMapStatus call StopScript diff --git a/engine/specials.asm b/engine/specials.asm index 55388926f..c9cef20ff 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -498,22 +498,22 @@ Special_ActivateFishingSwarm: ; c3fc ; c403 -LoadWildData:: ; c403 +StoreSwarmMapIndices:: ; c403 ld a, c and a - jr nz, .swarm_route35 + jr nz, .yanma ; swarm dark cave violet entrance ld a, d - ld [wdfcc], a + ld [wDunsparceMapGroup], a ld a, e - ld [wdfcd], a + ld [wDunsparceMapNumber], a ret -.swarm_route35 +.yanma ld a, d - ld [wdc5a], a + ld [wYanmaMapGroup], a ld a, e - ld [wdc5b], a + ld [wYanmaMapNumber], a ret ; c419 diff --git a/engine/startmenu.asm b/engine/startmenu.asm index 861389f9c..1a5a7f535 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -146,7 +146,7 @@ endr call MenuFunc_1e7f call .DrawBugContestStatus call UpdateSprites - call Functiond90 + call ret_d90 call Function2b5c ret ; 126d3 diff --git a/engine/town_map.asm b/engine/town_map.asm index a7a7713a3..92f813169 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -47,7 +47,7 @@ _TownMap: ; 9191c and a jr z, .sgb ld a, $e4 - call Functioncf8 + call DmgToCgbObjPal0 call DelayFrame .sgb diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm index d966ddae0..fe356d70a 100755 --- a/engine/trade/animation.asm +++ b/engine/trade/animation.asm @@ -371,7 +371,7 @@ Function2914e: ; 2914e ld a, $e4 call DmgToCgbBGPals ld a, $d0 - call Functioncf8 + call DmgToCgbObjPal0 call NextTradeAnim ld a, $5c ld [wcf64], a @@ -1088,7 +1088,7 @@ TradeAnim_Poof: ; 29649 TradeAnim_BulgeThroughTube: ; 29660 ld a, $e4 - call Functioncf8 + call DmgToCgbObjPal0 depixel 5, 11 ld a, SPRITE_ANIM_INDEX_10 call _InitSpriteAnimStruct @@ -1379,7 +1379,7 @@ Function297ed: ; 297ed ld a, $f0 .asm_297f6 - call Functioncf8 + call DmgToCgbObjPal0 ld a, $e4 call DmgToCgbBGPals ret diff --git a/engine/wildmons.asm b/engine/wildmons.asm index 6f39e19dc..ff29c99b5 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -1,30 +1,34 @@ LoadWildMonData: ; 29ff8 call _GrassWildmonLookup jr c, .copy - ld hl, wd25a + ld hl, wMornEncounterRate xor a ld [hli], a ld [hli], a ld [hl], a jr .done_copy + .copy inc hl inc hl - ld de, wd25a - ld bc, $3 + ld de, wMornEncounterRate + ld bc, 3 call CopyBytes .done_copy call _WaterWildmonLookup - ld a, $0 + ld a, 0 jr nc, .no_copy inc hl inc hl ld a, [hl] .no_copy - ld [wd25d], a + ld [wWaterEncounterRate], a ret -Function2a01f: ; 2a01f +FindNest: ; 2a01f +; Parameters: +; e: 0 = Johto, 1 = Kanto +; wNamedObjectIndexBuffer: species hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a @@ -34,25 +38,24 @@ Function2a01f: ; 2a01f jr nz, .kanto decoord 0, 0 ld hl, JohtoGrassWildMons - call Function2a052 + call .FindGrass ld hl, JohtoWaterWildMons - call Function2a06e - call Function2a0b7 - call Function2a0cf + call .FindWater + call .RoamMon1 + call .RoamMon2 ret .kanto decoord 0, 0 ld hl, KantoGrassWildMons - call Function2a052 + call .FindGrass ld hl, KantoWaterWildMons - jp Function2a06e + jp .FindWater ; 2a052 -Function2a052: ; 2a052 -.loop +.FindGrass: ; 2a052 ld a, [hl] - cp $ff + cp -1 ret z push hl ld a, [hli] @@ -62,23 +65,22 @@ Function2a052: ; 2a052 rept 3 inc hl endr - ld a, $15 - call Function2a088 - jr nc, .next + ld a, NUM_WILDMONS_PER_AREA_TIME_OF_DAY * 3 + call .SearchMapForMon + jr nc, .next_grass ld [de], a inc de -.next +.next_grass pop hl - ld bc, $2f + ld bc, WILDMON_GRASS_STRUCTURE_LENGTH add hl, bc - jr .loop + jr .FindGrass ; 2a06e -Function2a06e: ; 2a06e -.loop +.FindWater: ; 2a06e ld a, [hl] - cp $ff + cp -1 ret z push hl ld a, [hli] @@ -86,24 +88,24 @@ Function2a06e: ; 2a06e ld a, [hli] ld c, a inc hl - ld a, $3 - call Function2a088 - jr nc, .next + ld a, 3 + call .SearchMapForMon + jr nc, .next_water ld [de], a inc de -.next +.next_water pop hl - ld bc, 9 + ld bc, 3 * 3 add hl, bc - jr .loop + jr .FindWater ; 2a088 -Function2a088: ; 2a088 +.SearchMapForMon: ; 2a088 inc hl -.loop +.ScanMapLoop push af - ld a, [wd265] + ld a, [wNamedObjectIndexBuffer] cp [hl] jr z, .found rept 2 @@ -111,68 +113,68 @@ rept 2 endr pop af dec a - jr nz, .loop + jr nz, .ScanMapLoop and a ret .found pop af - jp Function2a09c + jp .AppendNest ; 2a09c -Function2a09c: ; 2a09c +.AppendNest: ; 2a09c push de call GetWorldMapLocation ld c, a hlcoord 0, 0 ld de, SCREEN_WIDTH * SCREEN_HEIGHT -.loop +.AppendNestLoop ld a, [hli] cp c - jr z, .found + jr z, .found_nest dec de ld a, e or d - jr nz, .loop + jr nz, .AppendNestLoop ld a, c pop de scf ret -.found +.found_nest pop de and a ret ; 2a0b7 -Function2a0b7: ; 2a0b7 +.RoamMon1: ; 2a0b7 ld a, [wRoamMon1Species] ld b, a - ld a, [wd265] + ld a, [wNamedObjectIndexBuffer] cp b ret nz ld a, [wRoamMon1MapGroup] ld b, a ld a, [wRoamMon1MapNumber] ld c, a - call Function2a09c + call .AppendNest ret nc ld [de], a inc de ret ; 2a0cf -Function2a0cf: ; 2a0cf +.RoamMon2: ; 2a0cf ld a, [wRoamMon2Species] ld b, a - ld a, [wd265] + ld a, [wNamedObjectIndexBuffer] cp b ret nz ld a, [wRoamMon2MapGroup] ld b, a ld a, [wRoamMon2MapNumber] ld c, a - call Function2a09c + call .AppendNest ret nc ld [de], a inc de @@ -209,7 +211,7 @@ TryWildEncounter:: ; 2a0e7 ; 2a111 GetMapEncounterRate: ; 2a111 - ld hl, wd25a + ld hl, wMornEncounterRate call CheckOnWater ld a, 3 jr z, .ok @@ -446,10 +448,10 @@ _SwarmWildmonCheck bit 2, [hl] pop hl jr z, .CheckYanma - ld a, [wdfcc] + ld a, [wDunsparceMapGroup] cp d jr nz, .CheckYanma - ld a, [wdfcd] + ld a, [wDunsparceMapNumber] cp e jr nz, .CheckYanma call LookUpWildmonsForMapDE @@ -463,10 +465,10 @@ _SwarmWildmonCheck bit 3, [hl] pop hl jr z, _NoSwarmWildmon - ld a, [wdc5a] + ld a, [wYanmaMapGroup] cp d jr nz, _NoSwarmWildmon - ld a, [wdc5b] + ld a, [wYanmaMapNumber] cp e jr nz, _NoSwarmWildmon call LookUpWildmonsForMapDE @@ -702,11 +704,11 @@ UpdateRoamMons: ; 2a30d rept 2 add hl, bc endr - ld a, [wdfe7] + ld a, [wRoamMons_LastMapGroup] cp [hl] jr nz, .done inc hl - ld a, [wdfe6] + ld a, [wRoamMons_LastMapNumber] cp [hl] jr z, .update_loop dec hl @@ -787,14 +789,14 @@ JumpRoamMon: ; 2a3cd ; 2a3f6 _BackUpMapIndices: ; 2a3f6 - ld a, [wdfe4] - ld [wdfe6], a - ld a, [wdfe5] - ld [wdfe7], a + ld a, [wRoamMons_CurrentMapNumber] + ld [wRoamMons_LastMapNumber], a + ld a, [wRoamMons_CurrentMapGroup] + ld [wRoamMons_LastMapGroup], a ld a, [MapNumber] - ld [wdfe4], a + ld [wRoamMons_CurrentMapNumber], a ld a, [MapGroup] - ld [wdfe5], a + ld [wRoamMons_CurrentMapGroup], a ret ; 2a40f @@ -892,7 +894,7 @@ endr ld de, StringBuffer1 call CopyName1 ld a, c - ld [wd265], a + ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, UnknownText_0x2a51a call PrintText @@ -945,7 +947,7 @@ rept 2 endr inc hl ld a, [hl] - ld [wd265], a + ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, StringBuffer1 ld de, StringBuffer4 @@ -1029,7 +1031,7 @@ endr inc hl ; species ld a, BANK(Trainers) call GetFarByte - ld [wd265], a + ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, StringBuffer1 ld de, StringBuffer4 |