diff options
Diffstat (limited to 'maps')
48 files changed, 266 insertions, 266 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index d9c079d58..c7654b616 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -59,11 +59,11 @@ UnknownScript_0x18ec73: ; 0x18ec73 ; 0x18ec7c UnknownScript_0x18ec7c: ; 0x18ec7c - jumpstd $0012 + jumpstd goldenrodrockets ; 0x18ec7f UnknownScript_0x18ec7f: ; 0x18ec7f - jumpstd $0013 + jumpstd radiotowerrockets ; 0x18ec82 TrainerTwinsAmyandmay1: ; 0x18ec82 @@ -232,12 +232,12 @@ AzaleaGymGuyScript: ; 0x18ece6 MapAzaleaGymSignpost1Script: ; 0x18ecfb checkflag $001c iftrue UnknownScript_0x18ed04 - jumpstd $002d + jumpstd gymstatue1 ; 0x18ed04 UnknownScript_0x18ed04: ; 0x18ed04 trainertotext BUGSY, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x18ed0b UnknownText_0x18ed0b: ; 0x18ed0b diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 5513aa6e5..d83482676 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -202,12 +202,12 @@ BlackthornGymGuyScript: ; 0x194ed6 MapBlackthornGym1FSignpost1Script: ; 0x194eea checkflag $0022 iftrue UnknownScript_0x194ef3 - jumpstd $002d + jumpstd gymstatue1 ; 0x194ef3 UnknownScript_0x194ef3: ; 0x194ef3 trainertotext CLAIR, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x194efa UnknownText_0x194efa: ; 0x194efa diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 8940aa6b4..4dd36a943 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -23,7 +23,7 @@ MapCeladonDeptStore1FSignpost0Script: ; 0x709e9 ; 0x709ec MapCeladonDeptStore6FSignpost1Script: ; 0x709ec - jumpstd $0014 + jumpstd elevatorbutton ; 0x709ef UnknownText_0x709ef: ; 0x709ef diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 135ea4614..5c6a92aa5 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -35,7 +35,7 @@ MapCeladonDeptStore2FSignpost0Script: ; 0x70bc3 ; 0x70bc6 MapCeladonDeptStore2FSignpost1Script: ; 0x70bc6 - jumpstd $0014 + jumpstd elevatorbutton ; 0x70bc9 UnknownText_0x70bc9: ; 0x70bc9 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 9083e9244..30af30664 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -43,7 +43,7 @@ SuperNerdScript_0x70d4a: ; 0x70d4a ; 0x70d4d MapCeladonDeptStore3FSignpost1Script: ; 0x70d4d - jumpstd $0014 + jumpstd elevatorbutton ; 0x70d50 MapCeladonDeptStore3FSignpost0Script: ; 0x70d50 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 0ff2eac0e..d5b034ff9 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -27,7 +27,7 @@ MapCeladonDeptStore4FSignpost0Script: ; 0x70f1b ; 0x70f1e MapCeladonDeptStore4FSignpost1Script: ; 0x70f1e - jumpstd $0014 + jumpstd elevatorbutton ; 0x70f21 UnknownText_0x70f21: ; 0x70f21 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index bc5a6a6dd..40a4b8c52 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -39,7 +39,7 @@ MapCeladonDeptStore5FSignpost0Script: ; 0x7101d ; 0x71020 MapCeladonDeptStore5FSignpost1Script: ; 0x71020 - jumpstd $0014 + jumpstd elevatorbutton ; 0x71023 UnknownText_0x71023: ; 0x71023 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 59fd9a422..504db1840 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -113,7 +113,7 @@ MapCeladonDeptStore6FSignpost0Script: ; 0x7124a ; 0x7124d UnknownScript_0x7124d: ; 0x7124d - jumpstd $0014 + jumpstd elevatorbutton ; 0x71250 UnknownText_0x71250: ; 0x71250 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index c1607b89c..ee7848f2f 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -191,12 +191,12 @@ TwinsJoandzoe2Script: ; 0x72b10 MapCeladonGymSignpost1Script: ; 0x72b18 checkflag $0026 iftrue UnknownScript_0x72b21 - jumpstd $002d + jumpstd gymstatue1 ; 0x72b21 UnknownScript_0x72b21: ; 0x72b21 trainertotext ERIKA, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x72b28 UnknownText_0x72b28: ; 0x72b28 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index c3bb07c86..81697320b 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -217,12 +217,12 @@ MapCeruleanGymSignpost2Script: ; 0x1884c6 UnknownScript_0x1884d3: ; 0x1884d3 checkflag $0024 iftrue UnknownScript_0x1884dc - jumpstd $002d + jumpstd gymstatue1 ; 0x1884dc UnknownScript_0x1884dc: ; 0x1884dc trainertotext MISTY, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x1884e3 MovementData_0x1884e3: ; 0x1884e3 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index ee5a7281e..e6f6a592c 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -74,11 +74,11 @@ UnknownScript_0x9d681: ; 0x9d681 ; 0x9d68a UnknownScript_0x9d68a: ; 0x9d68a - jumpstd $0012 + jumpstd goldenrodrockets ; 0x9d68d UnknownScript_0x9d68d: ; 0x9d68d - jumpstd $0013 + jumpstd radiotowerrockets ; 0x9d690 TrainerBlackbeltYoshi: ; 0x9d690 @@ -204,12 +204,12 @@ BoulderScript_0x9d6e0: ; 0x9d6e0 MapCianwoodGymSignpost1Script: ; 0x9d6e3 checkflag $0020 iftrue UnknownScript_0x9d6ec - jumpstd $002d + jumpstd gymstatue1 ; 0x9d6ec UnknownScript_0x9d6ec: ; 0x9d6ec trainertotext CHUCK, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x9d6f3 MovementData_0x9d6f3: ; 0x9d6f3 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 67321595f..e03a49dfc 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -75,11 +75,11 @@ UnknownScript_0x99db7: ; 0x99db7 ; 0x99dc0 UnknownScript_0x99dc0: ; 0x99dc0 - jumpstd $0012 + jumpstd goldenrodrockets ; 0x99dc3 UnknownScript_0x99dc3: ; 0x99dc3 - jumpstd $0013 + jumpstd radiotowerrockets ; 0x99dc6 UnknownScript_0x99dc6: ; 0x99dc6 @@ -235,12 +235,12 @@ EcruteakGymGuyScript: ; 0x99e39 MapEcruteakGymSignpost1Script: ; 0x99e4d checkflag $001e iftrue UnknownScript_0x99e56 - jumpstd $002d + jumpstd gymstatue1 ; 0x99e56 UnknownScript_0x99e56: ; 0x99e56 trainertotext MORTY, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x99e5d MovementData_0x99e5d: ; 0x99e5d diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 991438781..fcf787121 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -223,12 +223,12 @@ FuchsiaGymGuyScript: ; 0x195f03 MapFuchsiaGymSignpost1Script: ; 0x195f17 checkflag $0027 iftrue UnknownScript_0x195f20 - jumpstd $002d + jumpstd gymstatue1 ; 0x195f20 UnknownScript_0x195f20: ; 0x195f20 trainertotext JANINE, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x195f27 MovementData_0x195f27: ; 0x195f27 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index cb59839b0..8682aa584 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -27,7 +27,7 @@ MapGoldenrodDeptStore1FSignpost0Script: ; 0x5598d ; 0x55990 MapGoldenrodDeptStore1FSignpost1Script: ; 0x55990 - jumpstd $0014 + jumpstd elevatorbutton ; 0x55993 UnknownText_0x55993: ; 0x55993 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 7ebe1c46a..56a4324ce 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -39,7 +39,7 @@ MapGoldenrodDeptStore2FSignpost0Script: ; 0x55b76 ; 0x55b79 MapGoldenrodDeptStore2FSignpost1Script: ; 0x55b79 - jumpstd $0014 + jumpstd elevatorbutton ; 0x55b7c ; possibly unused diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 70af6bc26..e04d5b544 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -27,7 +27,7 @@ MapGoldenrodDeptStore3FSignpost0Script: ; 0x55dc6 ; 0x55dc9 MapGoldenrodDeptStore3FSignpost1Script: ; 0x55dc9 - jumpstd $0014 + jumpstd elevatorbutton ; 0x55dcc UnknownText_0x55dcc: ; 0x55dcc diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 0272f4b57..399f7c563 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -37,7 +37,7 @@ MapGoldenrodDeptStore4FSignpost0Script: ; 0x55f02 ; 0x55f05 MapGoldenrodDeptStore4FSignpost1Script: ; 0x55f05 - jumpstd $0014 + jumpstd elevatorbutton ; 0x55f08 UnknownText_0x55f08: ; 0x55f08 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index a478cd919..c7a8c866c 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -153,7 +153,7 @@ MapGoldenrodDeptStore5FSignpost0Script: ; 0x5613d ; 0x56140 MapGoldenrodDeptStore5FSignpost1Script: ; 0x56140 - jumpstd $0014 + jumpstd elevatorbutton ; 0x56143 UnknownText_0x56143: ; 0x56143 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index fabc3f721..9bcb70d33 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -104,7 +104,7 @@ MapGoldenrodDeptStore6FSignpost0Script: ; 0x564c5 ; 0x564c8 MapGoldenrodDeptStore6FSignpost1Script: ; 0x564c8 - jumpstd $0014 + jumpstd elevatorbutton ; 0x564cb UnknownText_0x564cb: ; 0x564cb diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 5a6aa91e7..333af4f6a 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -88,11 +88,11 @@ UnknownScript_0x5407d: ; 0x5407d ; 0x54086 UnknownScript_0x54086: ; 0x54086 - jumpstd $0012 + jumpstd goldenrodrockets ; 0x54089 UnknownScript_0x54089: ; 0x54089 - jumpstd $0013 + jumpstd radiotowerrockets ; 0x5408c TrainerLassCarrie: ; 0x5408c @@ -246,12 +246,12 @@ GoldenrodGymGuyScript: ; 0x540f7 MapGoldenrodGymSignpost1Script: ; 0x5410c checkflag $001d iftrue UnknownScript_0x54115 - jumpstd $002d + jumpstd gymstatue1 ; 0x54115 UnknownScript_0x54115: ; 0x54115 trainertotext WHITNEY, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x5411c BridgetWalksUpMovement: ; 0x5411c diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index b32651a11..69cf66412 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -21,7 +21,7 @@ UnknownScript_0x7abb4: ; 0x7abb4 setevent $0007 checkevent $0036 iftrue UnknownScript_0x7abc4 - jumpstd $0018 + jumpstd initializeevents return ; 0x7abc4 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index b3b8287a0..e98d41260 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -60,11 +60,11 @@ UnknownScript_0x199af6: ; 0x199af6 ; 0x199aff UnknownScript_0x199aff: ; 0x199aff - jumpstd $0012 + jumpstd goldenrodrockets ; 0x199b02 UnknownScript_0x199b02: ; 0x199b02 - jumpstd $0013 + jumpstd radiotowerrockets ; 0x199b05 TrainerSkierRoxanne: ; 0x199b05 @@ -232,12 +232,12 @@ MahoganyGymGuyScript: ; 0x199b69 MapMahoganyGymSignpost1Script: ; 0x199b7d checkflag $0021 iftrue UnknownScript_0x199b86 - jumpstd $002d + jumpstd gymstatue1 ; 0x199b86 UnknownScript_0x199b86: ; 0x199b86 trainertotext PRYCE, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x199b8d UnknownText_0x199b8d: ; 0x199b8d diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index edf80de41..52d55ae2d 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -178,37 +178,37 @@ UnknownScript_0x5c0f3: ; 0x5c0f3 ; 0x5c0fc UnknownScript_0x5c0fc: ; 0x5c0fc - jumpstd $0019 + jumpstd asknumber1m end ; 0x5c100 UnknownScript_0x5c100: ; 0x5c100 - jumpstd $001a + jumpstd asknumber2m end ; 0x5c104 UnknownScript_0x5c104: ; 0x5c104 - jumpstd $001b + jumpstd registerednumberm end ; 0x5c108 UnknownScript_0x5c108: ; 0x5c108 - jumpstd $001c + jumpstd numberacceptedm end ; 0x5c10c UnknownScript_0x5c10c: ; 0x5c10c - jumpstd $001d + jumpstd numberdeclinedm end ; 0x5c110 UnknownScript_0x5c110: ; 0x5c110 - jumpstd $001e + jumpstd phonefullm end ; 0x5c114 UnknownScript_0x5c114: ; 0x5c114 - jumpstd $001f + jumpstd rematchm end ; 0x5c118 @@ -311,42 +311,42 @@ UnknownScript_0x5c189: ; 0x5c189 ; 0x5c18f UnknownScript_0x5c18f: ; 0x5c18f - jumpstd $0023 + jumpstd asknumber1f end ; 0x5c193 UnknownScript_0x5c193: ; 0x5c193 - jumpstd $0024 + jumpstd asknumber2f end ; 0x5c197 UnknownScript_0x5c197: ; 0x5c197 - jumpstd $0025 + jumpstd registerednumberf end ; 0x5c19b UnknownScript_0x5c19b: ; 0x5c19b - jumpstd $0026 + jumpstd numberacceptedf end ; 0x5c19f UnknownScript_0x5c19f: ; 0x5c19f - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x5c1a3 UnknownScript_0x5c1a3: ; 0x5c1a3 - jumpstd $0028 + jumpstd phonefullf end ; 0x5c1a7 UnknownScript_0x5c1a7: ; 0x5c1a7 - jumpstd $002a + jumpstd giftf end ; 0x5c1ab UnknownScript_0x5c1ab: ; 0x5c1ab - jumpstd $002b + jumpstd packfullf end ; 0x5c1af diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 89b302ebb..5ebe4363c 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -55,11 +55,11 @@ UnknownScript_0x9c178: ; 0x9c178 ; 0x9c181 UnknownScript_0x9c181: ; 0x9c181 - jumpstd $0012 + jumpstd goldenrodrockets ; 0x9c184 UnknownScript_0x9c184: ; 0x9c184 - jumpstd $0013 + jumpstd radiotowerrockets ; 0x9c187 OlivineGymGuyScript: ; 0x9c187 @@ -94,12 +94,12 @@ OlivineGymGuyScript: ; 0x9c187 MapOlivineGymSignpost1Script: ; 0x9c1a9 checkflag $001f iftrue UnknownScript_0x9c1b2 - jumpstd $002d + jumpstd gymstatue1 ; 0x9c1b2 UnknownScript_0x9c1b2: ; 0x9c1b2 trainertotext JASMINE, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x9c1b9 UnknownText_0x9c1b9: ; 0x9c1b9 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 2e3b5dcee..78ed2578d 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -157,48 +157,48 @@ UnknownScript_0x5b03f: ; 0x5b03f ; 0x5b053 UnknownScript_0x5b053: ; 0x5b053 - jumpstd $0019 + jumpstd asknumber1m end ; 0x5b057 UnknownScript_0x5b057: ; 0x5b057 - jumpstd $001a + jumpstd asknumber2m end ; 0x5b05b UnknownScript_0x5b05b: ; 0x5b05b - jumpstd $001b + jumpstd registerednumberm end ; 0x5b05f UnknownScript_0x5b05f: ; 0x5b05f - jumpstd $001c + jumpstd numberacceptedm end ; 0x5b063 UnknownScript_0x5b063: ; 0x5b063 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x5b067 UnknownScript_0x5b067: ; 0x5b067 - jumpstd $001e + jumpstd phonefullm end ; 0x5b06b UnknownScript_0x5b06b: ; 0x5b06b - jumpstd $001f + jumpstd rematchm end ; 0x5b06f UnknownScript_0x5b06f: ; 0x5b06f setevent EVENT_HUEY_PROTEIN - jumpstd $0021 + jumpstd packfullm end ; 0x5b076 UnknownScript_0x5b076: ; 0x5b076 - jumpstd $0022 + jumpstd rematchgiftm end ; 0x5b07a diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index b711ea4d0..b3f06b356 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -87,12 +87,12 @@ PewterGymGuyScript: ; 0x1a28ac MapPewterGymSignpost1Script: ; 0x1a28c0 checkflag $0023 iftrue UnknownScript_0x1a28c9 - jumpstd $002d + jumpstd gymstatue1 ; 0x1a28c9 UnknownScript_0x1a28c9: ; 0x1a28c9 trainertotext BROCK, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x1a28d0 UnknownText_0x1a28d0: ; 0x1a28d0 diff --git a/maps/Route26.asm b/maps/Route26.asm index edd1543c5..b645fc66c 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -123,37 +123,37 @@ UnknownScript_0x1a4db6: ; 0x1a4db6 ; 0x1a4dbf UnknownScript_0x1a4dbf: ; 0x1a4dbf - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a4dc3 UnknownScript_0x1a4dc3: ; 0x1a4dc3 - jumpstd $001a + jumpstd asknumber2m end ; 0x1a4dc7 UnknownScript_0x1a4dc7: ; 0x1a4dc7 - jumpstd $001b + jumpstd registerednumberm end ; 0x1a4dcb UnknownScript_0x1a4dcb: ; 0x1a4dcb - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a4dcf UnknownScript_0x1a4dcf: ; 0x1a4dcf - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a4dd3 UnknownScript_0x1a4dd3: ; 0x1a4dd3 - jumpstd $001e + jumpstd phonefullm end ; 0x1a4dd7 UnknownScript_0x1a4dd7: ; 0x1a4dd7 - jumpstd $001f + jumpstd rematchm end ; 0x1a4ddb @@ -274,37 +274,37 @@ UnknownScript_0x1a4e72: ; 0x1a4e72 ; 0x1a4e7b UnknownScript_0x1a4e7b: ; 0x1a4e7b - jumpstd $0023 + jumpstd asknumber1f end ; 0x1a4e7f UnknownScript_0x1a4e7f: ; 0x1a4e7f - jumpstd $0024 + jumpstd asknumber2f end ; 0x1a4e83 UnknownScript_0x1a4e83: ; 0x1a4e83 - jumpstd $0025 + jumpstd registerednumberf end ; 0x1a4e87 UnknownScript_0x1a4e87: ; 0x1a4e87 - jumpstd $0026 + jumpstd numberacceptedf end ; 0x1a4e8b UnknownScript_0x1a4e8b: ; 0x1a4e8b - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x1a4e8f UnknownScript_0x1a4e8f: ; 0x1a4e8f - jumpstd $0028 + jumpstd phonefullf end ; 0x1a4e93 UnknownScript_0x1a4e93: ; 0x1a4e93 - jumpstd $0029 + jumpstd rematchf end ; 0x1a4e97 diff --git a/maps/Route27.asm b/maps/Route27.asm index 1ba167a0d..fe0d46f41 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -176,47 +176,47 @@ UnknownScript_0x1a0954: ; 0x1a0954 ; 0x1a0957 UnknownScript_0x1a0957: ; 0x1a0957 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a095b UnknownScript_0x1a095b: ; 0x1a095b - jumpstd $001a + jumpstd asknumber2m end ; 0x1a095f UnknownScript_0x1a095f: ; 0x1a095f - jumpstd $001b + jumpstd registerednumberm end ; 0x1a0963 UnknownScript_0x1a0963: ; 0x1a0963 - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a0967 UnknownScript_0x1a0967: ; 0x1a0967 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a096b UnknownScript_0x1a096b: ; 0x1a096b - jumpstd $001e + jumpstd phonefullm end ; 0x1a096f UnknownScript_0x1a096f: ; 0x1a096f - jumpstd $001f + jumpstd rematchm end ; 0x1a0973 UnknownScript_0x1a0973: ; 0x1a0973 - jumpstd $0020 + jumpstd giftm end ; 0x1a0977 UnknownScript_0x1a0977: ; 0x1a0977 - jumpstd $0021 + jumpstd packfullm end ; 0x1a097b @@ -366,37 +366,37 @@ UnknownScript_0x1a0a26: ; 0x1a0a26 ; 0x1a0a2f UnknownScript_0x1a0a2f: ; 0x1a0a2f - jumpstd $0023 + jumpstd asknumber1f end ; 0x1a0a33 UnknownScript_0x1a0a33: ; 0x1a0a33 - jumpstd $0024 + jumpstd asknumber2f end ; 0x1a0a37 UnknownScript_0x1a0a37: ; 0x1a0a37 - jumpstd $0025 + jumpstd registerednumberf end ; 0x1a0a3b UnknownScript_0x1a0a3b: ; 0x1a0a3b - jumpstd $0026 + jumpstd numberacceptedf end ; 0x1a0a3f UnknownScript_0x1a0a3f: ; 0x1a0a3f - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x1a0a43 UnknownScript_0x1a0a43: ; 0x1a0a43 - jumpstd $0028 + jumpstd phonefullf end ; 0x1a0a47 UnknownScript_0x1a0a47: ; 0x1a0a47 - jumpstd $0029 + jumpstd rematchf end ; 0x1a0a4b diff --git a/maps/Route30.asm b/maps/Route30.asm index 187e57170..393832e36 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -164,48 +164,48 @@ UnknownScript_0x1a176f: ; 0x1a176f ; 0x1a1783 UnknownScript_0x1a1783: ; 0x1a1783 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a1787 UnknownScript_0x1a1787: ; 0x1a1787 - jumpstd $001a + jumpstd asknumber2m end ; 0x1a178b UnknownScript_0x1a178b: ; 0x1a178b - jumpstd $001b + jumpstd registerednumberm end ; 0x1a178f UnknownScript_0x1a178f: ; 0x1a178f - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a1793 UnknownScript_0x1a1793: ; 0x1a1793 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a1797 UnknownScript_0x1a1797: ; 0x1a1797 - jumpstd $001e + jumpstd phonefullm end ; 0x1a179b UnknownScript_0x1a179b: ; 0x1a179b - jumpstd $001f + jumpstd rematchm end ; 0x1a179f UnknownScript_0x1a179f: ; 0x1a179f setevent EVENT_JOEY_HP_UP - jumpstd $0021 + jumpstd packfullm end ; 0x1a17a6 UnknownScript_0x1a17a6: ; 0x1a17a6 - jumpstd $0022 + jumpstd rematchgiftm end ; 0x1a17aa diff --git a/maps/Route31.asm b/maps/Route31.asm index 93dd83909..c1fbfe30c 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -177,47 +177,47 @@ UnknownScript_0x1a5549: ; 0x1a5549 ; 0x1a554c UnknownScript_0x1a554c: ; 0x1a554c - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a5550 UnknownScript_0x1a5550: ; 0x1a5550 - jumpstd $001a + jumpstd asknumber2m end ; 0x1a5554 UnknownScript_0x1a5554: ; 0x1a5554 - jumpstd $001b + jumpstd registerednumberm end ; 0x1a5558 UnknownScript_0x1a5558: ; 0x1a5558 - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a555c UnknownScript_0x1a555c: ; 0x1a555c - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a5560 UnknownScript_0x1a5560: ; 0x1a5560 - jumpstd $001e + jumpstd phonefullm end ; 0x1a5564 UnknownScript_0x1a5564: ; 0x1a5564 - jumpstd $001f + jumpstd rematchm end ; 0x1a5568 UnknownScript_0x1a5568: ; 0x1a5568 - jumpstd $0020 + jumpstd giftm end ; 0x1a556c UnknownScript_0x1a556c: ; 0x1a556c - jumpstd $0021 + jumpstd packfullm end ; 0x1a5570 diff --git a/maps/Route32.asm b/maps/Route32.asm index 1fe8bc714..d5dbc2af1 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -326,37 +326,37 @@ UnknownScript_0x1905f1: ; 0x1905f1 ; 0x1905f7 UnknownScript_0x1905f7: ; 0x1905f7 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1905fb UnknownScript_0x1905fb: ; 0x1905fb - jumpstd $001a + jumpstd asknumber2m end ; 0x1905ff UnknownScript_0x1905ff: ; 0x1905ff - jumpstd $001b + jumpstd registerednumberm end ; 0x190603 UnknownScript_0x190603: ; 0x190603 - jumpstd $001c + jumpstd numberacceptedm end ; 0x190607 UnknownScript_0x190607: ; 0x190607 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x19060b UnknownScript_0x19060b: ; 0x19060b - jumpstd $001e + jumpstd phonefullm end ; 0x19060f UnknownScript_0x19060f: ; 0x19060f - jumpstd $001f + jumpstd rematchm end ; 0x190613 @@ -503,37 +503,37 @@ UnknownScript_0x1906d8: ; 0x1906d8 ; 0x1906e1 UnknownScript_0x1906e1: ; 0x1906e1 - jumpstd $0023 + jumpstd asknumber1f end ; 0x1906e5 UnknownScript_0x1906e5: ; 0x1906e5 - jumpstd $0024 + jumpstd asknumber2f end ; 0x1906e9 UnknownScript_0x1906e9: ; 0x1906e9 - jumpstd $0025 + jumpstd registerednumberf end ; 0x1906ed UnknownScript_0x1906ed: ; 0x1906ed - jumpstd $0026 + jumpstd numberacceptedf end ; 0x1906f1 UnknownScript_0x1906f1: ; 0x1906f1 - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x1906f5 UnknownScript_0x1906f5: ; 0x1906f5 - jumpstd $0028 + jumpstd phonefullf end ; 0x1906f9 UnknownScript_0x1906f9: ; 0x1906f9 - jumpstd $0029 + jumpstd rematchf end ; 0x1906fd diff --git a/maps/Route33.asm b/maps/Route33.asm index e1b137812..c75dd845a 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -133,37 +133,37 @@ UnknownScript_0x1ac0c5: ; 0x1ac0c5 ; 0x1ac0cb UnknownScript_0x1ac0cb: ; 0x1ac0cb - jumpstd $0019 + jumpstd asknumber1m end ; 0x1ac0cf UnknownScript_0x1ac0cf: ; 0x1ac0cf - jumpstd $001a + jumpstd asknumber2m end ; 0x1ac0d3 UnknownScript_0x1ac0d3: ; 0x1ac0d3 - jumpstd $001b + jumpstd registerednumberm end ; 0x1ac0d7 UnknownScript_0x1ac0d7: ; 0x1ac0d7 - jumpstd $001c + jumpstd numberacceptedm end ; 0x1ac0db UnknownScript_0x1ac0db: ; 0x1ac0db - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1ac0df UnknownScript_0x1ac0df: ; 0x1ac0df - jumpstd $001e + jumpstd phonefullm end ; 0x1ac0e3 UnknownScript_0x1ac0e3: ; 0x1ac0e3 - jumpstd $001f + jumpstd rematchm end ; 0x1ac0e7 diff --git a/maps/Route34.asm b/maps/Route34.asm index f41d6664f..063422654 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -209,37 +209,37 @@ UnknownScript_0x78131: ; 0x78131 ; 0x78137 UnknownScript_0x78137: ; 0x78137 - jumpstd $0019 + jumpstd asknumber1m end ; 0x7813b UnknownScript_0x7813b: ; 0x7813b - jumpstd $001a + jumpstd asknumber2m end ; 0x7813f UnknownScript_0x7813f: ; 0x7813f - jumpstd $001b + jumpstd registerednumberm end ; 0x78143 UnknownScript_0x78143: ; 0x78143 - jumpstd $001c + jumpstd numberacceptedm end ; 0x78147 UnknownScript_0x78147: ; 0x78147 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x7814b UnknownScript_0x7814b: ; 0x7814b - jumpstd $001e + jumpstd phonefullm end ; 0x7814f UnknownScript_0x7814f: ; 0x7814f - jumpstd $001f + jumpstd rematchm end ; 0x78153 @@ -372,47 +372,47 @@ UnknownScript_0x78225: ; 0x78225 ; 0x78228 UnknownScript_0x78228: ; 0x78228 - jumpstd $0023 + jumpstd asknumber1f end ; 0x7822c UnknownScript_0x7822c: ; 0x7822c - jumpstd $0024 + jumpstd asknumber2f end ; 0x78230 UnknownScript_0x78230: ; 0x78230 - jumpstd $0025 + jumpstd registerednumberf end ; 0x78234 UnknownScript_0x78234: ; 0x78234 - jumpstd $0026 + jumpstd numberacceptedf end ; 0x78238 UnknownScript_0x78238: ; 0x78238 - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x7823c UnknownScript_0x7823c: ; 0x7823c - jumpstd $0028 + jumpstd phonefullf end ; 0x78240 UnknownScript_0x78240: ; 0x78240 - jumpstd $0029 + jumpstd rematchf end ; 0x78244 UnknownScript_0x78244: ; 0x78244 - jumpstd $002a + jumpstd giftf end ; 0x78248 UnknownScript_0x78248: ; 0x78248 - jumpstd $002b + jumpstd packfullf end ; 0x7824c diff --git a/maps/Route35.asm b/maps/Route35.asm index 099e73471..57a364905 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -82,37 +82,37 @@ UnknownScript_0x19c8ef: ; 0x19c8ef ; 0x19c903 UnknownScript_0x19c903: ; 0x19c903 - jumpstd $0019 + jumpstd asknumber1m end ; 0x19c907 UnknownScript_0x19c907: ; 0x19c907 - jumpstd $001a + jumpstd asknumber2m end ; 0x19c90b UnknownScript_0x19c90b: ; 0x19c90b - jumpstd $001b + jumpstd registerednumberm end ; 0x19c90f UnknownScript_0x19c90f: ; 0x19c90f - jumpstd $001c + jumpstd numberacceptedm end ; 0x19c913 UnknownScript_0x19c913: ; 0x19c913 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x19c917 UnknownScript_0x19c917: ; 0x19c917 - jumpstd $001e + jumpstd phonefullm end ; 0x19c91b UnknownScript_0x19c91b: ; 0x19c91b - jumpstd $001f + jumpstd rematchm end ; 0x19c91f diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index bae2d9978..b45ecddc4 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -75,7 +75,7 @@ UnknownScript_0x6a1d1: ; 0x6a1d1 writetext UnknownText_0x6a7db closetext loadmovesprites - jumpstd $0016 + jumpstd bugcontestresultswarp ; 0x6a1ee UnknownScript_0x6a1ee: ; 0x6a1ee @@ -231,7 +231,7 @@ MapRoute36NationalParkgateSignpost0Script: ; 0x6a2db ; 0x6a2de UnknownScript_0x6a2de: ; 0x6a2de - jumpstd $0015 + jumpstd daytotext end ; 0x6a2e2 diff --git a/maps/Route36.asm b/maps/Route36.asm index 38db65fca..ff1fcedef 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -305,47 +305,47 @@ UnknownScript_0x1941c6: ; 0x1941c6 ; 0x1941c9 UnknownScript_0x1941c9: ; 0x1941c9 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1941cd UnknownScript_0x1941cd: ; 0x1941cd - jumpstd $001a + jumpstd asknumber2m end ; 0x1941d1 UnknownScript_0x1941d1: ; 0x1941d1 - jumpstd $001b + jumpstd registerednumberm end ; 0x1941d5 UnknownScript_0x1941d5: ; 0x1941d5 - jumpstd $001c + jumpstd numberacceptedm end ; 0x1941d9 UnknownScript_0x1941d9: ; 0x1941d9 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1941dd UnknownScript_0x1941dd: ; 0x1941dd - jumpstd $001e + jumpstd phonefullm end ; 0x1941e1 UnknownScript_0x1941e1: ; 0x1941e1 - jumpstd $001f + jumpstd rematchm end ; 0x1941e5 UnknownScript_0x1941e5: ; 0x1941e5 - jumpstd $0020 + jumpstd giftm end ; 0x1941e9 UnknownScript_0x1941e9: ; 0x1941e9 - jumpstd $0021 + jumpstd packfullm end ; 0x1941ed diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 1f282b1e5..42293f109 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -83,7 +83,7 @@ UnknownScript_0x6ab47: ; 0x6ab47 applymovement $0, MovementData_0x6add1 pause 15 special Function8c0ab - jumpstd $0017 + jumpstd bugcontestresults ; 0x6ab76 UnknownScript_0x6ab76: ; 0x6ab76 @@ -320,7 +320,7 @@ OfficerScript_0x6acf4: ; 0x6acf4 ; 0x6ad02 UnknownScript_0x6ad02: ; 0x6ad02 - jumpstd $0015 + jumpstd daytotext end ; 0x6ad06 diff --git a/maps/Route38.asm b/maps/Route38.asm index a2e03f87c..367ff1fe2 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -193,47 +193,47 @@ UnknownScript_0x1a1e08: ; 0x1a1e08 ; 0x1a1e0b UnknownScript_0x1a1e0b: ; 0x1a1e0b - jumpstd $0023 + jumpstd asknumber1f end ; 0x1a1e0f UnknownScript_0x1a1e0f: ; 0x1a1e0f - jumpstd $0024 + jumpstd asknumber2f end ; 0x1a1e13 UnknownScript_0x1a1e13: ; 0x1a1e13 - jumpstd $0025 + jumpstd registerednumberf end ; 0x1a1e17 UnknownScript_0x1a1e17: ; 0x1a1e17 - jumpstd $0026 + jumpstd numberacceptedf end ; 0x1a1e1b UnknownScript_0x1a1e1b: ; 0x1a1e1b - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x1a1e1f UnknownScript_0x1a1e1f: ; 0x1a1e1f - jumpstd $0028 + jumpstd phonefullf end ; 0x1a1e23 UnknownScript_0x1a1e23: ; 0x1a1e23 - jumpstd $0029 + jumpstd rematchf end ; 0x1a1e27 UnknownScript_0x1a1e27: ; 0x1a1e27 - jumpstd $002a + jumpstd giftf end ; 0x1a1e2b UnknownScript_0x1a1e2b: ; 0x1a1e2b - jumpstd $002b + jumpstd packfullf end ; 0x1a1e2f @@ -351,37 +351,37 @@ UnknownScript_0x1a1ee0: ; 0x1a1ee0 ; 0x1a1ee9 UnknownScript_0x1a1ee9: ; 0x1a1ee9 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a1eed UnknownScript_0x1a1eed: ; 0x1a1eed - jumpstd $001a + jumpstd asknumber2m end ; 0x1a1ef1 UnknownScript_0x1a1ef1: ; 0x1a1ef1 - jumpstd $001b + jumpstd registerednumberm end ; 0x1a1ef5 UnknownScript_0x1a1ef5: ; 0x1a1ef5 - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a1ef9 UnknownScript_0x1a1ef9: ; 0x1a1ef9 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a1efd UnknownScript_0x1a1efd: ; 0x1a1efd - jumpstd $001e + jumpstd phonefullm end ; 0x1a1f01 UnknownScript_0x1a1f01: ; 0x1a1f01 - jumpstd $001f + jumpstd rematchm end ; 0x1a1f05 diff --git a/maps/Route39.asm b/maps/Route39.asm index 4e22632d8..12f9f13c5 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -85,42 +85,42 @@ UnknownScript_0x1a5b5c: ; 0x1a5b5c ; 0x1a5b62 UnknownScript_0x1a5b62: ; 0x1a5b62 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a5b66 UnknownScript_0x1a5b66: ; 0x1a5b66 - jumpstd $001a + jumpstd asknumber2m end ; 0x1a5b6a UnknownScript_0x1a5b6a: ; 0x1a5b6a - jumpstd $001b + jumpstd registerednumberm end ; 0x1a5b6e UnknownScript_0x1a5b6e: ; 0x1a5b6e - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a5b72 UnknownScript_0x1a5b72: ; 0x1a5b72 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a5b76 UnknownScript_0x1a5b76: ; 0x1a5b76 - jumpstd $001e + jumpstd phonefullm end ; 0x1a5b7a UnknownScript_0x1a5b7a: ; 0x1a5b7a - jumpstd $0020 + jumpstd giftm end ; 0x1a5b7e UnknownScript_0x1a5b7e: ; 0x1a5b7e - jumpstd $0021 + jumpstd packfullm end ; 0x1a5b82 diff --git a/maps/Route42.asm b/maps/Route42.asm index 5432cf754..aa1e6c464 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -147,47 +147,47 @@ UnknownScript_0x1a92ee: ; 0x1a92ee ; 0x1a92f1 UnknownScript_0x1a92f1: ; 0x1a92f1 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a92f5 UnknownScript_0x1a92f5: ; 0x1a92f5 - jumpstd $001a + jumpstd asknumber2m end ; 0x1a92f9 UnknownScript_0x1a92f9: ; 0x1a92f9 - jumpstd $001b + jumpstd registerednumberm end ; 0x1a92fd UnknownScript_0x1a92fd: ; 0x1a92fd - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a9301 UnknownScript_0x1a9301: ; 0x1a9301 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a9305 UnknownScript_0x1a9305: ; 0x1a9305 - jumpstd $001e + jumpstd phonefullm end ; 0x1a9309 UnknownScript_0x1a9309: ; 0x1a9309 - jumpstd $001f + jumpstd rematchm end ; 0x1a930d UnknownScript_0x1a930d: ; 0x1a930d - jumpstd $0020 + jumpstd giftm end ; 0x1a9311 UnknownScript_0x1a9311: ; 0x1a9311 - jumpstd $0021 + jumpstd packfullm end ; 0x1a9315 diff --git a/maps/Route43.asm b/maps/Route43.asm index cab6a21b6..4fff2a264 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -181,37 +181,37 @@ UnknownScript_0x19d123: ; 0x19d123 ; 0x19d12c UnknownScript_0x19d12c: ; 0x19d12c - jumpstd $0019 + jumpstd asknumber1m end ; 0x19d130 UnknownScript_0x19d130: ; 0x19d130 - jumpstd $001a + jumpstd asknumber2m end ; 0x19d134 UnknownScript_0x19d134: ; 0x19d134 - jumpstd $001b + jumpstd registerednumberm end ; 0x19d138 UnknownScript_0x19d138: ; 0x19d138 - jumpstd $001c + jumpstd numberacceptedm end ; 0x19d13c UnknownScript_0x19d13c: ; 0x19d13c - jumpstd $001d + jumpstd numberdeclinedm end ; 0x19d140 UnknownScript_0x19d140: ; 0x19d140 - jumpstd $001e + jumpstd phonefullm end ; 0x19d144 UnknownScript_0x19d144: ; 0x19d144 - jumpstd $001f + jumpstd rematchm end ; 0x19d148 @@ -398,47 +398,47 @@ UnknownScript_0x19d233: ; 0x19d233 ; 0x19d239 UnknownScript_0x19d239: ; 0x19d239 - jumpstd $0023 + jumpstd asknumber1f end ; 0x19d23d UnknownScript_0x19d23d: ; 0x19d23d - jumpstd $0024 + jumpstd asknumber2f end ; 0x19d241 UnknownScript_0x19d241: ; 0x19d241 - jumpstd $0025 + jumpstd registerednumberf end ; 0x19d245 UnknownScript_0x19d245: ; 0x19d245 - jumpstd $0026 + jumpstd numberacceptedf end ; 0x19d249 UnknownScript_0x19d249: ; 0x19d249 - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x19d24d UnknownScript_0x19d24d: ; 0x19d24d - jumpstd $0028 + jumpstd phonefullf end ; 0x19d251 UnknownScript_0x19d251: ; 0x19d251 - jumpstd $0029 + jumpstd rematchf end ; 0x19d255 UnknownScript_0x19d255: ; 0x19d255 - jumpstd $002a + jumpstd giftf end ; 0x19d259 UnknownScript_0x19d259: ; 0x19d259 - jumpstd $002b + jumpstd packfullf end ; 0x19d25d diff --git a/maps/Route44.asm b/maps/Route44.asm index 84dc69365..843426475 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -117,58 +117,58 @@ UnknownScript_0x19d8cb: ; 0x19d8cb ; 0x19d8df UnknownScript_0x19d8df: ; 0x19d8df - jumpstd $0019 + jumpstd asknumber1m end ; 0x19d8e3 UnknownScript_0x19d8e3: ; 0x19d8e3 - jumpstd $001a + jumpstd asknumber2m end ; 0x19d8e7 UnknownScript_0x19d8e7: ; 0x19d8e7 - jumpstd $001b + jumpstd registerednumberm end ; 0x19d8eb UnknownScript_0x19d8eb: ; 0x19d8eb - jumpstd $001c + jumpstd numberacceptedm end ; 0x19d8ef UnknownScript_0x19d8ef: ; 0x19d8ef - jumpstd $001d + jumpstd numberdeclinedm end ; 0x19d8f3 UnknownScript_0x19d8f3: ; 0x19d8f3 - jumpstd $001e + jumpstd phonefullm end ; 0x19d8f7 UnknownScript_0x19d8f7: ; 0x19d8f7 - jumpstd $001f + jumpstd rematchm end ; 0x19d8fb UnknownScript_0x19d8fb: ; 0x19d8fb - jumpstd $0020 + jumpstd giftm end ; 0x19d8ff UnknownScript_0x19d8ff: ; 0x19d8ff - jumpstd $0021 + jumpstd packfullm end ; 0x19d903 UnknownScript_0x19d903: ; 0x19d903 setevent EVENT_VANCE_CARBOS - jumpstd $0021 + jumpstd packfullm end ; 0x19d90a UnknownScript_0x19d90a: ; 0x19d90a - jumpstd $0022 + jumpstd rematchgiftm end ; 0x19d90e diff --git a/maps/Route45.asm b/maps/Route45.asm index 4c3674fee..c1b486f7c 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -89,58 +89,58 @@ UnknownScript_0x19e118: ; 0x19e118 ; 0x19e11b UnknownScript_0x19e11b: ; 0x19e11b - jumpstd $0019 + jumpstd asknumber1m end ; 0x19e11f UnknownScript_0x19e11f: ; 0x19e11f - jumpstd $001a + jumpstd asknumber2m end ; 0x19e123 UnknownScript_0x19e123: ; 0x19e123 - jumpstd $001b + jumpstd registerednumberm end ; 0x19e127 UnknownScript_0x19e127: ; 0x19e127 - jumpstd $001c + jumpstd numberacceptedm end ; 0x19e12b UnknownScript_0x19e12b: ; 0x19e12b - jumpstd $001d + jumpstd numberdeclinedm end ; 0x19e12f UnknownScript_0x19e12f: ; 0x19e12f - jumpstd $001e + jumpstd phonefullm end ; 0x19e133 UnknownScript_0x19e133: ; 0x19e133 - jumpstd $001f + jumpstd rematchm end ; 0x19e137 UnknownScript_0x19e137: ; 0x19e137 - jumpstd $0020 + jumpstd giftm end ; 0x19e13b UnknownScript_0x19e13b: ; 0x19e13b - jumpstd $0021 + jumpstd packfullm end ; 0x19e13f UnknownScript_0x19e13f: ; 0x19e13f setevent EVENT_PARRY_IRON - jumpstd $0021 + jumpstd packfullm end ; 0x19e146 UnknownScript_0x19e146: ; 0x19e146 - jumpstd $0022 + jumpstd rematchgiftm end ; 0x19e14a diff --git a/maps/Route46.asm b/maps/Route46.asm index 5c0b83f6c..1c2b0464b 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -146,48 +146,48 @@ UnknownScript_0x1a973b: ; 0x1a973b ; 0x1a974f UnknownScript_0x1a974f: ; 0x1a974f - jumpstd $0023 + jumpstd asknumber1f end ; 0x1a9753 UnknownScript_0x1a9753: ; 0x1a9753 - jumpstd $0024 + jumpstd asknumber2f end ; 0x1a9757 UnknownScript_0x1a9757: ; 0x1a9757 - jumpstd $0025 + jumpstd registerednumberf end ; 0x1a975b UnknownScript_0x1a975b: ; 0x1a975b - jumpstd $0026 + jumpstd numberacceptedf end ; 0x1a975f UnknownScript_0x1a975f: ; 0x1a975f - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x1a9763 UnknownScript_0x1a9763: ; 0x1a9763 - jumpstd $0028 + jumpstd phonefullf end ; 0x1a9767 UnknownScript_0x1a9767: ; 0x1a9767 - jumpstd $0029 + jumpstd rematchf end ; 0x1a976b UnknownScript_0x1a976b: ; 0x1a976b setevent EVENT_ERIN_CALCIUM - jumpstd $002b + jumpstd packfullf end ; 0x1a9772 UnknownScript_0x1a9772: ; 0x1a9772 - jumpstd $002c + jumpstd rematchgiftf end ; 0x1a9776 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index a2012e97e..9a4b572f5 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -177,12 +177,12 @@ SaffronGymGuyScript: ; 0x189cbb MapSaffronGymSignpost0Script: ; 0x189ccf checkflag $0028 iftrue UnknownScript_0x189cd8 - jumpstd $002d + jumpstd gymstatue1 ; 0x189cd8 UnknownScript_0x189cd8: ; 0x189cd8 trainertotext SABRINA, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x189cdf UnknownText_0x189cdf: ; 0x189cdf diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 234f3a606..fc5d6d45a 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -151,12 +151,12 @@ MapVermilionGymSignpost14Script: ; 0x19212f MapVermilionGymSignpost16Script: ; 0x192132 checkflag $0025 iftrue UnknownScript_0x19213b - jumpstd $002d + jumpstd gymstatue1 ; 0x19213b UnknownScript_0x19213b: ; 0x19213b trainertotext LT_SURGE, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x192142 UnknownText_0x192142: ; 0x192142 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index e20387a74..6629bfd9c 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -59,11 +59,11 @@ UnknownScript_0x68418: ; 0x68418 ; 0x68421 UnknownScript_0x68421: ; 0x68421 - jumpstd $0012 + jumpstd goldenrodrockets ; 0x68424 UnknownScript_0x68424: ; 0x68424 - jumpstd $0013 + jumpstd radiotowerrockets ; 0x68427 TrainerBird_keeperRod: ; 0x68427 @@ -144,12 +144,12 @@ VioletGymGuyScript: ; 0x6844f MapVioletGymSignpost1Script: ; 0x68463 checkflag $001b iftrue UnknownScript_0x6846c - jumpstd $002d + jumpstd gymstatue1 ; 0x6846c UnknownScript_0x6846c: ; 0x6846c trainertotext FALKNER, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x68473 UnknownText_0x68473: ; 0x68473 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 89f610d0c..0a3b16cda 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -57,12 +57,12 @@ ViridianGymGuyScript: ; 0x9aa57 MapViridianGymSignpost1Script: ; 0x9aa6b checkflag $002a iftrue UnknownScript_0x9aa74 - jumpstd $002d + jumpstd gymstatue1 ; 0x9aa74 UnknownScript_0x9aa74: ; 0x9aa74 trainertotext BLUE, 1, $1 - jumpstd $002e + jumpstd gymstatue2 ; 0x9aa7b UnknownText_0x9aa7b: ; 0x9aa7b |