diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/celadonmartroof.asm | 2 | ||||
| -rwxr-xr-x | scripts/ceruleanhouse1.asm | 2 | ||||
| -rwxr-xr-x | scripts/ceruleanhousetrashed.asm | 2 | ||||
| -rwxr-xr-x | scripts/lab2.asm | 2 | ||||
| -rwxr-xr-x | scripts/lab4.asm | 4 | ||||
| -rwxr-xr-x | scripts/route11gateupstairs.asm | 2 | ||||
| -rwxr-xr-x | scripts/route18gateupstairs.asm | 2 | ||||
| -rwxr-xr-x | scripts/route2house.asm | 2 | ||||
| -rwxr-xr-x | scripts/undergroundpathentranceroute5.asm | 2 | ||||
| -rwxr-xr-x | scripts/vermilioncity.asm | 4 | ||||
| -rwxr-xr-x | scripts/vermilionhouse3.asm | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index fa34b8cd..d4bb4319 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -14,7 +14,7 @@ CeladonMartRoofScript_483d8: ; 483d8 (12:43d8) push de ld [wd11e], a ld b, a - predef IsItemInBag_ + predef IsItemInBag_ pop de pop hl ld a, b diff --git a/scripts/ceruleanhouse1.asm b/scripts/ceruleanhouse1.asm index 27a91ab5..ffc8656e 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 Predef54 jp TextScriptEnd diff --git a/scripts/ceruleanhousetrashed.asm b/scripts/ceruleanhousetrashed.asm index 02b40dcb..ee60cda7 100755 --- a/scripts/ceruleanhousetrashed.asm +++ b/scripts/ceruleanhousetrashed.asm @@ -10,7 +10,7 @@ CeruleanHouseTrashedTextPointers: ; 1d689 (7:5689) CeruleanHouseTrashedText1: ; 1d68f (7:568f) db $08 ; asm ld b, $e4 - predef IsItemInBag_ + predef IsItemInBag_ and b jr z, .asm_f8734 ; 0x1d698 ld hl, CeruleanHouseTrashedText_1d6b0 diff --git a/scripts/lab2.asm b/scripts/lab2.asm index 4075f737..583ef4e4 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 Predef54 jp TextScriptEnd diff --git a/scripts/lab4.asm b/scripts/lab4.asm index c2d8d304..924a6637 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -20,7 +20,7 @@ Lab4Script_75d38: ; 75d38 (1d:5d38) push de ld [wd11e], a ld b, a - predef IsItemInBag_ + predef IsItemInBag_ pop de pop hl ld a, b @@ -108,7 +108,7 @@ Lab4Text2: ; 75dda (1d:5dda) db $08 ; asm ld a, $3 ld [wWhichTrade], a - predef Predef54 + predef Predef54 jp TextScriptEnd LoadFossilItemAndMonNameBank1D: ; 75de8 (1d:5de8) diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm index 5c0cc574..8b756681 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 Predef54 asm_49469: ; 49469 (12:5469) jp TextScriptEnd diff --git a/scripts/route18gateupstairs.asm b/scripts/route18gateupstairs.asm index 9db16aeb..7ef0461d 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 Predef54 jp TextScriptEnd Route18GateUpstairsText2: ; 4998c (12:598c) diff --git a/scripts/route2house.asm b/scripts/route2house.asm index 75da399b..e9b30b07 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 Predef54 jp TextScriptEnd diff --git a/scripts/undergroundpathentranceroute5.asm b/scripts/undergroundpathentranceroute5.asm index 1fb62f48..dc1748f2 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 Predef54 ld hl, UndergroundPathEntranceRoute5_5d6af ret diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 5309c7f6..1214b27c 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -55,7 +55,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) bit 2, a jr nz, .asm_19810 ; 0x19804 $a ld b, $3f - predef IsItemInBag_ + predef IsItemInBag_ ld a, b and a ret nz @@ -175,7 +175,7 @@ VermilionCityText3: ; 198b1 (6:58b1) ld hl, SSAnneWelcomeText9 call PrintText ld b, S_S__TICKET - predef IsItemInBag_ + predef IsItemInBag_ ld a, b and a jr nz, .asm_0419b ; 0x198df diff --git a/scripts/vermilionhouse3.asm b/scripts/vermilionhouse3.asm index 7b4e95fd..af9d2430 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 Predef54 jp TextScriptEnd |