diff options
Diffstat (limited to 'scripts')
25 files changed, 31 insertions, 31 deletions
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 3e7b994e..91d6742d 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -20,7 +20,7 @@ CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) srl a srl a srl a - ld [wcd05], a + ld [wUnknownSlotVar], a ret CeladonGameCornerScript_48bec: ; 48bec (12:4bec) diff --git a/scripts/celadonpokecenter.asm b/scripts/celadonpokecenter.asm index e7bfd1d2..1b8d3a1b 100755 --- a/scripts/celadonpokecenter.asm +++ b/scripts/celadonpokecenter.asm @@ -1,5 +1,5 @@ CeladonPokecenterScript: ; 488b8 (12:48b8) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing CeladonPokecenterTextPointers: ; 488be (12:48be) diff --git a/scripts/ceruleanhouse1.asm b/scripts/ceruleanhouse1.asm index ffc8656e..4b6a240a 100755 --- a/scripts/ceruleanhouse1.asm +++ b/scripts/ceruleanhouse1.asm @@ -13,5 +13,5 @@ CeruleanHouse1Text2: ; 1d702 (7:5702) db $08 ; asm ld a, $6 ld [wWhichTrade], a - predef Predef54 + predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/ceruleanpokecenter.asm b/scripts/ceruleanpokecenter.asm index b6f88b41..5d888317 100755 --- a/scripts/ceruleanpokecenter.asm +++ b/scripts/ceruleanpokecenter.asm @@ -1,5 +1,5 @@ CeruleanPokecenterScript: ; 5c645 (17:4645) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing CeruleanPokecenterTextPointers: ; 5c64b (17:464b) diff --git a/scripts/cinnabarpokecenter.asm b/scripts/cinnabarpokecenter.asm index a2a41592..abae9d8d 100755 --- a/scripts/cinnabarpokecenter.asm +++ b/scripts/cinnabarpokecenter.asm @@ -1,5 +1,5 @@ CinnabarPokecenterScript: ; 75e2c (1d:5e2c) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing CinnabarPokecenterTextPointers: ; 75e32 (1d:5e32) diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 3190ba0a..1830d2c0 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -129,7 +129,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld hl, DayCareMText_56428 call PrintText ld a, $13 - ld [wd125], a + ld [wTextBoxID], a call DisplayTextBoxID call YesNoChoice ld hl, DayCareMText_56437 @@ -159,7 +159,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld a, (SFX_02_5a - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent ld a, $13 - ld [wd125], a + ld [wTextBoxID], a call DisplayTextBoxID ld hl, DayCareMText_5644f call PrintText diff --git a/scripts/fuchsiapokecenter.asm b/scripts/fuchsiapokecenter.asm index 621a483f..26f88844 100755 --- a/scripts/fuchsiapokecenter.asm +++ b/scripts/fuchsiapokecenter.asm @@ -1,5 +1,5 @@ FuchsiaPokecenterScript: ; 75063 (1d:5063) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing FuchsiaPokecenterTextPointers: ; 75069 (1d:5069) diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index 96221c97..1b09a61d 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -1,5 +1,5 @@ IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing ld hl, wd126 bit 6, [hl] diff --git a/scripts/lab2.asm b/scripts/lab2.asm index 583ef4e4..9839a563 100755 --- a/scripts/lab2.asm +++ b/scripts/lab2.asm @@ -21,5 +21,5 @@ Lab2Text3: ; 75c37 (1d:5c37) ld a, $8 ld [wWhichTrade], a asm_78552: ; 75c3d (1d:5c3d) - predef Predef54 + predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/lab4.asm b/scripts/lab4.asm index 924a6637..1e818676 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -108,7 +108,7 @@ Lab4Text2: ; 75dda (1d:5dda) db $08 ; asm ld a, $3 ld [wWhichTrade], a - predef Predef54 + predef DoInGameTradeDialogue jp TextScriptEnd LoadFossilItemAndMonNameBank1D: ; 75de8 (1d:5de8) diff --git a/scripts/lavenderpokecenter.asm b/scripts/lavenderpokecenter.asm index 31a50aef..452cc8a4 100755 --- a/scripts/lavenderpokecenter.asm +++ b/scripts/lavenderpokecenter.asm @@ -1,5 +1,5 @@ LavenderPokecenterScript: ; 5c8da (17:48da) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing LavenderPokecenterTextPointers: ; 5c8e0 (17:48e0) diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index 94054561..bfe9add8 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -1,5 +1,5 @@ MtMoonPokecenterScript: ; 492cf (12:52cf) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing MtMoonPokecenterTextPointers: ; 492d5 (12:52d5) @@ -29,7 +29,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) ld hl, MtMoonPokecenterText_4935c call PrintText ld a, $13 - ld [wd125], a + ld [wTextBoxID], a call DisplayTextBoxID call YesNoChoice ld a, [wCurrentMenuItem] @@ -57,7 +57,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) ld c, $3 predef SubBCDPredef ld a, $13 - ld [wd125], a + ld [wTextBoxID], a call DisplayTextBoxID ld hl, wd7c6 set 7, [hl] diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index cbb3bb67..cd2b3c29 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -70,7 +70,7 @@ Museum1FText1: ; 5c135 (17:4135) jp asm_d1145 .asm_3ded4 ld a, $13 - ld [wd125], a + ld [wTextBoxID], a call DisplayTextBoxID xor a ld [hJoyHeld], a @@ -105,7 +105,7 @@ Museum1FText1: ; 5c135 (17:4135) ld c, $3 predef SubBCDPredef ld a, $13 - ld [wd125], a + ld [wTextBoxID], a call DisplayTextBoxID ld a, (SFX_02_5a - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 2f4fd7af..1f3cabe0 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -1,5 +1,5 @@ PewterPokecenterScript: ; 5c587 (17:4587) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing PewterPokecenterTextPointers: ; 5c58d (17:458d) diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/rocktunnelpokecenter.asm index 62336edc..5e822bca 100755 --- a/scripts/rocktunnelpokecenter.asm +++ b/scripts/rocktunnelpokecenter.asm @@ -1,5 +1,5 @@ RockTunnelPokecenterScript: ; 493ba (12:53ba) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing RockTunnelPokecenterTextPointers: ; 493c0 (12:53c0) diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm index 8b756681..d8740986 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/route11gateupstairs.asm @@ -11,7 +11,7 @@ Route11GateUpstairsText1: ; 4945f (12:545f) db $08 ; asm xor a ld [wWhichTrade], a - predef Predef54 + predef DoInGameTradeDialogue asm_49469: ; 49469 (12:5469) jp TextScriptEnd diff --git a/scripts/route18gateupstairs.asm b/scripts/route18gateupstairs.asm index 7ef0461d..aaa1b34e 100755 --- a/scripts/route18gateupstairs.asm +++ b/scripts/route18gateupstairs.asm @@ -10,7 +10,7 @@ Route18GateUpstairsText1: ; 4997e (12:597e) db $08 ; asm ld a, $5 ld [wWhichTrade], a - predef Predef54 + predef DoInGameTradeDialogue jp TextScriptEnd Route18GateUpstairsText2: ; 4998c (12:598c) diff --git a/scripts/route2house.asm b/scripts/route2house.asm index e9b30b07..ba13605b 100755 --- a/scripts/route2house.asm +++ b/scripts/route2house.asm @@ -13,5 +13,5 @@ Route2HouseText2: ; 1def9 (7:5ef9) db $08 ; asm ld a, $1 ld [wWhichTrade], a - predef Predef54 + predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm index 1f1b6c23..c4343095 100644 --- a/scripts/safarizoneentrance-yellow.asm +++ b/scripts/safarizoneentrance-yellow.asm @@ -2,7 +2,7 @@ ld hl,.ForJust500Text call PrintText ld a,$13 - ld [wd125],a + ld [wTextBoxID],a call DisplayTextBoxID call YesNoChoice ld a,[wCurrentMenuItem] @@ -49,7 +49,7 @@ call $3736 call $373e ld a,$13 - ld [wd125],a + ld [wTextBoxID],a call DisplayTextBoxID ld hl,.MakePaymentText call PrintText diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index e5653ff1..294dcf58 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -148,7 +148,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) TX_FAR SafariZoneEntranceText_9e6e4 ; 0x9e6e4 db $8 ld a, $13 - ld [wd125],a + ld [wTextBoxID],a call DisplayTextBoxID call YesNoChoice ld a,[wCurrentMenuItem] @@ -178,7 +178,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) ld c,3 predef SubBCDPredef ld a,$13 - ld [wd125],a + ld [wTextBoxID],a call DisplayTextBoxID ld hl,.MakePaymentText call PrintText diff --git a/scripts/saffronpokecenter.asm b/scripts/saffronpokecenter.asm index 7f3a656a..8f569a8e 100755 --- a/scripts/saffronpokecenter.asm +++ b/scripts/saffronpokecenter.asm @@ -1,5 +1,5 @@ SaffronPokecenterScript: ; 5d535 (17:5535) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing SaffronPokecenterTextPointers: ; 5d53b (17:553b) diff --git a/scripts/undergroundpathentranceroute5.asm b/scripts/undergroundpathentranceroute5.asm index dc1748f2..03f1c35d 100755 --- a/scripts/undergroundpathentranceroute5.asm +++ b/scripts/undergroundpathentranceroute5.asm @@ -13,6 +13,6 @@ UndergroundPathEntranceRoute5Text1: ; 5d6b2 (17:56b2) db $08 ; asm ld a, $9 ld [wWhichTrade], a - predef Predef54 + predef DoInGameTradeDialogue ld hl, UndergroundPathEntranceRoute5_5d6af ret diff --git a/scripts/vermilionhouse3.asm b/scripts/vermilionhouse3.asm index af9d2430..08e2e395 100755 --- a/scripts/vermilionhouse3.asm +++ b/scripts/vermilionhouse3.asm @@ -8,5 +8,5 @@ VermilionHouse3Text1: ; 19c17 (6:5c17) db $08 ; asm ld a, $4 ld [wWhichTrade], a - predef Predef54 + predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/vermilionpokecenter.asm b/scripts/vermilionpokecenter.asm index 00d139f5..6e85b3e3 100755 --- a/scripts/vermilionpokecenter.asm +++ b/scripts/vermilionpokecenter.asm @@ -1,5 +1,5 @@ VermilionPokecenterScript: ; 5c98f (17:498f) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing VermilionPokecenterTextPointers: ; 5c995 (17:4995) diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm index 08371ce3..ae5e32c8 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/viridianpokecenter.asm @@ -1,5 +1,5 @@ ViridianPokeCenterScript: ; 4425d (11:425d) - call Func_22fa + call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing ViridianPokecenterTextPointers: ; 44263 (11:4263) |