Use macros for predef calls/jumps instead of static ids.

2026-04-01 00:59:35 +13:00 · 2014-06-16 13:57:26 -07:00 · 2014-06-16 13:57:26 -07:00 · b36f793667
commit b36f793667
parent d10108a066
122 changed files with 360 additions and 719 deletions
--- a/scripts/agatha.asm
+++ b/scripts/agatha.asm
@ -24,8 +24,7 @@ AgathaScript_76443: ; 76443 (1d:6443)
 AgathaScript_76459: ; 76459 (1d:6459)
 	ld [wd09f], a
 	ld bc, $2
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 AgathaScript_76464: ; 76464 (1d:6464)
 	xor a
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@ -41,8 +41,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6)
 	ret nz
 	ld a, $61
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld hl, wd7f2
 	set 6, [hl]
 	xor a
@ -70,8 +69,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
 	call Func_32f9
 	ld a, $62
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld c, $8
 	call DelayFrames
 	ld a, $2
@ -165,12 +163,10 @@ BillsHouseText2: ; 1e874 (7:6874)
 	set 4, [hl]
 	ld a, $7
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld a, $9
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 .asm_5491f ; 0x1e8a9
 	ld hl, BillsHouseText_1e8cb
 	call PrintText
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@ -44,8 +44,7 @@ BluesHouseText1: ; 19b5d (6:5b5d)
 	jr nc, .BagFull
 	ld a,$29
 	ld [wcc4d],a
-	ld a,$11
-	call Predef ; hide table map object
+	predef HideObject ; hide table map object
 	ld hl,GotMapText
 	call PrintText
 	ld hl,wd74a
--- a/scripts/bruno.asm
+++ b/scripts/bruno.asm
@ -24,8 +24,7 @@ BrunoScript_762ec: ; 762ec (1d:62ec)
 BrunoScript_76302: ; 76302 (1d:6302)
 	ld [wd09f], a
 	ld bc, $2
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 BrunoScript_7630d: ; 7630d (1d:630d)
 	xor a
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@ -34,8 +34,7 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec)
 	ld a, $2a
 	ld [wd09f], a
 	ld bc, $0208
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 CeladonGameCornerScript_48c07: ; 48c07 (12:4c07)
 	xor a
@ -97,8 +96,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69)
 	ld [wJoyIgnore], a
 	ld a, $46
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld hl, wd126
 	set 5, [hl]
 	set 6, [hl]
@ -157,8 +155,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9)
 	ld hl, $ffa1
 	ld de, wPlayerMoney + 2
 	ld c, $3
-	ld a, $c ; SubBCDPredef
-	call Predef
+	predef SubBCDPredef
 	xor a
 	ldh [$9f], a
 	ldh [$a0], a
@ -167,8 +164,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9)
 	ld de, wPlayerCoins + 1
 	ld hl, $ffa1
 	ld c, $2
-	ld a, $b ; AddBCDPredef
-	call Predef
+	predef AddBCDPredef
 	call CeladonGameCornerScript_48f1e
 	ld hl, CeladonGameCornerText_48d27
 	jr .asm_e2afd ; 0x48d0d
@ -236,8 +232,7 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a)
 	ld de, wPlayerCoins + 1
 	ld hl, $ffa1
 	ld c, $2
-	ld a, $b ; AddBCDPredef
-	call Predef
+	predef AddBCDPredef
 	ld hl, wd77e
 	set 2, [hl]
 	ld a, $1
@ -319,8 +314,7 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9)
 	ld de, wPlayerCoins + 1
 	ld hl, $ffa1
 	ld c, $2
-	ld a, $b ; AddBCDPredef
-	call Predef
+	predef AddBCDPredef
 	ld hl, wd77e
 	set 4, [hl]
 	ld hl, Received20CoinsText
@ -373,8 +367,7 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b)
 	ld de, wPlayerCoins + 1
 	ld hl, $ffa1
 	ld c, $2
-	ld a, $b ; AddBCDPredef
-	call Predef
+	predef AddBCDPredef
 	ld hl, wd77e
 	set 3, [hl]
 	ld hl, CeladonGameCornerText_48e8d
@ -456,8 +449,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd)
 	ld a, $43
 	ld [wd09f], a
 	ld bc, $0208
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	jp TextScriptEnd

 CeladonGameCornerText_48f09: ; 48f09 (12:4f09)
--- a/scripts/celadonmansion5.asm
+++ b/scripts/celadonmansion5.asm
@ -16,7 +16,6 @@ CeladonMansion5Text2: ; 1dd46 (7:5d46)
 	jr nc, .asm_24365 ; 0x1dd4d
 	ld a, $45
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 .asm_24365 ; 0x1dd59
 	jp TextScriptEnd
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/celadonmartelevator.asm
@ -66,6 +66,5 @@ CeladonMartElevatorText1: ; 4865e (12:465e)
 	db $08 ; asm
 	call CeladonMartElevatorScript_48631
 	ld hl, CeldaonMartElevatorWarpMaps ; $464a
-	ld a, $61
-	call Predef
+	predef Func_1c9c6
 	jp TextScriptEnd
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@ -14,8 +14,7 @@ CeladonMartRoofScript_483d8: ; 483d8 (12:43d8)
 	push de
 	ld [wd11e], a
 	ld b, a
-	ld a, $1c
-	call Predef
+	predef IsItemInBag_ 
 	pop de
 	pop hl
 	ld a, b
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@ -10,8 +10,7 @@ CeruleanCityScript_1948c: ; 1948c (6:548c)
 	ld [W_CERULEANCITYCURSCRIPT], a
 	ld a, $5
 	ld [wcc4d], a
-	ld a, $11
-	jp Predef
+	predef_jump HideObject

 CeruleanCityScriptPointers: ; 1949d (6:549d)
 	dw CeruleanCityScript0
@ -91,8 +90,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
 .asm_19535
 	ld a, $5
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld de, CeruleanCityMovement1
 	ld a, $1
 	ld [$ff8c], a
@ -208,8 +206,7 @@ CeruleanCityScript3: ; 19610 (6:5610)
 	ret nz
 	ld a, $5
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
 	call Func_2307
--- a/scripts/ceruleancity2.asm
+++ b/scripts/ceruleancity2.asm
@ -5,15 +5,12 @@ Func_74872: ; 74872 (1d:4872)
 	call GBFadeIn1
 	ld a, $07
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld a, $09
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $06
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	call GBFadeOut1
 	ret
--- a/scripts/ceruleanhouse1.asm
+++ b/scripts/ceruleanhouse1.asm
@ -13,6 +13,5 @@ CeruleanHouse1Text2: ; 1d702 (7:5702)
 	db $08 ; asm
 	ld a, $6
 	ld [wWhichTrade], a
-	ld a, $54
-	call Predef
+	predef Predef54 
 	jp TextScriptEnd
--- a/scripts/ceruleanhousetrashed.asm
+++ b/scripts/ceruleanhousetrashed.asm
@ -10,8 +10,7 @@ CeruleanHouseTrashedTextPointers: ; 1d689 (7:5689)
 CeruleanHouseTrashedText1: ; 1d68f (7:568f)
 	db $08 ; asm
 	ld b, $e4
-	ld a, $1c
-	call Predef
+	predef IsItemInBag_ 
 	and b
 	jr z, .asm_f8734 ; 0x1d698
 	ld hl, CeruleanHouseTrashedText_1d6b0
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@ -87,8 +87,7 @@ CinnabarGymScript1: ; 757dc (1d:57dc)
 	jp DisplayTextID

 CinnabarGymScript_757f1: ; 757f1 (1d:57f1)
-	ld a, $10 ; FlagActionPredef
-	jp Predef
+	predef_jump FlagActionPredef

 CinnabarGymScript2: ; 757f6 (1d:57f6)
 	ld a, [W_ISINBATTLE]
--- a/scripts/daycarem.asm
+++ b/scripts/daycarem.asm
@ -120,8 +120,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
 	push hl
 	push de
 	push bc
-	ld a, $b ; AddBCDPredef
-	call Predef
+	predef AddBCDPredef
 	pop bc
 	pop de
 	pop hl
@ -156,8 +155,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
 	inc hl
 	ld de, wPlayerMoney + 2
 	ld c, $3
-	ld a, $c ; SubBCDPredef
-	call Predef
+	predef SubBCDPredef
 	ld a, (SFX_02_5a - SFX_Headers_02) / 3
 	call PlaySoundWaitForCurrent
 	ld a, $13
@ -181,8 +179,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
 	ld e, l
 	ld a, $1
 	ld [wHPBarMaxHP], a
-	ld a, $3e
-	call Predef
+	predef WriteMonMoves
 	pop bc
 	pop af
 	ld hl, wPartyMon1HP
--- a/scripts/fightingdojo.asm
+++ b/scripts/fightingdojo.asm
@ -281,8 +281,7 @@ FightingDojoText6: ; 5cf06 (17:4f06)
 	; once Poké Ball is taken, hide sprite
 	ld a, $4a
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld hl, wd7b1
 	set 6, [hl]
 	set 0, [hl]
@ -323,8 +322,7 @@ FightingDojoText7: ; 5cf4e (17:4f4e)
 	; once Poké Ball is taken, hide sprite
 	ld a, $4b
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 .done
 	jp TextScriptEnd

--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@ -122,8 +122,7 @@ GaryScript4: ; 75fe4 (1d:5fe4)
 	call MoveSprite
 	ld a, $d6
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld a, $5
 	ld [W_GARYCURSCRIPT], a
 	ret
@ -193,8 +192,7 @@ GaryScript8: ; 76083 (1d:6083)
 	ret nz
 	ld a, $d6
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $9
 	ld [W_GARYCURSCRIPT], a
 	ret
--- a/scripts/halloffameroom.asm
+++ b/scripts/halloffameroom.asm
@ -25,8 +25,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
 	push af
 	xor a
 	ld [wJoyIgnore], a
-	ld a, $55
-	call Predef
+	predef HallOfFamePC
 	pop af
 	ld [wd358], a
 	ld hl, W_FLAGS_D733
@ -101,8 +100,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
 	ld [wJoyIgnore], a
 	ld a, $8
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $2
 	ld [W_HALLOFFAMEROOMCURSCRIPT], a
 	ret
--- a/scripts/lab2.asm
+++ b/scripts/lab2.asm
@ -21,6 +21,5 @@ Lab2Text3: ; 75c37 (1d:5c37)
 	ld a, $8
 	ld [wWhichTrade], a
 asm_78552: ; 75c3d (1d:5c3d)
-	ld a, $54
-	call Predef
+	predef Predef54 
 	jp TextScriptEnd
--- a/scripts/lab4.asm
+++ b/scripts/lab4.asm
@ -18,8 +18,7 @@ Lab4Script_75d38: ; 75d38 (1d:5d38)
 	push de
 	ld [wd11e], a
 	ld b, a
-	ld a, $1c
-	call Predef
+	predef IsItemInBag_ 
 	pop de
 	pop hl
 	ld a, b
@ -105,8 +104,7 @@ Lab4Text2: ; 75dda (1d:5dda)
 	db $08 ; asm
 	ld a, $3
 	ld [wWhichTrade], a
-	ld a, $54
-	call Predef
+	predef Predef54 
 	jp TextScriptEnd

 LoadFossilItemAndMonNameBank1D: ; 75de8 (1d:5de8)
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@ -34,8 +34,7 @@ LanceScript_5a2de: ; 5a2de (16:62de)
 	ld bc, $603

 LanceScript_5a2f0: ; 5a2f0 (16:62f0)
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 LanceScript_5a2f5: ; 5a2f5 (16:62f5)
 	xor a
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@ -25,8 +25,7 @@ LoreleiScript_76191: ; 76191 (1d:6191)
 .asm_761ab
 	ld [wd09f], a
 	ld bc, $2
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 LoreleiScript_761b6: ; 761b6 (1d:61b6)
 	xor a
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@ -43,8 +43,7 @@ Mansion1Script_4430b: ; 4430b (11:430b)
 	ld a, $e
 	ld [wd09f], a
 asm_44310: ; 44310 (11:4310)
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	ret

 Mansion1Script_Switches: ; 44316 (11:4316)
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@ -40,8 +40,7 @@ Mansion2Script_51fee: ; 51fee (14:5fee)

 Mansion2Script_5202f: ; 5202f (14:602f)
 	ld [wd09f], a
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 Mansion2Script_Switches: ; 52037 (14:6037)
 	ld a, [wSpriteStateData1 + 9]
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@ -151,8 +151,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb)
 	ld a, $6d
 .asm_49e1f
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
@ -284,8 +283,7 @@ MtMoon3Text6: ; 49ee9 (12:5ee9)
 	call MtMoon3Script_49f69
 	ld a, $6d
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld hl, wd7f6
 	set 6, [hl]
 	ld a, $4
@ -314,8 +312,7 @@ MtMoon3Text7: ; 49f29 (12:5f29)
 	call MtMoon3Script_49f69
 	ld a, $6e
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld hl, wd7f6
 	set 7, [hl]
 	ld a, $4
--- a/scripts/mtmoonpokecenter.asm
+++ b/scripts/mtmoonpokecenter.asm
@ -55,8 +55,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
 	ld hl, wTrainerFacingDirection
 	ld de, wPlayerMoney + 2
 	ld c, $3
-	ld a, $c ; SubBCDPredef
-	call Predef
+	predef SubBCDPredef
 	ld a, $13
 	ld [wd125], a
 	call DisplayTextBoxID
--- a/scripts/museum1f.asm
+++ b/scripts/museum1f.asm
@ -103,8 +103,7 @@ Museum1FText1: ; 5c135 (17:4135)
 	ld hl, wTrainerFacingDirection
 	ld de, wPlayerMoney + 2
 	ld c, $3
-	ld a, $c ; SubBCDPredef
-	call Predef
+	predef SubBCDPredef
 	ld a, $13
 	ld [wd125], a
 	call DisplayTextBoxID
@ -203,8 +202,7 @@ Museum1FText3: ; 5c256 (17:4256)
 	set 1, [hl]
 	ld a, $34
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld hl, ReceivedOldAmberText
 	jr .asm_52e0f ; 0x5c27e
 .BagFull
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@ -40,8 +40,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e)
 	ret nz
 	ld a, $31
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld hl, wd72e
 	res 4, [hl]

@ -68,12 +67,10 @@ OaksLabScript2: ; 1cb82 (7:4b82)
 	ret nz
 	ld a, $31
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $2e
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject

 	ld a, $3
 	ld [W_OAKSLABCURSCRIPT], a
@ -294,8 +291,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
 	ld a, $2d
 .asm_1cd32
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	call Delay3
 	ld a, [wWhichTrade]
 	ld [W_RIVALSTARTER], a
@ -341,13 +337,11 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
 	ld a, $1
 	swap a
 	ld [$ff95], a
-	ld a, $22
-	call Predef
+	predef Func_f929
 	ld a, [$ff95]
 	dec a
 	ld [$ff95], a
-	ld a, $20
-	call Predef
+	predef Func_f8ba
 	ld de, wcc97
 	ld a, $1
 	ld [$ff8c], a
@ -410,8 +404,7 @@ OaksLabScript12: ; 1ce03 (7:4e03)
 	xor a
 	ld [$ff8d], a
 	call Func_34a6 ; face object
-	ld a, $7
-	call Predef
+	predef HealParty
 	ld hl, wd74b
 	set 3, [hl]

@ -454,8 +447,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
 	jr nz, .asm_1ce8c ; 0x1ce72 $18
 	ld a, $2a
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
 	call Func_2307 ; reset to map music
@ -498,8 +490,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
 	call OaksLabScript_1d02b
 	ld a, $2a
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld a, [wcd37]
 	ld [wd157], a
 	ld b, $0
@ -558,12 +549,10 @@ OaksLabScript16: ; 1cf12 (7:4f12)
 	call Delay3
 	ld a, $2f
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $30
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	call OaksLabScript_1cefd
 	ld a, $1a
 	ld [$ff8c], a
@ -583,12 +572,10 @@ OaksLabScript16: ; 1cf12 (7:4f12)
 	set 0, [hl]
 	ld a, $1
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $2
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld a, [wd157]
 	ld b, $0
 	ld c, a
@ -616,16 +603,14 @@ OaksLabScript17: ; 1cfd4 (7:4fd4)
 	call Func_2307
 	ld a, $2a
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld hl, wd7eb
 	set 0, [hl]
 	res 1, [hl]
 	set 7, [hl]
 	ld a, $22
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld a, $5
 	ld [W_PALLETTOWNCURSCRIPT], a
 	xor a
@ -846,8 +831,7 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
 	ld [hl], $c
 	ld hl, wd730
 	set 6, [hl]
-	ld a, $46
-	call Predef ; StarterDex
+	predef StarterDex  ; StarterDex
 	ld hl, wd730
 	res 6, [hl]
 	call ReloadMapData
@ -907,8 +891,7 @@ asm_1d1e3: ; 1d1e3 (7:51e3)
 	ld a, $2d
 asm_1d1e5: ; 1d1e5 (7:51e5)
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $1
 	ld [wcc3c], a
 	ld hl, OaksLabMonEnergeticText
@ -974,8 +957,7 @@ OaksLabText5: ; 1d248 (7:5248)
 	call PrintText
 	ld a, $1
 	ld [wcc3c], a
-	ld a, $56
-	call Predef
+	predef DisplayDexRating
 	jp .asm_0f042
 .asm_b28b0 ; 0x1d279
 	ld b,POKE_BALL
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@ -56,8 +56,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2)
 	ld [wJoyIgnore],a
 	ld a,0
 	ld [wcc4d],a
-	ld a,$15
-	call Predef
+	predef ShowObject

 	; trigger the next script
 	ld a,2
@ -78,12 +77,10 @@ PalletTownScript2: ; 18ed2 (6:4ed2)
 	ld a,1
 	swap a
 	ld [$FF95],a
-	ld a,$22
-	call Predef
+	predef Func_f929
 	ld hl,$FF95
 	dec [hl]
-	ld a,$20
-	call Predef ; load Oak’s movement into wcc97
+	predef Func_f8ba ; load Oak’s movement into wcc97
 	ld de,wcc97
 	ld a,1 ; oak
 	ld [$FF8C],a
@ -146,12 +143,10 @@ PalletTownScript5: ; 18f56 (6:4f56)
 	set 2,[hl]
 	ld a,$27
 	ld [wcc4d],a
-	ld a,$11
-	call Predef
+	predef HideObject
 	ld a,$28
 	ld [wcc4d],a
-	ld a,$15
-	jp Predef
+	predef_jump ShowObject
 .next
 	ld a,[wd74b]
 	bit 4,a
@ -193,8 +188,7 @@ OakAppearsText: ; 18fb0 (6:4fb0)
 	xor a
 	ld [wcd4f],a
 	ld [wcd50],a
-	ld a,$4C
-	call Predef ; display ! over head
+	predef EmotionBubble ; display ! over head
 	ld a,4
 	ld [wd528],a
 	jp TextScriptEnd
--- a/scripts/pewtercity.asm
+++ b/scripts/pewtercity.asm
@ -87,8 +87,7 @@ PewterCityScript2: ; 192d3 (6:52d3)
 	ret nz
 	ld a, $3
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $3
 	ld [W_PEWTERCITYCURSCRIPT], a
 	ret
@ -99,8 +98,7 @@ PewterCityScript3: ; 192e9 (6:52e9)
 	call Func_32fe
 	ld a, $3
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
@ -153,8 +151,7 @@ PewterCityScript5: ; 19359 (6:5359)
 	ret nz
 	ld a, $4
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $6
 	ld [W_PEWTERCITYCURSCRIPT], a
 	ret
@ -165,8 +162,7 @@ PewterCityScript6: ; 1936f (6:536f)
 	call Func_32fe
 	ld a, $4
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@ -69,12 +69,10 @@ PewterGymScript_5c3df: ; 5c3df (17:43df)

 	ld a, $4
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $22
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject

 	ld hl, wd7eb
 	res 0, [hl]
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@ -101,8 +101,7 @@ PokemonTower2Script2: ; 605bb (18:45bb)
 	ret nz
 	ld a, $38
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
 	call Func_2307
--- a/scripts/pokemontower5.asm
+++ b/scripts/pokemontower5.asm
@ -32,8 +32,7 @@ PokemonTower5Script0: ; 6094b (18:494b)
 	ld [wJoyIgnore], a
 	ld hl, wd72e
 	set 4, [hl]
-	ld a, $7
-	call Predef
+	predef HealParty
 	call GBFadeOut2
 	call Delay3
 	call Delay3
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@ -52,8 +52,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
 	ld a, [hli]
 	jr nz, .missableObjectsListLoop
 	ld [wcc4d], a   ; remove missable object
-	ld a, $11
-	call Predef
+	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
 	ld [wcf13], a
@ -69,8 +68,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
 	ld [wJoyIgnore], a
 	ld a, $43
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $4
 	ld [wSpriteStateData1 + 9], a
 	ld a, $95
@ -226,16 +224,13 @@ PokemonTower7Text4: ; 60e8a (18:4e8a)
 	set 7, [hl]
 	ld a, $44
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld a, $17
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $18
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld a, $4
 	ld [W_POKEMONTOWER7CURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
--- a/scripts/rockethideout1.asm
+++ b/scripts/rockethideout1.asm
@ -30,8 +30,7 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0)
 .asm_44c03
 	ld [wd09f], a
 	ld bc, $080c
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 RocketHideout1ScriptPointers: ; 44c0e (11:4c0e)
 	dw CheckFightingMapTrainers
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@ -31,8 +31,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473)
 .asm_45498
 	ld [wd09f], a
 	ld bc, $050c
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 RocketHideout4Script_454a3: ; 454a3 (11:54a3)
 	xor a
@ -62,12 +61,10 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
 	call GBFadeIn1
 	ld a, $83
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $87
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	call UpdateSprites
 	call GBFadeOut1
 	xor a
@ -222,8 +219,7 @@ RocketHideout4AfterBattleText4: ; 455cf (11:55cf)
 	jr nz, .asm_455e9 ; 0x455dd $a
 	ld a, $88
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 .asm_455e9
 	jp TextScriptEnd

--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/rockethideoutelevator.asm
@ -68,8 +68,7 @@ RocketHideoutElevatorText1: ; 4576d (11:576d)
 	jr z, .asm_8d8f0 ; 0x45773
 	call RocketHideoutElevatorScript_45741
 	ld hl, RocketHideoutElevatorWarpMaps ; $5759
-	ld a, $61
-	call Predef
+	predef Func_1c9c6
 	jr .asm_46c43 ; 0x45780
 .asm_8d8f0 ; 0x45782
 	ld hl, RocketHideoutElevatorText_4578b
--- a/scripts/route11gateupstairs.asm
+++ b/scripts/route11gateupstairs.asm
@ -11,8 +11,7 @@ Route11GateUpstairsText1: ; 4945f (12:545f)
 	db $08 ; asm
 	xor a
 	ld [wWhichTrade], a
-	ld a, $54
-	call Predef
+	predef Predef54 
 asm_49469: ; 49469 (12:5469)
 	jp TextScriptEnd

@ -32,8 +31,7 @@ Route11GateUpstairsText2: ; 4946c (12:546c)
 	ld de, wcc5b
 	ld bc, $000d
 	call CopyData
-	ld a, $62
-	call Predef ; call oak's aide script
+	predef OaksAideScript ; call oak's aide script
 	ld a, [$ffdb]
 	dec a
 	jr nz, .asm_494a1 ; 0x49494 $b
--- a/scripts/route12.asm
+++ b/scripts/route12.asm
@ -36,8 +36,7 @@ Route12Script0: ; 59619 (16:5619)
 	ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
 	ld a, $1d
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $3
 	ld [W_ROUTE12CURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
--- a/scripts/route15gateupstairs.asm
+++ b/scripts/route15gateupstairs.asm
@ -20,8 +20,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651)
 	ld de, wcc5b
 	ld bc, $000d
 	call CopyData
-	ld a, $62
-	call Predef ; call oak's aide script
+	predef OaksAideScript ; call oak's aide script
 	ld a, [$ffdb]
 	cp $1
 	jr nz, .asm_49689 ; 0x4967c $b
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@ -36,8 +36,7 @@ Route16Script0: ; 59959 (16:5959)
 	ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
 	ld a, $21
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	call UpdateSprites
 	ld a, $3
 	ld [W_ROUTE16CURSCRIPT], a
--- a/scripts/route18gateupstairs.asm
+++ b/scripts/route18gateupstairs.asm
@ -10,8 +10,7 @@ Route18GateUpstairsText1: ; 4997e (12:597e)
 	db $08 ; asm
 	ld a, $5
 	ld [wWhichTrade], a
-	ld a, $54
-	call Predef
+	predef Predef54 
 	jp TextScriptEnd

 Route18GateUpstairsText2: ; 4998c (12:598c)
--- a/scripts/route20.asm
+++ b/scripts/route20.asm
@ -50,13 +50,11 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6)

 Route20Script_50d0c: ; 50d0c (14:4d0c)
 	ld [wcc4d], a
-	ld a, $15
-	jp Predef
+	predef_jump ShowObject

 Route20Script_50d14: ; 50d14 (14:4d14)
 	ld [wcc4d], a
-	ld a, $11
-	jp Predef
+	predef_jump HideObject

 Route20ScriptPointers: ; 50d1c (14:4d1c)
 	dw CheckFightingMapTrainers
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@ -82,8 +82,7 @@ Route22Script0: ; 50f00 (14:4f00)
 	ld [wcd4f], a
 	xor a
 	ld [wcd50], a
-	ld a, $4c
-	call Predef
+	predef EmotionBubble
 	ld a, [wd700]
 	and a
 	jr z, .asm_50f4e ; 0x50f44 $8
@ -208,8 +207,7 @@ Route22Script3: ; 5102a (14:502a)
 	ld [wJoyIgnore], a
 	ld a, $22
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	call Func_2307
 	ld hl, wd7eb
 	res 0, [hl]
@ -223,8 +221,7 @@ Route22Script_5104e: ; 5104e (14:504e)
 	ld [wcd4f], a
 	xor a
 	ld [wcd50], a
-	ld a, $4c
-	call Predef
+	predef EmotionBubble
 	ld a, [wd700]
 	and a
 	jr z, .skipYVisibilityTesta
@ -355,8 +352,7 @@ Route22Script6: ; 51151 (14:5151)
 	ld [wJoyIgnore], a
 	ld a, $23
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	call Func_2307
 	ld hl, wd7eb
 	res 1, [hl]
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@ -18,12 +18,10 @@ Route23Script_511e9: ; 511e9 (14:51e9)
 	res 6, [hl]
 	ld a, $7a
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld a, $60
 	ld [wcc4d], a
-	ld a, $11
-	jp Predef
+	predef_jump HideObject

 Route23ScriptPointers: ; 51213 (14:5213)
 	dw Route23Script0
@ -56,8 +54,7 @@ Route23Script0: ; 51219 (14:5219)
 	ld [wWhichTrade], a
 	ld b, $2
 	ld hl, wd7ed
-	ld a, $10
-	call Predef
+	predef FlagActionPredef
 	ld a, c
 	and a
 	ret nz
@ -198,8 +195,7 @@ Route23Script_51346: ; 51346 (14:5346)
 	ld c, a
 	ld b, $2
 	ld hl, W_OBTAINEDBADGES
-	ld a, $10 ; FlagActionPredef
-	call Predef
+	predef FlagActionPredef
 	ld a, c
 	and a
 	jr nz, .asm_5136e
@ -216,8 +212,7 @@ Route23Script_51346: ; 51346 (14:5346)
 	ld c, a
 	ld b, $1
 	ld hl, wd7ed
-	ld a, $10 ; FlagActionPredef
-	call Predef
+	predef FlagActionPredef
 	ld a, $2
 	ld [W_ROUTE23CURSCRIPT], a
 	ret
--- a/scripts/route25.asm
+++ b/scripts/route25.asm
@ -21,24 +21,20 @@ Route25Script_515e1: ; 515e1 (14:55e1)
 	res 6, [hl]
 	ld a, $61
 	ld [wcc4d], a
-	ld a, $15
-	jp Predef
+	predef_jump ShowObject
 .asm_515ff
 	bit 4, [hl]
 	ret z
 	set 7, [hl]
 	ld a, $24
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $62
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $63
 	ld [wcc4d], a
-	ld a, $15
-	jp Predef
+	predef_jump ShowObject

 Route25ScriptPointers: ; 51622 (14:5622)
 	dw CheckFightingMapTrainers
--- a/scripts/route2gate.asm
+++ b/scripts/route2gate.asm
@ -20,8 +20,7 @@ Route2GateText1: ; 5d5db (17:55db)
 	ld de, wcc5b
 	ld bc, $000d
 	call CopyData
-	ld a, $62
-	call Predef ; call oak's aide script
+	predef OaksAideScript ; call oak's aide script
 	ldh a, [$db]
 	cp $1
 	jr nz, .asm_ad646 ; 0x5d606
--- a/scripts/route2house.asm
+++ b/scripts/route2house.asm
@ -13,6 +13,5 @@ Route2HouseText2: ; 1def9 (7:5ef9)
 	db $08 ; asm
 	ld a, $1
 	ld [wWhichTrade], a
-	ld a, $54
-	call Predef
+	predef Predef54 
 	jp TextScriptEnd
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/safarizoneentrance.asm
@ -176,8 +176,7 @@ SafariZoneEntranceText4: ; 752ca (1d:52ca)
 	ld hl, wTrainerFacingDirection
 	ld de, wPlayerMoney + 2
 	ld c, $3
-	ld a, $c ; SubBCDPredef
-	call Predef
+	predef SubBCDPredef
 	ld a, $13
 	ld [wd125], a
 	call DisplayTextBoxID
--- a/scripts/seafoamislands1.asm
+++ b/scripts/seafoamislands1.asm
@ -28,12 +28,10 @@ SeafoamIslands1Script: ; 447e9 (11:47e9)
 .asm_44825
 	ld a, [wd079]
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, [wd07a]
 	ld [wcc4d], a
-	ld a, $15
-	jp Predef
+	predef_jump ShowObject
 .asm_4483b
 	ld a, $9f
 	ld [wd71d], a
--- a/scripts/seafoamislands2.asm
+++ b/scripts/seafoamislands2.asm
@ -26,12 +26,10 @@ SeafoamIslands2Script: ; 46315 (11:6315)
 .asm_4634c
 	ld a, [wd079]
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, [wd07a]
 	ld [wcc4d], a
-	ld a, $15
-	jp Predef
+	predef_jump ShowObject
 .asm_46362
 	ld a, $a0
 	ld [wd71d], a
--- a/scripts/seafoamislands3.asm
+++ b/scripts/seafoamislands3.asm
@ -26,12 +26,10 @@ SeafoamIslands3Script: ; 46451 (11:6451)
 .asm_46488
 	ld a, [wd079]
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, [wd07a]
 	ld [wcc4d], a
-	ld a, $15
-	jp Predef
+	predef_jump ShowObject
 .asm_4649e
 	ld a, $a1
 	ld [wd71d], a
--- a/scripts/seafoamislands4.asm
+++ b/scripts/seafoamislands4.asm
@ -26,12 +26,10 @@ SeafoamIslands4Script: ; 4658d (11:658d)
 .asm_465c4
 	ld a, [wd079]
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, [wd07a]
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	jr .asm_465ed ; 0x465da $11
 .asm_465dc
 	ld a, $a2
--- a/scripts/silphco1.asm
+++ b/scripts/silphco1.asm
@ -9,8 +9,7 @@ SilphCo1Script: ; 5d44e (17:544e)
 	ret nz
 	ld a, $4c
 	ld [wcc4d], a
-	ld a, $15
-	jp Predef
+	predef_jump ShowObject

 SilphCo1TextPointers: ; 5d469 (17:5469)
 	dw SilphCo1Text1
--- a/scripts/silphco10.asm
+++ b/scripts/silphco10.asm
@ -22,8 +22,7 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $405
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 DataTable_5a173: ; 5a173 (16:6173)
 	db $04,$05,$FF
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@ -22,8 +22,7 @@ SilphCo11Script_62110: ; 62110 (18:6110)
 	ld a, $20
 	ld [wd09f], a
 	ld bc, $603
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 DataTable_62134: ; 62134 (18:6134)
 	db $06,$03,$FF
@ -80,8 +79,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d)
 	jr z, .asm_62181
 	push hl
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	pop hl
 	jr .asm_62170
 .asm_62181
@ -92,8 +90,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d)
 	ret z
 	push hl
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	pop hl
 	jr .asm_62184

--- a/scripts/silphco2.asm
+++ b/scripts/silphco2.asm
@ -23,8 +23,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0202
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	pop af
 .asm_59d2e
 	bit 6, a
@ -32,8 +31,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0502
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 DataTable_59d3e: ; 59d3e (16:5d3e)
 	db $02,$02,$05,$02,$FF
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@ -23,8 +23,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $404
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	pop af
 .asm_59f98
 	bit 1, a
@ -32,8 +31,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $408
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 DataTable_59fa8: ; 59fa8 (16:5fa8)
 	db $04,$04,$04,$08,$FF
--- a/scripts/silphco4.asm
+++ b/scripts/silphco4.asm
@ -23,8 +23,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0602
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	pop af
 .asm_19d48
 	bit 1, a
@ -32,8 +31,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0406
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 SilphCo4Data19d58: ; 19d58 (6:5d58)
 	db $06, $02, $04, $06, $ff
--- a/scripts/silphco5.asm
+++ b/scripts/silphco5.asm
@ -23,8 +23,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0203
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	pop af
 .asm_19f74
 	bit 1, a
@ -33,8 +32,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0603
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	pop af
 .asm_19f87
 	bit 2, a
@ -42,8 +40,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0507
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 SilphCo5Coords: ; 19f97 (6:5f97) ; coords?
 	db $02, $03, $06, $03, $05, $07, $ff
--- a/scripts/silphco6.asm
+++ b/scripts/silphco6.asm
@ -22,8 +22,7 @@ SilphCo6Script_1a1bf: ; 1a1bf (6:61bf)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0602
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 SilphCo6Coords1: ; 1a1e3 (6:61e3)
 	db $06, $02
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@ -23,8 +23,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $305
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	pop af
 .asm_51b9e
 	bit 5, a
@ -33,8 +32,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $20a
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	pop af
 .asm_51bb1
 	bit 6, a
@ -42,8 +40,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $60a
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 DataTable_51bc1: ; 51bc1 (14:5bc1)
 	db $03,$05,$02,$0A,$06,$0A,$FF
@ -246,8 +243,7 @@ SilphCo7Script5: ; 51d25 (14:5d25)
 	ret nz
 	ld a, $a7
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	call Func_2307
 	xor a
 	ld [wJoyIgnore], a
--- a/scripts/silphco8.asm
+++ b/scripts/silphco8.asm
@ -22,8 +22,7 @@ SilphCo8Script_5651a: ; 5651a (15:651a)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $403
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 DataTable_5653e: ; 5653e (15:653e)
 	db $04,$03,$FF
--- a/scripts/silphco9.asm
+++ b/scripts/silphco9.asm
@ -23,8 +23,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $401
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	pop af
 .asm_5d7f8
 	bit 1, a
@ -33,8 +32,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $209
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	pop af
 .asm_5d80b
 	bit 2, a
@ -43,8 +41,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $509
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	pop af
 .asm_5d81e
 	bit 3, a
@ -52,8 +49,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $605
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 DataTable_5d82e: ; 5d82e (17:582e)
 	db $04,$01,$02,$09,$05,$09,$06,$05,$FF
@ -167,8 +163,7 @@ SilphCo9Text1: ; 5d8b8 (17:58b8)
 	jr nz, .asm_a14c3 ; 0x5d8be
 	ld hl, SilphCo9Text_5d8e5
 	call PrintText
-	ld a, $7
-	call Predef
+	predef HealParty
 	call GBFadeOut2
 	call Delay3
 	call GBFadeIn2
--- a/scripts/silphcoelevator.asm
+++ b/scripts/silphcoelevator.asm
@ -73,6 +73,5 @@ SilphCoElevatorText1: ; 45835 (11:5835)
 	db $08 ; asm
 	call SilphCoElevatorScript_457f1
 	ld hl, SilphCoElevatorWarpMaps ; $5811
-	ld a, $61
-	call Predef
+	predef Func_1c9c6
 	jp TextScriptEnd
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@ -34,8 +34,7 @@ SSAnne2Script0: ; 613be (18:53be)
 	ld [$ffdb], a
 	ld a, $71
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	call Delay3
 	ld a, $2
 	ld [$ff8c], a
@ -163,8 +162,7 @@ SSAnne2Script3: ; 614be (18:54be)
 	ld [wJoyIgnore], a
 	ld a, $71
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	call Func_2307
 	ld a, $4
 	ld [W_SSANNE2CURSCRIPT], a
--- a/scripts/undergroundpathentranceroute5.asm
+++ b/scripts/undergroundpathentranceroute5.asm
@ -13,7 +13,6 @@ UndergroundPathEntranceRoute5Text1: ; 5d6b2 (17:56b2)
 	db $08 ; asm
 	ld a, $9
 	ld [wWhichTrade], a
-	ld a, $54
-	call Predef
+	predef Predef54 
 	ld hl, UndergroundPathEntranceRoute5_5d6af
 	ret
--- a/scripts/vermilioncity.asm
+++ b/scripts/vermilioncity.asm
@ -55,8 +55,7 @@ VermilionCityScript0: ; 197e6 (6:57e6)
 	bit 2, a
 	jr nz, .asm_19810 ; 0x19804 $a
 	ld b, $3f
-	ld a, $1c
-	call Predef
+	predef IsItemInBag_ 
 	ld a, b
 	and a
 	ret nz
@ -176,8 +175,7 @@ VermilionCityText3: ; 198b1 (6:58b1)
 	ld hl, SSAnneWelcomeText9
 	call PrintText
 	ld b, S_S__TICKET
-	ld a, $1c
-	call Predef
+	predef IsItemInBag_ 
 	ld a, b
 	and a
 	jr nz, .asm_0419b ; 0x198df
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@ -40,8 +40,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d)
 .asm_5ca7f
 	ld [wd09f], a
 	ld bc, $202
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a)
 	xor a
--- a/scripts/vermilionhouse3.asm
+++ b/scripts/vermilionhouse3.asm
@ -8,6 +8,5 @@ VermilionHouse3Text1: ; 19c17 (6:5c17)
 	db $08 ; asm
 	ld a, $4
 	ld [wWhichTrade], a
-	ld a, $54
-	call Predef
+	predef Predef54 
 	jp TextScriptEnd
--- a/scripts/victoryroad1.asm
+++ b/scripts/victoryroad1.asm
@ -17,8 +17,7 @@ VictoryRoad1Script: ; 5da0a (17:5a0a)
 	ld a, $1d
 	ld [wd09f], a
 	ld bc, $604
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a)
 	dw VictoryRoad1Script0
--- a/scripts/victoryroad2.asm
+++ b/scripts/victoryroad2.asm
@ -36,8 +36,7 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9)

 VictoryRoad2Script_517e2: ; 517e2 (14:57e2)
 	ld [wd09f], a
-	ld a, $17
-	call Predef
+	predef Func_ee9e
 	ret

 VictoryRoad2ScriptPointers: ; 517eb (14:57eb)
--- a/scripts/victoryroad3.asm
+++ b/scripts/victoryroad3.asm
@ -19,8 +19,7 @@ VictoryRoad3Script_44996: ; 44996 (11:4996)
 	ld a, $1d
 	ld [wd09f], a
 	ld bc, $503
-	ld a, $17
-	jp Predef
+	predef_jump Func_ee9e

 VictoryRoad3ScriptPointers: ; 449b1 (11:49b1)
 	dw VictoryRoad3Script0
@ -50,12 +49,10 @@ VictoryRoad3Script0: ; 449b7 (11:49b7)
 	jr nz, .asm_449fe
 	ld a, $7a
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	ld a, $60
 	ld [wcc4d], a
-	ld a, $15
-	jp Predef
+	predef_jump ShowObject

 .coordsData_449f9: ; 449f9 (11:49f9)
 	db $05,$03
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@ -177,8 +177,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995)

 	ld a, $23
 	ld [wcc4d], a
-	ld a, $15
-	call Predef
+	predef ShowObject
 	ld hl, wd7eb
 	set 1, [hl]
 	set 7, [hl]
@ -293,8 +292,7 @@ ViridianGymText1: ; 74a69 (1d:4a69)
 	call GBFadeIn1
 	ld a, $32
 	ld [wcc4d], a
-	ld a, $11
-	call Predef
+	predef HideObject
 	call UpdateSprites
 	call Delay3
 	call GBFadeOut1