diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 14:25:37 -0400 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 19:02:36 -0400 |
commit | 6c3000efd2818f8d5cb0a01770d1b92991b80340 (patch) | |
tree | 38d458d3ff19039cd865998bb122666b943e91d6 /engine | |
parent | 432df825d4039a44a49fff01ef843395ab5abb3d (diff) |
Macro update, roam mon annotations
Updated map and mapgroup macros to get around an rgbds bug.
Legendary beast locale handling annotated and relabeled.
Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function. This will make it easier for modders to add or remove engine flags.
Diffstat (limited to 'engine')
-rw-r--r-- | engine/buena_phone_scripts.asm | 4 | ||||
-rw-r--r-- | engine/engine_flags.asm | 130 | ||||
-rw-r--r-- | engine/map_setup.asm | 2 | ||||
-rw-r--r-- | engine/map_triggers.asm | 2 | ||||
-rw-r--r-- | engine/more_phone_scripts.asm | 8 | ||||
-rw-r--r-- | engine/phone_scripts.asm | 112 | ||||
-rw-r--r-- | engine/radio.asm | 2 | ||||
-rw-r--r-- | engine/specials.asm | 4 |
8 files changed, 132 insertions, 132 deletions
diff --git a/engine/buena_phone_scripts.asm b/engine/buena_phone_scripts.asm index 0a278ca03..3c0717503 100644 --- a/engine/buena_phone_scripts.asm +++ b/engine/buena_phone_scripts.asm @@ -1,4 +1,4 @@ -UnknownScript_0xa0b14: +BuenaPhoneScript1: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0xa0b73 checkcode VAR_HOUR @@ -6,7 +6,7 @@ UnknownScript_0xa0b14: scall UnknownScript_0xa0b32 jump UnknownScript_0xa0c0e -UnknownScript_0xa0b26: +BuenaPhoneScript2: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0xa0b73 scall UnknownScript_0xa0b4f diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm index 87d802d30..ff7948708 100644 --- a/engine/engine_flags.asm +++ b/engine/engine_flags.asm @@ -115,8 +115,8 @@ dwb WeeklyFlags, %00001000 ; goldenrod mall happiness event floor05 person07 dwb WeeklyFlags, %00010000 ; tea in blues house dwb WeeklyFlags, %00100000 ; indigo plateau rival fight - dwb WeeklyFlags, %01000000 - dwb WeeklyFlags, %10000000 + dwb WeeklyFlags, %01000000 ; move tutor + dwb WeeklyFlags, %10000000 ; buenas password dwb SwarmFlags, %00000001 ; $60 dwb SwarmFlags, %00000010 ; goldenrod dept store sale is on @@ -128,69 +128,69 @@ dwb wdbf3, %00000100 ; have gs ball after kurt examined it ; rematches - dwb wdc4c, %00000001 ; jack - dwb wdc4c, %00000010 ; huey - dwb wdc4c, %00000100 ; gaven - dwb wdc4c, %00001000 ; beth ; $68 - dwb wdc4c, %00010000 ; jose - dwb wdc4c, %00100000 ; reena - dwb wdc4c, %01000000 ; joey - dwb wdc4c, %10000000 ; wade - dwb wdc4c + 1, %00000001 ; ralph - dwb wdc4c + 1, %00000010 ; liz - dwb wdc4c + 1, %00000100 ; anthony - dwb wdc4c + 1, %00001000 ; todd ; $70 - dwb wdc4c + 1, %00010000 ; gina - dwb wdc4c + 1, %00100000 ; arnie - dwb wdc4c + 1, %01000000 ; alan - dwb wdc4c + 1, %10000000 ; dana - dwb wdc4c + 2, %00000001 ; chad - dwb wdc4c + 2, %00000010 ; tully - dwb wdc4c + 2, %00000100 ; brent - dwb wdc4c + 2, %00001000 ; tiffany ; $78 - dwb wdc4c + 2, %00010000 ; vance - dwb wdc4c + 2, %00100000 ; wilton - dwb wdc4c + 2, %01000000 ; parry - dwb wdc4c + 2, %10000000 ; erin - - dwb wdc50, %00000001 ; beverly has nugget - dwb wdc50, %00000010 ; jose has star piece - dwb wdc50, %00000100 ; wade has item (see bittable1 $032b-e) - dwb wdc50, %00001000 ; gina has leaf stone ; $80 - dwb wdc50, %00010000 ; alan has fire stone - dwb wdc50, %00100000 ; liz has thunderstone - dwb wdc50, %01000000 ; derek has nugget - dwb wdc50, %10000000 ; tully has water stone - - dwb wdc50 + 1, %00000001 ; tiffany has pink bow - dwb wdc50 + 1, %00000010 ; wilton has item (see bittable1 $032f-31) - - dwb wdc54, %00000001 - dwb wdc54, %00000010 ; $88 - dwb wdc54, %00000100 - dwb wdc54, %00001000 - dwb wdc54, %00010000 - dwb wdc54, %00100000 - dwb wdc54, %01000000 - dwb wdc54, %10000000 - - dwb wdc54 + 1, %00000001 - dwb wdc54 + 1, %00000010 ; $90 - dwb wdc54 + 1, %00000100 - dwb wdc54 + 1, %00001000 - dwb wdc54 + 1, %00010000 - dwb wdc54 + 1, %00100000 - dwb wdc54 + 1, %01000000 - dwb wdc54 + 1, %10000000 - - dwb wdc54 + 2, %00000001 - dwb wdc54 + 2, %00000010 ; $98 - dwb wdc54 + 2, %00000100 - dwb wdc54 + 2, %00001000 - dwb wdc54 + 2, %00010000 - dwb wdc54 + 2, %00100000 - dwb wdc54 + 2, %01000000 - dwb wdc54 + 2, %10000000 + dwb wDailyRematchFlags, %00000001 ; jack + dwb wDailyRematchFlags, %00000010 ; huey + dwb wDailyRematchFlags, %00000100 ; gaven + dwb wDailyRematchFlags, %00001000 ; beth ; $68 + dwb wDailyRematchFlags, %00010000 ; jose + dwb wDailyRematchFlags, %00100000 ; reena + dwb wDailyRematchFlags, %01000000 ; joey + dwb wDailyRematchFlags, %10000000 ; wade + dwb wDailyRematchFlags + 1, %00000001 ; ralph + dwb wDailyRematchFlags + 1, %00000010 ; liz + dwb wDailyRematchFlags + 1, %00000100 ; anthony + dwb wDailyRematchFlags + 1, %00001000 ; todd ; $70 + dwb wDailyRematchFlags + 1, %00010000 ; gina + dwb wDailyRematchFlags + 1, %00100000 ; arnie + dwb wDailyRematchFlags + 1, %01000000 ; alan + dwb wDailyRematchFlags + 1, %10000000 ; dana + dwb wDailyRematchFlags + 2, %00000001 ; chad + dwb wDailyRematchFlags + 2, %00000010 ; tully + dwb wDailyRematchFlags + 2, %00000100 ; brent + dwb wDailyRematchFlags + 2, %00001000 ; tiffany ; $78 + dwb wDailyRematchFlags + 2, %00010000 ; vance + dwb wDailyRematchFlags + 2, %00100000 ; wilton + dwb wDailyRematchFlags + 2, %01000000 ; parry + dwb wDailyRematchFlags + 2, %10000000 ; erin + + dwb wDailyPhoneItemFlags, %00000001 ; beverly has nugget + dwb wDailyPhoneItemFlags, %00000010 ; jose has star piece + dwb wDailyPhoneItemFlags, %00000100 ; wade has item (see bittable1 $032b-e) + dwb wDailyPhoneItemFlags, %00001000 ; gina has leaf stone ; $80 + dwb wDailyPhoneItemFlags, %00010000 ; alan has fire stone + dwb wDailyPhoneItemFlags, %00100000 ; liz has thunderstone + dwb wDailyPhoneItemFlags, %01000000 ; derek has nugget + dwb wDailyPhoneItemFlags, %10000000 ; tully has water stone + + dwb wDailyPhoneItemFlags + 1, %00000001 ; tiffany has pink bow + dwb wDailyPhoneItemFlags + 1, %00000010 ; wilton has item (see bittable1 $032f-31) + + dwb wDailyPhoneTimeOfDayFlags, %00000001 + dwb wDailyPhoneTimeOfDayFlags, %00000010 ; $88 + dwb wDailyPhoneTimeOfDayFlags, %00000100 + dwb wDailyPhoneTimeOfDayFlags, %00001000 + dwb wDailyPhoneTimeOfDayFlags, %00010000 + dwb wDailyPhoneTimeOfDayFlags, %00100000 + dwb wDailyPhoneTimeOfDayFlags, %01000000 + dwb wDailyPhoneTimeOfDayFlags, %10000000 + + dwb wDailyPhoneTimeOfDayFlags + 1, %00000001 + dwb wDailyPhoneTimeOfDayFlags + 1, %00000010 ; $90 + dwb wDailyPhoneTimeOfDayFlags + 1, %00000100 + dwb wDailyPhoneTimeOfDayFlags + 1, %00001000 + dwb wDailyPhoneTimeOfDayFlags + 1, %00010000 + dwb wDailyPhoneTimeOfDayFlags + 1, %00100000 + dwb wDailyPhoneTimeOfDayFlags + 1, %01000000 + dwb wDailyPhoneTimeOfDayFlags + 1, %10000000 + + dwb wDailyPhoneTimeOfDayFlags + 2, %00000001 + dwb wDailyPhoneTimeOfDayFlags + 2, %00000010 ; $98 + dwb wDailyPhoneTimeOfDayFlags + 2, %00000100 + dwb wDailyPhoneTimeOfDayFlags + 2, %00001000 + dwb wDailyPhoneTimeOfDayFlags + 2, %00010000 + dwb wDailyPhoneTimeOfDayFlags + 2, %00100000 + dwb wDailyPhoneTimeOfDayFlags + 2, %01000000 + dwb wDailyPhoneTimeOfDayFlags + 2, %10000000 dwb wd45b, %00000100 ; female player has been transformed into male diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 0e20c2cb5..9ac712872 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -333,7 +333,7 @@ MapSetupCommands: ; 15440 dbw BANK(DelayClearingOldSprites), DelayClearingOldSprites ; 24 dbw BANK(DelayLoadingNewSprites), DelayLoadingNewSprites ; 25 dbw BANK(UpdateRoamMons), UpdateRoamMons ; 26 - dbw BANK(RestoreRoamMons), RestoreRoamMons ; 27 + dbw BANK(JumpRoamMons), JumpRoamMons ; 27 dbw BANK(FadeOldMapMusic), FadeOldMapMusic ; 28 dbw BANK(ActivateMapAnims), ActivateMapAnims ; 29 dbw BANK(SuspendMapAnims), SuspendMapAnims ; 2a diff --git a/engine/map_triggers.asm b/engine/map_triggers.asm index 56d1433ca..2b190fa3e 100644 --- a/engine/map_triggers.asm +++ b/engine/map_triggers.asm @@ -87,5 +87,5 @@ ENDM trigger_def MOUNT_MOON_SQUARE, wMountMoonSquareTrigger trigger_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileTrigger trigger_def MOBILE_BATTLE_ROOM, wMobileBattleRoomTrigger - db $ff + db -1 ; 4d15b diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index 1a4138eab..a2192514e 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -27,7 +27,7 @@ UnknownScript_0xa0036: farjump UnknownScript_0xa0055 UnknownScript_0xa003e: - special Function2a51f + special RandomPhoneWildMon farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xa0051 farscall UnknownScript_0xa017a @@ -37,7 +37,7 @@ UnknownScript_0xa0051: farjump UnknownScript_0xa006c UnknownScript_0xa0055: - special Function2a51f + special RandomPhoneWildMon farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xa0068 farscall UnknownScript_0xa0226 @@ -851,7 +851,7 @@ UnknownScript_0xa059c: farjump UnknownScript_0xa053a UnknownScript_0xa05a0: - special Function2a4ab + special RandomPhoneRareWildMon end UnknownScript_0xa05a4: @@ -1653,7 +1653,7 @@ UnknownScript_0xa0b04: farwritetext UnknownText_0x17717c end -UnknownScript_0xa0b09: +BikeShopPhoneScript: farwritetext UnknownText_0x174000 clearflag ENGINE_BIKE_SHOP_CALL_ENABLED specialphonecall ELMCALL_NONE diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index a7a41a8ce..db7f79997 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -298,7 +298,7 @@ ElmPhoneScript2: ; 0xbd081 ; Jack -UnknownScript_0xbd0d0: +JackPhoneScript1: trainertotext SCHOOLBOY, JACK1, $0 checkflag ENGINE_JACK iftrue UnknownScript_0xbd0f3 @@ -317,7 +317,7 @@ UnknownScript_0xbd0f3: displaylocation NATIONAL_PARK, $2 farjump UnknownScript_0xa0a2d -UnknownScript_0xbd0fa: +JackPhoneScript2: trainertotext SCHOOLBOY, JACK1, $0 farscall UnknownScript_0xbe1b6 farscall UnknownScript_0xbde3f @@ -350,7 +350,7 @@ UnknownScript_0xbd13b: ; Beverly -UnknownScript_0xbd13f: +BeverlyPhoneScript1: trainertotext POKEFANF, BEVERLY1, $0 farscall UnknownScript_0xbe0b6 checkflag ENGINE_BEVERLY_HAS_NUGGET @@ -361,7 +361,7 @@ UnknownScript_0xbd151: displaylocation NATIONAL_PARK, $2 farjump UnknownScript_0xa0aa5 -UnknownScript_0xbd158: +BeverlyPhoneScript2: trainertotext POKEFANF, BEVERLY1, $0 farscall UnknownScript_0xbe41e checkflag ENGINE_BEVERLY_HAS_NUGGET @@ -379,7 +379,7 @@ UnknownScript_0xbd172: ; Huey -UnknownScript_0xbd17c: +HueyPhoneScript1: trainertotext SAILOR, HUEY1, $0 checkflag ENGINE_HUEY iftrue UnknownScript_0xbd1a2 @@ -399,7 +399,7 @@ UnknownScript_0xbd1a2: displaylocation LIGHTHOUSE, $2 farjump UnknownScript_0xa0a32 -UnknownScript_0xbd1a9: +HueyPhoneScript2: trainertotext SAILOR, HUEY1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_HUEY @@ -423,7 +423,7 @@ UnknownScript_0xbd1d0: ; Gaven -UnknownScript_0xbd1da: +GavenPhoneScript1: trainertotext COOLTRAINERM, GAVEN3, $0 checkflag ENGINE_GAVEN iftrue UnknownScript_0xbd1fd @@ -442,7 +442,7 @@ UnknownScript_0xbd1fd: displaylocation ROUTE_26, $2 farjump UnknownScript_0xa0a37 -UnknownScript_0xbd204: +GavenPhoneScript2: trainertotext COOLTRAINERM, GAVEN3, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_GAVEN @@ -470,7 +470,7 @@ UnknownScript_0xbd239: ; Beth -UnknownScript_0xbd23d: +BethPhoneScript1: trainertotext COOLTRAINERF, BETH1, $0 checkflag ENGINE_BETH iftrue UnknownScript_0xbd260 @@ -489,7 +489,7 @@ UnknownScript_0xbd260: displaylocation ROUTE_26, $2 farjump UnknownScript_0xa0a3c -UnknownScript_0xbd267: +BethPhoneScript2: trainertotext COOLTRAINERF, BETH1, $0 farscall UnknownScript_0xbe41e checkflag ENGINE_BETH @@ -512,7 +512,7 @@ UnknownScript_0xbd28a: ; Jose -UnknownScript_0xbd294: +JosePhoneScript1: trainertotext BIRD_KEEPER, JOSE2, $0 checkflag ENGINE_JOSE iftrue UnknownScript_0xbd2bd @@ -537,7 +537,7 @@ UnknownScript_0xbd2c4: displaylocation ROUTE_27, $2 farjump UnknownScript_0xa0a41 -UnknownScript_0xbd2cb: +JosePhoneScript2: trainertotext BIRD_KEEPER, JOSE2, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_JOSE @@ -574,7 +574,7 @@ UnknownScript_0xbd312: ; Reena -UnknownScript_0xbd31c: +ReenaPhoneScript1: trainertotext COOLTRAINERF, REENA1, $0 checkflag ENGINE_REENA iftrue UnknownScript_0xbd33f @@ -593,7 +593,7 @@ UnknownScript_0xbd33f: displaylocation ROUTE_27, $2 farjump UnknownScript_0xa0a46 -UnknownScript_0xbd346: +ReenaPhoneScript2: trainertotext COOLTRAINERF, REENA1, $0 farscall UnknownScript_0xbe41e checkflag ENGINE_REENA @@ -616,7 +616,7 @@ UnknownScript_0xbd369: ; Joey -UnknownScript_0xbd373: +JoeyPhoneScript1: trainertotext YOUNGSTER, JOEY1, $0 checkflag ENGINE_JOEY iftrue UnknownScript_0xbd399 @@ -636,7 +636,7 @@ UnknownScript_0xbd399: displaylocation ROUTE_30, $2 farjump UnknownScript_0xa0a4b -UnknownScript_0xbd3a0: +JoeyPhoneScript2: trainertotext YOUNGSTER, JOEY1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_JOEY @@ -660,7 +660,7 @@ UnknownScript_0xbd3c7: ; Wade -UnknownScript_0xbd3d1: +WadePhoneScript1: trainertotext BUG_CATCHER, WADE1, $0 checkflag ENGINE_WADE iftrue UnknownScript_0xbd41a @@ -698,7 +698,7 @@ UnknownScript_0xbd421: displaylocation ROUTE_31, $2 farjump UnknownScript_0xa0ab5 -UnknownScript_0xbd428: +WadePhoneScript2: trainertotext BUG_CATCHER, WADE1, $0 farscall UnknownScript_0xbe1b6 farscall UnknownScript_0xbde3f @@ -776,7 +776,7 @@ UnknownScript_0xbd4ce: ; Ralph -UnknownScript_0xbd4d2: +RalphPhoneScript1: trainertotext FISHER, RALPH1, $0 checkflag ENGINE_RALPH iftrue UnknownScript_0xbd4fb @@ -801,7 +801,7 @@ UnknownScript_0xbd502: displaylocation ROUTE_32, $2 farjump UnknownScript_0xa0af5 -UnknownScript_0xbd509: +RalphPhoneScript2: trainertotext FISHER, RALPH1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_FLYPOINT_GOLDENROD @@ -841,7 +841,7 @@ UnknownScript_0xbd55c: ; Liz -UnknownScript_0xbd560: +LizPhoneScript1: trainertotext PICNICKER, LIZ1, $0 checkflag ENGINE_LIZ iftrue UnknownScript_0xbd586 @@ -861,7 +861,7 @@ UnknownScript_0xbd586: displaylocation ROUTE_32, $2 farjump UnknownScript_0xa0a5a -UnknownScript_0xbd58d: +LizPhoneScript2: trainertotext PICNICKER, LIZ1, $0 farscall UnknownScript_0xbde45 if_equal $0, UnknownScript_0xbd5d0 @@ -946,7 +946,7 @@ UnknownScript_0xbd630: ; Anthony -UnknownScript_0xbd634: +AnthonyPhoneScript1: trainertotext HIKER, ANTHONY2, $0 checkflag ENGINE_ANTHONY iftrue UnknownScript_0xbd65d @@ -971,7 +971,7 @@ UnknownScript_0xbd664: displaylocation ROUTE_33, $2 farjump UnknownScript_0xa0afa -UnknownScript_0xbd66b: +AnthonyPhoneScript2: trainertotext HIKER, ANTHONY2, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_FLYPOINT_GOLDENROD @@ -1010,7 +1010,7 @@ UnknownScript_0xbd6bd: ; Todd -UnknownScript_0xbd6c1: +ToddPhoneScript1: trainertotext CAMPER, TODD1, $0 checkflag ENGINE_TODD iftrue UnknownScript_0xbd6ea @@ -1034,7 +1034,7 @@ UnknownScript_0xbd6ea: UnknownScript_0xbd6f1: farjump UnknownScript_0xa0b04 -UnknownScript_0xbd6f5: +ToddPhoneScript2: trainertotext CAMPER, TODD1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_TODD @@ -1072,7 +1072,7 @@ UnknownScript_0xbd73c: ; Gina -UnknownScript_0xbd743: +GinaPhoneScript1: trainertotext PICNICKER, GINA1, $0 checkflag ENGINE_GINA iftrue UnknownScript_0xbd776 @@ -1102,7 +1102,7 @@ UnknownScript_0xbd77d: displaylocation ROUTE_34, $2 farjump UnknownScript_0xa0abd -UnknownScript_0xbd784: +GinaPhoneScript2: trainertotext PICNICKER, GINA1, $0 farscall UnknownScript_0xbe41e checkflag ENGINE_ROCKETS_IN_RADIO_TOWER @@ -1147,7 +1147,7 @@ UnknownScript_0xbd7dd: ; Irwin -UnknownScript_0xbd7e7: +IrwinPhoneScript1: trainertotext JUGGLER, IRWIN1, $0 farscall UnknownScript_0xbde4e checkflag ENGINE_ROCKETS_IN_RADIO_TOWER @@ -1157,7 +1157,7 @@ UnknownScript_0xbd7e7: UnknownScript_0xbd7f9: farjump UnknownScript_0xa05be -UnknownScript_0xbd7fd: +IrwinPhoneScript2: trainertotext JUGGLER, IRWIN1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_ROCKETS_IN_RADIO_TOWER @@ -1169,7 +1169,7 @@ UnknownScript_0xbd80f: ; Arnie -UnknownScript_0xbd813: +ArniePhoneScript1: trainertotext BUG_CATCHER, ARNIE1, $0 checkflag ENGINE_ARNIE iftrue UnknownScript_0xbd83c @@ -1194,7 +1194,7 @@ UnknownScript_0xbd843: displaylocation ROUTE_35, $2 farjump UnknownScript_0xa0aff -UnknownScript_0xbd84a: +ArniePhoneScript2: trainertotext BUG_CATCHER, ARNIE1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_ARNIE @@ -1236,7 +1236,7 @@ UnknownScript_0xbd8a2: ; Alan -UnknownScript_0xbd8a6: +AlanPhoneScript1: trainertotext SCHOOLBOY, ALAN1, $0 checkflag ENGINE_ALAN iftrue UnknownScript_0xbd8cf @@ -1261,7 +1261,7 @@ UnknownScript_0xbd8d6: displaylocation ROUTE_36, $2 farjump UnknownScript_0xa0ac5 -UnknownScript_0xbd8dd: +AlanPhoneScript2: trainertotext SCHOOLBOY, ALAN1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_ALAN @@ -1299,7 +1299,7 @@ UnknownScript_0xbd926: ; Dana -UnknownScript_0xbd930: +DanaPhoneScript1: trainertotext LASS, DANA1, $0 checkflag ENGINE_DANA iftrue UnknownScript_0xbd959 @@ -1324,7 +1324,7 @@ UnknownScript_0xbd960: displaylocation ROUTE_38, $2 farjump UnknownScript_0xa0acd -UnknownScript_0xbd967: +DanaPhoneScript2: trainertotext LASS, DANA1, $0 farscall UnknownScript_0xbe41e checkflag ENGINE_DANA @@ -1367,7 +1367,7 @@ UnknownScript_0xbd9bc: ; Chad -UnknownScript_0xbd9c6: +ChadPhoneScript1: trainertotext SCHOOLBOY, CHAD1, $0 checkflag ENGINE_CHAD iftrue UnknownScript_0xbd9e9 @@ -1386,7 +1386,7 @@ UnknownScript_0xbd9e9: displaylocation ROUTE_38, $2 farjump UnknownScript_0xa0a7d -UnknownScript_0xbd9f0: +ChadPhoneScript2: trainertotext SCHOOLBOY, CHAD1, $0 farscall UnknownScript_0xbe1b6 farscall UnknownScript_0xbde3f @@ -1417,7 +1417,7 @@ UnknownScript_0xbda2d: UnknownScript_0xbda31: farjump UnknownScript_0xa0754 -UnknownScript_0xbda35: +DerekPhoneScript1: trainertotext POKEFANM, DEREK1, $0 farscall UnknownScript_0xbde4e checkflag ENGINE_DEREK_HAS_NUGGET @@ -1441,7 +1441,7 @@ UnknownScript_0xbda67: displaylocation ROUTE_39, $2 farjump UnknownScript_0xa0ad5 -UnknownScript_0xbda6e: +DerekPhoneScript2: trainertotext POKEFANM, DEREK1, $0 farscall UnknownScript_0xbe1b6 farscall UnknownScript_0xbde3f @@ -1466,7 +1466,7 @@ UnknownScript_0xbdaa2: displaylocation ROUTE_39, $2 farjump UnknownScript_0xa05e6 -UnknownScript_0xbdaac: +TullyPhoneScript1: trainertotext FISHER, TULLY1, $0 checkflag ENGINE_TULLY iftrue UnknownScript_0xbdad5 @@ -1491,7 +1491,7 @@ UnknownScript_0xbdadc: displaylocation ROUTE_42, $2 farjump UnknownScript_0xa0add -UnknownScript_0xbdae3: +TullyPhoneScript2: trainertotext FISHER, TULLY1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_TULLY @@ -1527,7 +1527,7 @@ UnknownScript_0xbdb2c: displaylocation ROUTE_42, $2 farjump UnknownScript_0xa05e6 -UnknownScript_0xbdb36: +BrentPhoneScript1: trainertotext POKEMANIAC, BRENT1, $0 checkflag ENGINE_BRENT iftrue UnknownScript_0xbdb59 @@ -1546,7 +1546,7 @@ UnknownScript_0xbdb59: displaylocation ROUTE_43, $2 farjump UnknownScript_0xa0a87 -UnknownScript_0xbdb60: +BrentPhoneScript2: trainertotext POKEMANIAC, BRENT1, $0 farscall UnknownScript_0xbe1b6 farscall UnknownScript_0xbde3f @@ -1572,7 +1572,7 @@ UnknownScript_0xbdb8b: UnknownScript_0xbdb95: farjump UnknownScript_0xa07ce -UnknownScript_0xbdb99: +TiffanyPhoneScript1: trainertotext PICNICKER, TIFFANY3, $0 checkflag ENGINE_TIFFANY iftrue UnknownScript_0xbdbc2 @@ -1597,7 +1597,7 @@ UnknownScript_0xbdbc9: displaylocation ROUTE_43, $2 farjump UnknownScript_0xa0ae5 -UnknownScript_0xbdbd0: +TiffanyPhoneScript2: trainertotext PICNICKER, TIFFANY3, $0 farscall UnknownScript_0xbde45 if_equal $0, UnknownScript_0xbdc21 @@ -1673,7 +1673,7 @@ UnknownScript_0xbdc69: ; Vance -UnknownScript_0xbdc73: +VancePhoneScript1: trainertotext BIRD_KEEPER, VANCE1, $0 checkflag ENGINE_VANCE iftrue UnknownScript_0xbdc96 @@ -1692,7 +1692,7 @@ UnknownScript_0xbdc96: displaylocation ROUTE_44, $2 farjump UnknownScript_0xa0a91 -UnknownScript_0xbdc9d: +VancePhoneScript2: trainertotext BIRD_KEEPER, VANCE1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_VANCE @@ -1714,7 +1714,7 @@ UnknownScript_0xbdcc4: setflag ENGINE_VANCE farjump UnknownScript_0xa0376 -UnknownScript_0xbdcce: +WiltonPhoneScript1: trainertotext FISHER, WILTON1, $0 checkflag ENGINE_WILTON iftrue UnknownScript_0xbdcf7 @@ -1739,7 +1739,7 @@ UnknownScript_0xbdcfe: displaylocation ROUTE_44, $2 farjump UnknownScript_0xa0aed -UnknownScript_0xbdd05: +WiltonPhoneScript2: trainertotext FISHER, WILTON1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_WILTON @@ -1792,19 +1792,19 @@ UnknownScript_0xbdd6d: ; Kenji -UnknownScript_0xbdd71: +KenjiPhoneScript1: trainertotext BLACKBELT_T, KENJI3, $0 farscall UnknownScript_0xbde4e farjump UnknownScript_0xa09ee -UnknownScript_0xbdd7d: +KenjiPhoneScript2: trainertotext BLACKBELT_T, KENJI3, $0 farscall UnknownScript_0xbe1b6 farjump UnknownScript_0xa064c ; Parry -UnknownScript_0xbdd89: +ParryPhoneScript1: trainertotext HIKER, PARRY1, $0 checkflag ENGINE_PARRY iftrue UnknownScript_0xbddac @@ -1823,7 +1823,7 @@ UnknownScript_0xbddac: displaylocation ROUTE_45, $2 farjump UnknownScript_0xa0a9b -UnknownScript_0xbddb3: +ParryPhoneScript2: trainertotext HIKER, PARRY1, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_PARRY @@ -1847,7 +1847,7 @@ UnknownScript_0xbddda: ; Erin -UnknownScript_0xbdde4: +ErinPhoneScript1: trainertotext PICNICKER, ERIN1, $0 checkflag ENGINE_ERIN iftrue UnknownScript_0xbde07 @@ -1866,7 +1866,7 @@ UnknownScript_0xbde07: displaylocation ROUTE_46, $2 farjump UnknownScript_0xa0aa0 -UnknownScript_0xbde0e: +ErinPhoneScript2: trainertotext PICNICKER, ERIN1, $0 farscall UnknownScript_0xbe41e checkflag ENGINE_ERIN diff --git a/engine/radio.asm b/engine/radio.asm index 737b626b6..3503ecc13 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -1285,7 +1285,7 @@ LuckyNumberShow18: ; b8cf2 (2e:4cf2) pop bc jr c, LuckyNumberShow18 push bc - callab Function3952d + callab GetTrainerClassName ld de, StringBuffer1 call CopyName1 pop bc diff --git a/engine/specials.asm b/engine/specials.asm index d91692786..945282462 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -111,8 +111,8 @@ SpecialsPointers:: ; c029 add_special Functionc2da add_special GetFirstPokemonHappiness add_special CheckFirstMonIsEgg - add_special Function2a4ab - add_special Function2a51f + add_special RandomPhoneRareWildMon + add_special RandomPhoneWildMon add_special RandomPhoneMon add_special RunCallback_04 add_special Functionfb841 |