Break up engine/sprites.asm; address yenatch's comments

engine/breeding/egg.asm

@@ -699,7 +699,7 @@ Function1728f: ; 1728f (5:728f)
 	ld bc, $20
 	ld a, BANK(EggHatchGFX)
 	call FarCopyBytes
-	callba Function8cf53
+	callba ClearSpriteAnims
 	ld de, VTiles2 tile $00
 	ld a, [wJumptableIndex]
 	call Function1723c
@@ -806,7 +806,7 @@ INCBIN "gfx/unknown/017393.2bpp"
 ; 173b3
 
 Function173b3: ; 173b3 (5:73b3)
-	callba Function8cf53
+	callba ClearSpriteAnims
 	ld hl, .SpriteData
 .loop
 	ld a, [hli]

engine/compose_mail.asm

@@ -129,7 +129,7 @@ INCBIN "gfx/icon/mail2.2bpp"
 	and a
 	ret
 .exit_mail
-	callab Function8cf53
+	callab ClearSpriteAnims
 	call ClearSprites
 	xor a
 	ld [hSCX], a

engine/crystal_intro.asm

@@ -96,7 +96,7 @@ Functione45e8: ; e45e8
 	pop af
 	ld [rSVBK], a
 
-	callba Function8cf53
+	callba ClearSpriteAnims
 	depixel 10, 11, 4, 0
 	ld a, SPRITE_ANIM_INDEX_03
 	call _InitSpriteAnimStruct
@@ -125,7 +125,7 @@ Functione45e8: ; e45e8
 ; e465e
 
 Functione465e: ; e465e
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call ClearTileMap
 	call ClearSprites
 	ld c, 16
@@ -540,7 +540,7 @@ IntroScene1: ; e495b (39:495b)
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Functione549e
 	xor a
 	ld [wIntroSceneFrameCounter], a
@@ -678,7 +678,7 @@ IntroScene5: ; e4a7a (39:4a7a)
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Functione549e
 	xor a
 	ld [wcf64], a
@@ -776,7 +776,7 @@ IntroScene7: ; e4b3f (39:4b3f)
 	ld a, $90
 	ld [hWY], a
 	call Functione5516
-	callba Function8cf53
+	callba ClearSpriteAnims
 	depixel 13, 27, 4, 0
 	ld a, SPRITE_ANIM_INDEX_26
 	call _InitSpriteAnimStruct
@@ -925,7 +925,7 @@ IntroScene11: ; e4c86 (39:4c86)
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Functione549e
 	xor a
 	ld [wIntroSceneFrameCounter], a
@@ -1050,7 +1050,7 @@ IntroScene13: ; e4d6d (39:4d6d)
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	depixel 13, 11, 4, 0
 	ld a, SPRITE_ANIM_INDEX_26
 	call _InitSpriteAnimStruct
@@ -1160,7 +1160,7 @@ IntroScene15: ; e4e40 (39:4e40)
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Functione549e
 	depixel 8, 5
 	ld a, SPRITE_ANIM_INDEX_2A
@@ -1233,7 +1233,7 @@ IntroScene17: ; e4ef5 (39:4ef5)
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Functione549e
 	xor a
 	ld [wcf64], a
@@ -1308,7 +1308,7 @@ IntroScene19: ; e4f7e (39:4f7e)
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	ld hl, wc300
 	xor a
 	ld [hli], a
@@ -1475,7 +1475,7 @@ IntroScene26: ; e50bb (39:50bb)
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Functione549e
 	xor a
 	ld [wcf64], a

engine/dummy_game.asm

@@ -10,7 +10,7 @@ Functione1e67: ; e1e67 (38:5e67)
 	call DisableLCD
 	ld b, SCGB_08
 	call GetSGBLayout
-	callab Function8cf53
+	callab ClearSpriteAnims
 	ld hl, LZ_e2221
 	ld de, VTiles2 tile $00
 	call Decompress

engine/events_2.asm

@@ -142,7 +142,7 @@ RandomEncounter:: ; 97cc0
 ; 97cf9
 
 WildBattleScript: ; 97cf9
-	setup_random_encounter
+	randomwildmon
 	startbattle
 	returnafterbattle
 	end

engine/evolution_animation.asm

@@ -36,7 +36,7 @@ _EvolutionAnimation: ; 4e607
 	ld de, MUSIC_NONE
 	call PlayMusic
 
-	callba Function8cf53
+	callba ClearSpriteAnims
 
 	ld de, EvolutionGFX
 	ld hl, VTiles0
@@ -107,7 +107,7 @@ _EvolutionAnimation: ; 4e607
 	ld c, $0
 	call .GetSGBLayout
 	call Function4e7a6
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Function4e794
 	jr c, .asm_4e6de
 
@@ -144,7 +144,7 @@ _EvolutionAnimation: ; 4e607
 	ld c, $0
 	call .GetSGBLayout
 	call Function4e7a6
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Function4e794
 	ret c
 

engine/link.asm

@@ -474,7 +474,7 @@ Function283b2: ; 283b2
 	ld b, $a
 .asm_283b7
 	call DelayFrame
-	call LinkCommunicationsSignalDataReceived
+	call LinkDataReceived
 	dec b
 	jr nz, .asm_283b7
 	xor a
@@ -2295,9 +2295,9 @@ Special_WaitForLinkedFriend: ; 29d11
 	jr .asm_29d39
 
 .asm_29d79
-	call LinkCommunicationsSignalDataReceived
+	call LinkDataReceived
 	call DelayFrame
-	call LinkCommunicationsSignalDataReceived
+	call LinkDataReceived
 	ld c, $32
 	call DelayFrames
 	ld a, $1
@@ -2426,7 +2426,7 @@ Function29e47: ; 29e47
 	ld b, $a
 .asm_29e49
 	call DelayFrame
-	call LinkCommunicationsSignalDataReceived
+	call LinkDataReceived
 	dec b
 	jr nz, .asm_29e49
 	ret
@@ -2467,9 +2467,9 @@ Special_CheckBothSelectedSameRoom: ; 29e82
 	ld a, [wd265]
 	call Function29f17
 	push af
-	call LinkCommunicationsSignalDataReceived
+	call LinkDataReceived
 	call DelayFrame
-	call LinkCommunicationsSignalDataReceived
+	call LinkDataReceived
 	pop af
 	ld b, a
 	ld a, [wd265]

engine/mail.asm

@@ -443,7 +443,7 @@ Function4484a: ; 0x4484a
 	dec a
 	ld b, a
 	call ReadMailMessage
-	jp ReturnToCallingMenu
+	jp CloseSubmenu
 ; 0x44877
 
 .PutInPack ; 0x44877
@@ -539,7 +539,7 @@ Function4484a: ; 0x4484a
 	call PrintText
 
 .exit2
-	jp ReturnToCallingMenu
+	jp CloseSubmenu
 ; 0x4493c
 
 .HoldingMailText ; 0x4493c

engine/map_setup.asm

@@ -252,7 +252,7 @@ MapSetupCommands: ; 15440
 	dba RotatePalettesRightMapAndMusic ; 06
 	dba EnterMapMusic ; 07
 	dba ForceMapMusic ; 08
-	dba RotatePalettesLeftMusic ; 09
+	dba FadeInMusic ; 09
 	dba LoadBlockData ; 0a
 	dba LoadNeighboringBlockData ; 0b
 	dba SaveScreen ; 0c

engine/mart.asm

@@ -377,7 +377,7 @@ BuyMenu: ; 15c62
 .loop
 	call BuyMenuLoop ; menu loop
 	jr nc, .loop
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ret
 ; 15c7d
 

engine/namingscreen.asm

@@ -345,7 +345,7 @@ Function11915: ; 11915
 	ret
 
 .asm_11930
-	callab Function8cf53
+	callab ClearSpriteAnims
 	call ClearSprites
 	xor a
 	ld [hSCX], a
@@ -866,7 +866,7 @@ Function11c11: ; 11c11 (4:5c11)
 
 Function11c51: ; 11c51
 	call ClearSprites
-	callab Function8cf53
+	callab ClearSpriteAnims
 	call LoadStandardFont
 	call LoadFontsExtra
 

engine/party_menu.asm

@@ -41,7 +41,7 @@ Function5003f: ; 5003f
 LoadPartyMenuGFX: ; 5004f
 	call LoadFontsBattleExtra
 	callab Function8ad1 ; engine/color.asm
-	callab ClearSpriteAnims
+	callab ClearSpriteAnims2
 	ret
 ; 5005f
 

engine/pokecenter_pc.asm

@@ -140,7 +140,7 @@ HallOfFamePC: ; 1569a
 	call PC_PlayChoosePCSound
 	call FadeToMenu
 	callba _HallOfFamePC
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	and a
 	ret
 ; 156ab
@@ -323,7 +323,7 @@ KrisWithdrawItemMenu: ; 0x157d1
 	jr .asm_157da
 
 .asm_157e4
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	xor a
 	ret
 ; 0x157e9
@@ -403,7 +403,7 @@ KrisTossItemMenu: ; 0x1585f
 	jr .asm_15868
 
 .asm_15878
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	xor a
 	ret
 ; 0x1587d
@@ -442,7 +442,7 @@ KrisDepositItemMenu: ; 0x1588b
 	jr .asm_1589c
 
 .asm_158b3
-	call ReturnToCallingMenu
+	call CloseSubmenu
 
 .asm_158b6
 	xor a

engine/pokegear.asm

@@ -59,7 +59,7 @@ Function90bea: ; 90bea (24:4bea)
 	ld a, $7
 	ld [hWX], a
 	call Function90c4e
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Function90d32
 	ld a, 8
 	call SkipMusic
@@ -1944,7 +1944,7 @@ _FlyMap: ; 91af3
 	ld [hl], $1
 	xor a
 	ld [hBGMapMode], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Function91ff2
 	ld de, GFX_922e1
 	ld hl, VTiles2 tile $30
@@ -2866,7 +2866,7 @@ Function92311: ; unreferenced
 	ld [hl], $1
 	xor a
 	ld [hBGMapMode], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	call Function91ff2
 	ld de, GFX_922e1
 	ld hl, VTiles2 tile $30

engine/scripting.asm

@@ -163,10 +163,10 @@ ENDC
 	dw Script_interpretmenu
 	dw Script_interpretmenu2
 	dw Script_loadpikachudata
-	dw Script_setup_random_encounter
+	dw Script_randomwildmon
-	dw Script_memtrainerdata
+	dw Script_loadmemtrainer
-	dw Script_scriptedpokedata
+	dw Script_loadwildmon
-	dw Script_scriptedtrainerdata
+	dw Script_loadtrainer
 	dw Script_startbattle
 	dw Script_returnafterbattle
 	dw Script_catchtutorial
@@ -1482,7 +1482,7 @@ Script_loadpikachudata: ; 973f0
 	ret
 ; 973fb
 
-Script_setup_random_encounter: ; 973fb
+Script_randomwildmon: ; 973fb
 ; script command 0x5b
 
 	xor a
@@ -1490,19 +1490,19 @@ Script_setup_random_encounter: ; 973fb
 	ret
 ; 97400
 
-Script_memtrainerdata: ; 97400
+Script_loadmemtrainer: ; 97400
 ; script command 0x5c
 
 	ld a, (1 << 7) | 1
 	ld [wBattleScriptFlags], a
-	ld a, [WalkingDirection]
+	ld a, [wTempTrainerClass]
 	ld [OtherTrainerClass], a
-	ld a, [FacingDirection]
+	ld a, [wTempTrainerID]
 	ld [OtherTrainerID], a
 	ret
 ; 97412
 
-Script_scriptedpokedata: ; 97412
+Script_loadwildmon: ; 97412
 ; script command 0x5d
 ; parameters:
 ;     pokemon (PokemonParam)
@@ -1517,7 +1517,7 @@ Script_scriptedpokedata: ; 97412
 	ret
 ; 97424
 
-Script_scriptedtrainerdata: ; 97424
+Script_loadtrainer: ; 97424
 ; script command 0x5e
 ; parameters:
 ;     trainer_group (TrainerGroupParam)
@@ -1655,7 +1655,7 @@ ScriptCall: ; 974cb
 	ld e, [hl]
 	inc [hl]
 	ld d, $0
-	ld hl, wScriptStackBA1
+	ld hl, wScriptStack
 rept 3
 	add hl, de
 endr
@@ -3166,7 +3166,7 @@ ExitScriptSubroutine: ; 97b9a
 	dec [hl]
 	ld e, [hl]
 	ld d, $0
-	ld hl, wScriptStackBA1
+	ld hl, wScriptStack
 rept 3
 	add hl,de
 endr

engine/selectmenu.asm

@@ -158,7 +158,7 @@ UseRegisteredItem: ; 133c3
 	call ResetWindow
 	call FadeToMenu
 	call DoItemEffect
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	call CloseText
 	and a
 	ret

engine/slot_machine.asm

@@ -32,7 +32,7 @@ Function926f7: ; 926f7 (24:66f7)
 	call ByteFill
 	ld b, SCGB_05
 	call GetSGBLayout
-	callab Function8cf53
+	callab ClearSpriteAnims
 	ld hl, wc6d0
 	ld bc, $48
 	xor a
@@ -101,7 +101,7 @@ Function927af: ; 927af (24:67af)
 	call Function92b0f
 	xor a
 	ld [wc3b5], a
-	callab Function8cfa8
+	callab DoNextFrameForFirst16Sprites
 	call Function927f8
 	call Function927d3
 	call DelayFrame

engine/specials.asm

@@ -126,7 +126,7 @@ SpecialsPointers:: ; c029
 	add_special SpecialTrainerHouse
 	add_special PhotoStudio
 	add_special InitRoamMons
-	add_special Special_RotatePalettesRightMusic
+	add_special Special_FadeOutMusic
 	add_special Diploma
 	add_special PrintDiploma
 
@@ -616,7 +616,7 @@ SpecialGameboyCheck: ; c478
 	ret
 
 
-Special_RotatePalettesRightMusic: ; c48f
+Special_FadeOutMusic: ; c48f
 	ld a, MUSIC_NONE % $100
 	ld [MusicFadeIDLo], a
 	ld a, MUSIC_NONE / $100

engine/sprite_anims.asm

@@ -0,0 +1,818 @@
+DoAnimFrame: ; 8d24b
+	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
+	add hl, bc
+	ld e, [hl]
+	ld d, 0
+	ld hl, .Jumptable
+rept 2
+	add hl, de
+endr
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	jp [hl]
+; 8d25b
+
+
+.Jumptable: ; 8d25b (23:525b)
+	dw .zero        ; town map
+	dw .one         ; bouncing mon icons
+	dw .two
+	dw .three
+	dw .four
+	dw .five
+	dw .six         ; Game Freak logo
+	dw .seven
+	dw .eight
+	dw .nine
+	dw .ten
+	dw .eleven
+	dw .twelve      ; blinking cursor
+	dw .thirteen
+	dw .fourteen
+	dw .fifteen
+	dw .sixteen
+	dw .seventeen
+	dw .eighteen
+	dw .nineteen    ; finish egg hatching animation
+	dw .twenty
+	dw .twentyone
+	dw .twentytwo   ; flying sprite
+	dw .twentythree ; flying leaves
+	dw .twentyfour
+	dw .twentyfive
+	dw .twentysix
+	dw .twentyseven
+	dw .twentyeight
+	dw .twentynine  ; intro suicune
+	dw .thirty      ; intro pichu wooper
+	dw .thirtyone
+	dw .thirtytwo   ; intro unown
+	dw .thirtythree ; intro unown F with suicune leaping up
+	dw .thirtyfour  ; intro suicune facing away from us
+
+
+.zero: ; 8d2a1 (23:52a1)
+	ret
+
+.one: ; 8d2a2 (23:52a2)
+	ld a, [MenuSelection2]
+	ld hl, 0
+	add hl, bc
+	cp [hl]
+	jr z, .two
+	ld hl, $4
+	add hl, bc
+	ld [hl], $10
+	ld hl, $7
+	add hl, bc
+	ld [hl], $0
+	ret
+
+.two: ; 8d2b9 (23:52b9)
+	ld hl, $4
+	add hl, bc
+	ld [hl], $18
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+	ld d, a
+	inc [hl]
+	and $f
+	ret nz
+	ld hl, $d
+	add hl, bc
+	ld e, [hl]
+	ld hl, $7
+	add hl, bc
+	ld a, d
+	and $10 ; bit 4
+	jr z, .asm_8d2df
+	ld a, e
+	and a
+	jr z, .asm_8d2e6
+	cp $1
+	jr z, .asm_8d2e2
+.asm_8d2df
+	xor a
+	ld [hl], a
+	ret
+.asm_8d2e2
+	ld a, $ff
+	ld [hl], a
+	ret
+.asm_8d2e6
+	ld a, $fe
+	ld [hl], a
+	ret
+
+.three: ; 8d2ea (23:52ea)
+	ld a, [MenuSelection2]
+	ld hl, 0
+	add hl, bc
+	cp [hl]
+	jr z, .asm_8d2fb
+	ld hl, $4
+	add hl, bc
+	ld [hl], $10
+	ret
+.asm_8d2fb
+	ld hl, $4
+	add hl, bc
+	ld [hl], $18
+	ret
+
+.four: ; 8d302 (23:5302)
+	call .anonymous_jumptable
+	jp [hl]
+; 8d306 (23:5306)
+
+; Anonymous jumptable (see .anonymous_jumptable)
+	dw .four_zero
+	dw .four_one
+; 8d30a
+
+.four_zero: ; 8d30a
+	call .asm_8d6d8
+	ld hl, 0
+	add hl, bc
+	ld a, [hl]
+	ld hl, $d
+	add hl, bc
+	and $3
+	ld [hl], a
+	inc [hl]
+	swap a
+	ld hl, $c
+	add hl, bc
+	ld [hl], a
+
+.four_one: ; 8d321
+	ld hl, $4
+	add hl, bc
+	ld a, [hl]
+	cp $a4
+	jr nc, .asm_8d356
+	ld hl, $d
+	add hl, bc
+	add $4
+	ld hl, $4
+	add hl, bc
+	ld [hl], a
+	ld hl, $5
+	add hl, bc
+	inc [hl]
+	ld hl, $d
+	add hl, bc
+	ld a, [hl]
+	sla a
+	sla a
+	ld d, $2
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+	add $3
+	ld [hl], a
+	call .ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	ret
+
+.asm_8d356
+	call Function8d036
+	ret
+; 8d35a
+
+.twentyfive: ; 8d35a (23:535a)
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+	inc a
+	ld [hl], a
+	ld d, $2
+	call .ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	ret
+
+.five: ; 8d36c (23:536c)
+	callab Function11a3b
+	ret
+
+.twelve: ; 8d373 (23:5373)
+	callab Function120c1
+	ret
+
+.six: ; 8d37a (23:537a)
+	callab GameFreakLogoJumper
+	ret
+
+.seven: ; 8d381 (23:5381)
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+	and a
+	jr z, .asm_8d3ba
+rept 2
+	dec [hl]
+endr
+	ld d, a
+	and $1f
+	jr nz, .asm_8d395
+	ld hl, $d
+	add hl, bc
+	dec [hl]
+.asm_8d395
+	ld hl, $b
+	add hl, bc
+	ld a, [hl]
+	push af
+	push de
+	call .ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	pop de
+	pop af
+	call .ApplyXOffset
+	ld hl, $6
+	add hl, bc
+	ld [hl], a
+	ld hl, $d
+	add hl, bc
+	ld a, [hl]
+	ld hl, $b
+	add hl, bc
+	add [hl]
+	ld [hl], a
+	ret
+.asm_8d3ba
+	ld a, $1
+	ld [wcf64], a
+	call Function8d036
+	ret
+
+.eight: ; 8d3c3 (23:53c3)
+	ld hl, $c
+	add hl, bc
+	ld a, [hli]
+	or [hl]
+	jr z, .asm_8d41e
+	ld hl, $f
+	add hl, bc
+	ld d, [hl]
+	ld hl, $b
+	add hl, bc
+	ld a, [hl]
+	push af
+	push de
+	call .ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	pop de
+	pop af
+	call .ApplyXOffset
+	ld hl, $6
+	add hl, bc
+	ld [hl], a
+	ld hl, $c
+	add hl, bc
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, $e
+	add hl, bc
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	add hl, de
+	ld e, l
+	ld d, h
+	ld hl, $e
+	add hl, bc
+	ld [hl], e
+	inc hl
+	ld [hl], d
+	ld hl, $c
+	add hl, bc
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld de, -$10
+	add hl, de
+	ld e, l
+	ld d, h
+	ld hl, $c
+	add hl, bc
+	ld [hl], e
+	inc hl
+	ld [hl], d
+	ld hl, $b
+	add hl, bc
+	ld a, [hl]
+	xor $20
+	ld [hl], a
+	ret
+.asm_8d41e
+	call Function8d036
+	ret
+
+.nine: ; 8d422 (23:5422)
+	callab Function9321d
+	ret
+
+.ten: ; 8d429 (23:5429)
+	callab Function932ac
+	ld hl, wcf64
+	ld a, [hl]
+	cp $2
+	ret nz
+	ld [hl], $3
+	ld a, $f
+	call Function8d120
+	ret
+
+.eleven: ; 8d43e (23:543e)
+	ld hl, $b
+	add hl, bc
+	ld a, [hl]
+	dec [hl]
+	ld e, a
+	and $1
+	jr z, .asm_8d462
+	ld hl, $4
+	add hl, bc
+	ld a, [hl]
+	cp $78
+	jr c, .asm_8d461
+	call Function8d036
+	ld a, $4
+	ld [wcf64], a
+	ld de, SFX_PLACE_PUZZLE_PIECE_DOWN
+	call PlaySFX
+	ret
+.asm_8d461
+	inc [hl]
+.asm_8d462
+	ld a, e
+	ld d, $20
+	call .ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	ret
+
+.thirteen: ; 8d46e (23:546e)
+	callab ret_e00ed
+	ret
+
+.fifteen: ; 8d475 (23:5475)
+	callab Function90d41
+	ret
+
+.fourteen: ; 8d47c (23:547c)
+	callab Functione21a1
+	ret
+
+.sixteen: ; 8d483 (23:5483)
+	call .anonymous_jumptable
+	jp [hl]
+; 8d487 (23:5487)
+
+; Anonymous jumptable (see .anonymous_jumptable)
+	dw .sixteen_zero
+	dw .sixteen_one
+	dw .sixteen_two
+	dw .sixteen_three
+	dw .sixteen_four
+	dw .sixteen_five
+; 8d493
+
+.sixteen_zero: ; 8d493
+	ld a, $14
+	call Function8d120
+	ld hl, $b
+	add hl, bc
+	ld [hl], $2
+	ld hl, $c
+	add hl, bc
+	ld [hl], $20
+	ret
+; 8d4a5
+
+.sixteen_two: ; 8d4a5
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+	and a
+	jr z, .asm_8d4af
+	dec [hl]
+	ret
+
+.asm_8d4af
+	call .asm_8d6d8
+	ld hl, $c
+	add hl, bc
+	ld [hl], $40
+
+.sixteen_three: ; 8d4b8
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+	cp $30
+	jr c, .asm_8d4cd
+	dec [hl]
+	ld d, $28
+	call .ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	ret
+
+.asm_8d4cd
+	ld de, SFX_GOT_SAFARI_BALLS
+	call PlaySFX
+	jr .sixteen_five
+; 8d4d5
+
+.sixteen_one: ; 8d4d5
+	ld hl, $b
+	add hl, bc
+	ld [hl], $4
+	ld hl, $c
+	add hl, bc
+	ld [hl], $30
+	ld hl, $d
+	add hl, bc
+	ld [hl], $24
+	ret
+; 8d4e8
+
+.sixteen_four: ; 8d4e8
+	ld hl, $d
+	add hl, bc
+	ld a, [hl]
+	and a
+	jr z, .asm_8d51c
+	ld d, a
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+	call ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	ld hl, $c
+	add hl, bc
+	inc [hl]
+	ld a, [hl]
+	and $3f
+	ret nz
+	ld hl, $c
+	add hl, bc
+	ld [hl], $20
+	ld hl, $d
+	add hl, bc
+	ld a, [hl]
+	sub $c
+	ld [hl], a
+	ld de, SFX_SWITCH_POKEMON
+	call PlaySFX
+	ret
+
+.asm_8d51c
+	xor a
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	call .asm_8d6d8
+	ret
+
+.sixteen_five: ; 8d526
+	call Function8d036
+	ret
+; 8d52a
+
+.seventeen: ; 8d52a (23:552a)
+	ld hl, $4
+	add hl, bc
+	ld a, [hl]
+rept 2
+	inc [hl]
+endr
+	cp $b0
+	jr nc, .asm_8d53f
+	and $3
+	ret nz
+	ld de, SFX_POKEBALLS_PLACED_ON_TABLE
+	call PlaySFX
+	ret
+
+.asm_8d53f
+	call Function8d036
+	ret
+
+.eighteen: ; 8d543 (23:5543)
+	callab Function29676
+	ret
+
+.nineteen: ; 8d54a (23:554a)
+	ld hl, SpriteAnim1Sprite0c - SpriteAnim1
+	add hl, bc
+	ld a, [hl]
+	cp $80
+	jr nc, .finish_nineteen
+	ld d, a
+	add $8
+	ld [hl], a
+	ld hl, SpriteAnim1Sprite0b - SpriteAnim1
+	add hl, bc
+	ld a, [hl]
+	xor $20
+	ld [hl], a
+
+	push af
+	push de
+	call .ApplyYOffset
+	ld hl, SpriteAnim1YOffset - SpriteAnim1
+	add hl, bc
+	ld [hl], a
+
+	pop de
+	pop af
+	call .ApplyXOffset
+	ld hl, SpriteAnim1XOffset - SpriteAnim1
+	add hl, bc
+	ld [hl], a
+	ret
+
+.finish_nineteen
+	call Function8d036
+	ret
+
+.twenty: ; 8d578 (23:5578)
+	callab Function91640
+	ret
+
+.twentyone: ; 8d57f (23:557f)
+	ld hl, $d
+	add hl, bc
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, $80
+	add hl, de
+	ld e, l
+	ld d, h
+	ld hl, $d
+	add hl, bc
+	ld [hl], e
+	inc hl
+	ld [hl], d
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+rept 3
+	inc [hl]
+endr
+	push af
+	push de
+	call .ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	pop de
+	pop af
+	call .ApplyXOffset
+	ld hl, $6
+	add hl, bc
+	ld [hl], a
+	ret
+
+.twentytwo: ; 8d5b0 (23:55b0)
+	ld hl, $5
+	add hl, bc
+	ld a, [hl]
+	and a
+	ret z
+	ld hl, $d
+	add hl, bc
+	ld a, [hl]
+	inc [hl]
+	cp $40
+	ret c
+	ld hl, $5
+	add hl, bc
+rept 2
+	dec [hl]
+endr
+	ld hl, $f
+	add hl, bc
+	ld a, [hl]
+	ld d, a
+	cp $40
+	jr nc, .asm_8d5d3
+	add $8
+	ld [hl], a
+.asm_8d5d3
+	ld hl, $e
+	add hl, bc
+	ld a, [hl]
+	inc [hl]
+	call .ApplyXOffset
+	ld hl, $6
+	add hl, bc
+	ld [hl], a
+	ret
+
+.twentythree: ; 8d5e2 (23:55e2)
+	ld hl, $4
+	add hl, bc
+	ld a, [hl]
+	cp $b8
+	jr nc, .asm_8d603
+rept 2
+	inc [hl]
+endr
+	ld hl, $5
+	add hl, bc
+	dec [hl]
+	ld d, $40
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+	inc [hl]
+	call .ApplyXOffset
+	ld hl, $6
+	add hl, bc
+	ld [hl], a
+	ret
+.asm_8d603
+	call Function8d036
+	ret
+
+.twentyfour: ; 8d607 (23:5607)
+	ld hl, $5
+	add hl, bc
+	ld a, [hl]
+	cp $54
+	ret z
+	ld hl, $5
+	add hl, bc
+rept 2
+	inc [hl]
+endr
+	ld hl, $f
+	add hl, bc
+	ld a, [hl]
+	ld d, a
+	and a
+	jr z, .asm_8d621
+	sub $2
+	ld [hl], a
+.asm_8d621
+	ld hl, $e
+	add hl, bc
+	ld a, [hl]
+	inc [hl]
+	call .ApplyXOffset
+	ld hl, $6
+	add hl, bc
+	ld [hl], a
+	ret
+
+.twentyseven: ; 8d630 (23:5630)
+	callba Function108bc7
+	ret
+
+.twentyeight: ; 8d637 (23:5637)
+	callba Function108be0
+	ret
+
+.twentynine: ; 8d63e (23:563e)
+	ld a, [wcf65]
+	and a
+	jr nz, .asm_8d645
+	ret
+.asm_8d645
+	ld hl, $7
+	add hl, bc
+	ld [hl], $0
+	ld hl, $d
+	add hl, bc
+	ld a, [hl]
+	add $2
+	ld [hl], a
+	xor $ff
+	inc a
+	ld d, $20
+	call .ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	ld a, $36
+	call Function8d120
+	ret
+
+.thirty: ; 8d666 (23:5666)
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+	cp $14
+	jr nc, .asm_8d67f
+	add $2
+	ld [hl], a
+	xor $ff
+	inc a
+	ld d, $20
+	call .ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+.asm_8d67f
+	ret
+
+.thirtytwo: ; 8d680 (23:5680)
+	ld hl, $b
+	add hl, bc
+	ld d, [hl]
+rept 3
+	inc [hl]
+endr
+	ld hl, $c
+	add hl, bc
+	ld a, [hl]
+	push af
+	push de
+	call .ApplyYOffset
+	ld hl, $7
+	add hl, bc
+	ld [hl], a
+	pop de
+	pop af
+	call .ApplyXOffset
+	ld hl, $6
+	add hl, bc
+	ld [hl], a
+	ret
+
+.thirtythree: ; 8d6a2 (23:56a2)
+	ld a, [wcf64]
+	cp $40
+	ret nz
+	ld a, $3d
+	call Function8d120
+	ret
+
+.thirtyfour: ; 8d6ae (23:56ae)
+	ld hl, $5
+	add hl, bc
+	ld a, [hl]
+	add $10
+	ld [hl], a
+	ret
+
+.twentysix: ; 8d6b7 (23:56b7)
+	callba Function11d0b6
+	ret
+
+.thirtyone: ; 8d6be (23:56be)
+	callba Function49aa2
+	ret
+
+.anonymous_jumptable: ; 8d6c5 (23:56c5)
+	ld hl, [sp+$0]
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	inc de
+	ld hl, $b
+	add hl, bc
+	ld l, [hl]
+	ld h, $0
+	add hl, hl
+	add hl, de
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ret
+; 8d6d8 (23:56d8)
+
+.asm_8d6d8: ; 8d6d8
+	ld hl, $b
+	add hl, bc
+	inc [hl]
+	ret
+; 8d6de
+
+.ApplyYOffset: ; 8d6de (23:56de)
+	call ApplyYOffset
+	ret
+
+.ApplyXOffset: ; 8d6e2 (23:56e2)
+	call ApplyXOffset
+	ret
+; 8d6e6 (23:56e6)

engine/startmenu.asm

@@ -469,7 +469,7 @@ StartMenu_Status: ; 12928
 
 	call FadeToMenu
 	callba TrainerCard
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ld a, 0
 	ret
 ; 12937
@@ -483,7 +483,7 @@ StartMenu_Pokedex: ; 12937
 
 	call FadeToMenu
 	callba Pokedex
-	call ReturnToCallingMenu
+	call CloseSubmenu
 
 .asm_12949
 	ld a, 0
@@ -495,7 +495,7 @@ StartMenu_Pokegear: ; 1294c
 
 	call FadeToMenu
 	callba PokeGear
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ld a, 0
 	ret
 ; 1295b
@@ -508,7 +508,7 @@ StartMenu_Pack: ; 1295b
 	ld a, [wcf66]
 	and a
 	jr nz, .used_item
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ld a, 0
 	ret
 
@@ -557,7 +557,7 @@ StartMenu_Pokemon: ; 12976
 	jr z, .quit
 
 .return
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ld a, 0
 	ret
 
@@ -1761,7 +1761,7 @@ SetUpMoveScreenBG: ; 13172
 	xor a
 	ld [hBGMapMode], a
 	callba Functionfb571
-	callba ClearSpriteAnims
+	callba ClearSpriteAnims2
 	ld a, [CurPartyMon]
 	ld e, a
 	ld d, $0

engine/town_map.asm

@@ -20,7 +20,7 @@ _TownMap: ; 9191c
 	call ClearSprites
 	call DisableLCD
 	call Function90c4e
-	callba Function8cf53
+	callba ClearSpriteAnims
 	ld a, 8
 	call SkipMusic
 	ld a, $e3

engine/trade/animation.asm

@@ -142,7 +142,7 @@ Function28fdb: ; 28fdb
 	call ClearTileMap
 	call DisableLCD
 	call LoadFontsBattleExtra
-	callab Function8cf53
+	callab ClearSpriteAnims
 	ld a, [hCGB]
 	and a
 	jr z, .asm_2900b
@@ -336,7 +336,7 @@ Function2914e: ; 2914e
 	push de
 	push af
 	call DisableLCD
-	callab Function8cf53
+	callab ClearSpriteAnims
 	hlbgcoord 20, 3
 	ld bc, $c
 	ld a, $60
@@ -466,7 +466,7 @@ TradeAnim_TubeToPlayer8: ; 29229
 	call ClearTileMap
 	call ClearSprites
 	call DisableLCD
-	callab Function8cf53
+	callab ClearSpriteAnims
 	hlbgcoord 0, 0
 	ld bc, sScratch - VBGMap0
 	ld a, " "

event/celebi.asm

@@ -67,7 +67,7 @@ endr
 ; 49912
 
 LoadCelebiGFX: ; 49912
-	callba Function8cf53
+	callba ClearSpriteAnims
 	ld de, SpecialCelebiLeafGFX
 	ld hl, VTiles1
 	lb bc, BANK(SpecialCelebiLeafGFX), 4

event/field_moves.asm

@@ -20,7 +20,7 @@ BlindingFlash: ; 8c7e1
 ; 8c80a
 
 ShakeHeadbuttTree: ; 8c80a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	ld de, CutGrassGFX
 	ld hl, VTiles1
 	lb bc, BANK(CutGrassGFX), 4
@@ -35,7 +35,7 @@ ShakeHeadbuttTree: ; 8c80a
 	ld hl, $3
 	add hl, bc
 	ld [hl], $84
-	ld a, $90
+	ld a, 36 * 4
 	ld [wc3b5], a
 	callba DoNextFrameForAllSprites
 	call GetHeadbuttTreeRelativeLocation
@@ -50,7 +50,7 @@ ShakeHeadbuttTree: ; 8c80a
 	and a
 	jr z, .done
 	dec [hl]
-	ld a, $90
+	ld a, 36 * 4
 	ld [wc3b5], a
 	callba DoNextFrameForAllSprites
 	call DelayFrame
@@ -61,7 +61,7 @@ ShakeHeadbuttTree: ; 8c80a
 	call WaitBGMap
 	xor a
 	ld [hBGMapMode], a
-	callba Function8cf53
+	callba ClearSpriteAnims
 	ld hl, Sprites + 36 * 4
 	ld bc, SpritesEnd - (Sprites + 36 * 4)
 	xor a
@@ -136,7 +136,7 @@ OWCutAnimation: ; 8c940
 ; 8c96d
 
 .LoadCutGFX: ; 8c96d
-	callab Function8cf53 ; pointless to farcall
+	callab ClearSpriteAnims ; pointless to farcall
 	ld de, CutGrassGFX
 	ld hl, VTiles1
 	lb bc, BANK(CutGrassGFX), 4
@@ -411,7 +411,7 @@ endr
 	ret
 
 Function8cb9b: ; 8cb9b (23:4b9b)
-	callab Function8cf53
+	callab ClearSpriteAnims
 	ld de, CutGrassGFX
 	ld hl, VTiles1 tile $00
 	lb bc, BANK(CutGrassGFX), 4

event/magnet_train.asm

@@ -117,7 +117,7 @@ Function8ccc9: ; 8ccc9
 	call ClearBGPalettes
 	call ClearSprites
 	call DisableLCD
-	callab Function8cf53
+	callab ClearSpriteAnims
 	call SetMagnetTrainPals
 	call DrawMagnetTrain
 	ld a, $90

event/sweet_scent.asm

@@ -16,7 +16,7 @@ UnknownScript_0x506c8: ; 0x506c8
 	iffalse UnknownScript_0x506e9
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue UnknownScript_0x506e5
-	setup_random_encounter
+	randomwildmon
 	startbattle
 	returnafterbattle
 	end

home/audio.asm

@@ -312,13 +312,13 @@ VolumeOff:: ; 3ca3
 	ret
 ; 3ca8
 
-Unused_RotatePalettesRightMusic:: ; 3ca8
+Unused_FadeOutMusic:: ; 3ca8
 	ld a, 4
 	ld [MusicFade], a
 	ret
 ; 3cae
 
-RotatePalettesLeftMusic:: ; 3cae
+FadeInMusic:: ; 3cae
 	ld a, 4 | 1 << 7
 	ld [MusicFade], a
 	ret

home/map.asm

@@ -2014,7 +2014,7 @@ FadeToMenu:: ; 2b29
 ; 2b3c
 
 
-ReturnToCallingMenu:: ; 2b3c
+CloseSubmenu:: ; 2b3c
 	call ClearBGPalettes
 	call Function2bae
 	call UpdateSprites

home/serial.asm

@@ -292,7 +292,7 @@ Function87d:: ; 87d
 	ld a, $ff
 	ld [wOtherPlayerLinkAction], a
 .loop
-	call LinkCommunicationsSendReceive
+	call LinkTransfer
 	call DelayFrame
 	call Function82b
 	jr z, .check
@@ -318,14 +318,14 @@ Function87d:: ; 87d
 	ld b, 10
 .receive
 	call DelayFrame
-	call LinkCommunicationsSendReceive
+	call LinkTransfer
 	dec b
 	jr nz, .receive
 
 	ld b, 10
 .acknowledge
 	call DelayFrame
-	call LinkCommunicationsSignalDataReceived
+	call LinkDataReceived
 	dec b
 	jr nz, .acknowledge
 
@@ -334,7 +334,7 @@ Function87d:: ; 87d
 	ret
 ; 8c1
 
-LinkCommunicationsSendReceive:: ; 8c1
+LinkTransfer:: ; 8c1
 	push bc
 	ld b, SERIAL_TIMECAPSULE
 	ld a, [wLinkMode]
@@ -380,7 +380,7 @@ LinkCommunicationsSendReceive:: ; 8c1
 	ret
 ; 908
 
-LinkCommunicationsSignalDataReceived:: ; 908
+LinkDataReceived:: ; 908
 ; Let the other system know that the data has been received.
 	xor a
 	ld [hSerialSend], a

macros/event.asm

@@ -595,26 +595,26 @@ loadpikachudata: macro
 	db loadpikachudata_command
 	endm
 
-	enum setup_random_encounter_command
+	enum randomwildmon_command
-setup_random_encounter: macro
+randomwildmon: macro
-	db setup_random_encounter_command
+	db randomwildmon_command
 	endm
 
-	enum memtrainerdata_command
+	enum loadmemtrainer_command
-memtrainerdata: macro
+loadmemtrainer: macro
-	db memtrainerdata_command
+	db loadmemtrainer_command
 	endm
 
-	enum scriptedpokedata_command
+	enum loadwildmon_command
-scriptedpokedata: macro
+loadwildmon: macro
-	db scriptedpokedata_command
+	db loadwildmon_command
 	db \1 ; pokemon
 	db \2 ; level
 	endm
 
-	enum scriptedtrainerdata_command
+	enum loadtrainer_command
-scriptedtrainerdata: macro
+loadtrainer: macro
-	db scriptedtrainerdata_command
+	db loadtrainer_command
 	db \1 ; trainer_group
 	db \2 ; trainer_id
 	endm

main.asm

@@ -4190,7 +4190,7 @@ HeadbuttScript: ; 0xceab
 	callasm TreeMonEncounter
 	iffalse .no_battle
 	closetext
-	setup_random_encounter
+	randomwildmon
 	startbattle
 	returnafterbattle
 	end
@@ -4299,7 +4299,7 @@ RockSmashScript: ; cf32
 	callasm RockMonEncounter
 	copybytetovar TempWildMonSpecies
 	iffalse .done
-	setup_random_encounter
+	randomwildmon
 	startbattle
 	returnafterbattle
 .done
@@ -4488,7 +4488,7 @@ Script_GotABite: ; 0xd035
 	writetext UnknownText_0xd0a4
 	callasm PutTheRodAway
 	closetext
-	setup_random_encounter
+	randomwildmon
 	startbattle
 	returnafterbattle
 	end
@@ -7991,7 +7991,7 @@ _BillsPC: ; e3fd
 ; 0xe43f
 
 .LogOut: ; e43f (3:643f)
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ret
 
 .UseBillsPC: ; e443 (3:6443)
@@ -8591,7 +8591,7 @@ Special_GiveParkBalls: ; 135db
 
 BugCatchingContestBattleScript:: ; 0x135eb
 	writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST
-	setup_random_encounter
+	randomwildmon
 	startbattle
 	returnafterbattle
 	copybytetovar wParkBallsRemaining
@@ -14433,7 +14433,7 @@ Special_MoveTutor: ; 4925b
 	ld [ScriptVar], a
 
 .asm_492a1
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ret
 ; 492a5
 
@@ -15637,7 +15637,7 @@ Function4a94e: ; 4a94e
 	jr c, .asm_4a974
 
 .asm_4a990
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	ld hl, wd002
 	ld a, -1
 	ld bc, 3
@@ -15650,7 +15650,7 @@ Function4a94e: ; 4a94e
 	jr c, .asm_4a9b0
 	call Function4a9d7
 	jr c, .asm_4a974
-	call ReturnToCallingMenu
+	call CloseSubmenu
 	and a
 
 .asm_4a9af
@@ -21499,13 +21499,13 @@ TalkToTrainerScript:: ; 0xbe66a
 	faceplayer
 	trainerflagaction CHECK_FLAG
 	iftrue AlreadyBeatenTrainerScript
-	memtrainerdata
+	loadmemtrainer
 	encountermusic
 	jump StartBattleWithMapTrainerScript
 ; 0xbe675
 
 SeenByTrainerScript:: ; 0xbe675
-	memtrainerdata
+	loadmemtrainer
 	encountermusic
 	showemote EMOTE_SHOCK, LAST_TALKED, 30
 	callasm TrainerWalkToPlayer
@@ -21520,7 +21520,7 @@ StartBattleWithMapTrainerScript: ; 0xbe68a
 	trainertext $0
 	waitbutton
 	closetext
-	memtrainerdata
+	loadmemtrainer
 	startbattle
 	returnafterbattle
 	trainerflagaction SET_FLAG

maps/AzaleaGym.asm

@@ -23,7 +23,7 @@ BugsyScript:
 	waitbutton
 	closetext
 	winlosstext BugsyText_ResearchIncomplete, 0
-	scriptedtrainerdata BUGSY, 1
+	loadtrainer BUGSY, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_BUGSY

maps/AzaleaTown.asm

@@ -44,7 +44,7 @@ UnknownScript_0x198018:
 	moveperson AZALEATOWN_AZALEA_ROCKET2, $b, $b
 	spriteface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	appear AZALEATOWN_AZALEA_ROCKET2
 	applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x198134
@@ -54,7 +54,7 @@ UnknownScript_0x198018:
 UnknownScript_0x198034:
 	spriteface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	appear AZALEATOWN_AZALEA_ROCKET2
 	applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x19813c
@@ -72,7 +72,7 @@ UnknownScript_0x198049:
 	iftrue UnknownScript_0x198081
 	winlosstext UnknownText_0x1981e6, UnknownText_0x19835b
 	setlasttalked $b
-	scriptedtrainerdata RIVAL1, RIVAL1_6
+	loadtrainer RIVAL1, RIVAL1_6
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -81,7 +81,7 @@ UnknownScript_0x198049:
 UnknownScript_0x198071:
 	winlosstext UnknownText_0x1981e6, UnknownText_0x19835b
 	setlasttalked $b
-	scriptedtrainerdata RIVAL1, RIVAL1_4
+	loadtrainer RIVAL1, RIVAL1_4
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -90,7 +90,7 @@ UnknownScript_0x198071:
 UnknownScript_0x198081:
 	winlosstext UnknownText_0x1981e6, UnknownText_0x19835b
 	setlasttalked $b
-	scriptedtrainerdata RIVAL1, RIVAL1_5
+	loadtrainer RIVAL1, RIVAL1_5
 	startbattle
 	reloadmapmusic
 	returnafterbattle

maps/BlackthornGym1F.asm

@@ -41,7 +41,7 @@ ClairScript_0x194e24:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x194fd6, 0
-	scriptedtrainerdata CLAIR, 1
+	loadtrainer CLAIR, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_CLAIR

maps/BrunosRoom.asm

@@ -56,7 +56,7 @@ BrunoScript_0x1809c5:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x180b23, 0
-	scriptedtrainerdata BRUNO, 1
+	loadtrainer BRUNO, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_ELITE_4_BRUNO

maps/BurnedTower1F.asm

@@ -56,7 +56,7 @@ UnknownScript_0x185c0d:
 
 UnknownScript_0x185c25:
 	showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	spriteface BURNEDTOWER1F_SILVER, RIGHT
 	pause 15
@@ -73,7 +73,7 @@ UnknownScript_0x185c25:
 	iftrue UnknownScript_0x185c70
 	winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
 	setlasttalked $4
-	scriptedtrainerdata RIVAL1, RIVAL1_9
+	loadtrainer RIVAL1, RIVAL1_9
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -82,7 +82,7 @@ UnknownScript_0x185c25:
 UnknownScript_0x185c60:
 	winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
 	setlasttalked $4
-	scriptedtrainerdata RIVAL1, RIVAL1_7
+	loadtrainer RIVAL1, RIVAL1_7
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -91,7 +91,7 @@ UnknownScript_0x185c60:
 UnknownScript_0x185c70:
 	winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
 	setlasttalked $4
-	scriptedtrainerdata RIVAL1, RIVAL1_8
+	loadtrainer RIVAL1, RIVAL1_8
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -105,7 +105,7 @@ UnknownScript_0x185c80:
 	closetext
 	dotrigger $2
 	setevent EVENT_RIVAL_BURNED_TOWER
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	earthquake 50
 	showemote EMOTE_SHOCK, PLAYER, 15

maps/CeladonGym.asm

@@ -22,7 +22,7 @@ ErikaScript_0x72a6a:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x72c3e, 0
-	scriptedtrainerdata ERIKA, 1
+	loadtrainer ERIKA, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_ERIKA

maps/CeruleanGym.asm

@@ -69,7 +69,7 @@ MistyScript_0x188432:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x18870c, 0
-	scriptedtrainerdata MISTY, 1
+	loadtrainer MISTY, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_MISTY

maps/CherrygroveCity.asm

@@ -110,7 +110,7 @@ UnknownScript_0x19c0aa:
 UnknownScript_0x19c0ae:
 	spriteface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	appear CHERRYGROVECITY_SILVER
 	applymovement CHERRYGROVECITY_SILVER, MovementData_0x19c1ce
@@ -126,7 +126,7 @@ UnknownScript_0x19c0ae:
 	iftrue UnknownScript_0x19c104
 	winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
 	setlasttalked $3
-	scriptedtrainerdata RIVAL1, RIVAL1_3
+	loadtrainer RIVAL1, RIVAL1_3
 	writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
 	startbattle
 	reloadmapmusic
@@ -137,7 +137,7 @@ UnknownScript_0x19c0ae:
 UnknownScript_0x19c0ee:
 	winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
 	setlasttalked $3
-	scriptedtrainerdata RIVAL1, RIVAL1_1
+	loadtrainer RIVAL1, RIVAL1_1
 	writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
 	startbattle
 	reloadmapmusic
@@ -148,7 +148,7 @@ UnknownScript_0x19c0ee:
 UnknownScript_0x19c104:
 	winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
 	setlasttalked $3
-	scriptedtrainerdata RIVAL1, RIVAL1_2
+	loadtrainer RIVAL1, RIVAL1_2
 	writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
 	startbattle
 	reloadmapmusic

maps/CianwoodCity.asm

@@ -68,7 +68,7 @@ UnknownScript_0x1a001e:
 	closetext
 	winlosstext UnknownText_0x1a05a1, 0
 	setlasttalked $c
-	scriptedtrainerdata MYSTICALMAN, EUSINE
+	loadtrainer MYSTICALMAN, EUSINE
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -80,7 +80,7 @@ UnknownScript_0x1a001e:
 	applymovement CIANWOODCITY_SUPER_NERD, MovementData_0x1a00ec
 	disappear CIANWOODCITY_SUPER_NERD
 	pause 20
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	playmapmusic
 	pause 10
 .Done

maps/CianwoodGym.asm

@@ -40,7 +40,7 @@ ChuckScript_0x9d60f:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x9d7f6, 0
-	scriptedtrainerdata CHUCK, 1
+	loadtrainer CHUCK, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_CHUCK

maps/DragonShrine.asm

@@ -136,7 +136,7 @@ DragonShrineTestScript:
 	writetext UnknownText_0x18d916
 	waitbutton
 	closetext
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2da
 	loadfont
 	writetext UnknownText_0x18d974

maps/DragonsDenB1F.asm

@@ -81,7 +81,7 @@ UnknownScript_0x18c8f4:
 	closetext
 UnknownScript_0x18c8f9:
 	applymovement DRAGONSDENB1F_CLAIR, MovementData_0x18c9b3
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 30
 	special RestartMapMusic
 	disappear DRAGONSDENB1F_CLAIR

maps/EcruteakGym.asm

@@ -34,7 +34,7 @@ MortyScript_0x99d58:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x9a00a, 0
-	scriptedtrainerdata MORTY, 1
+	loadtrainer MORTY, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_MORTY

maps/FastShipCabins_NNW_NNE_NE.asm

@@ -88,7 +88,7 @@ SailorScript_0x755f1:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x75897, 0
-	scriptedtrainerdata SAILOR, STANLY
+	loadtrainer SAILOR, STANLY
 	startbattle
 	reloadmap
 	special HealParty

maps/FuchsiaGym.asm

@@ -23,7 +23,7 @@ JanineScript_0x195db9:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x195fa1, 0
-	scriptedtrainerdata JANINE, 1
+	loadtrainer JANINE, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_JANINE
@@ -75,7 +75,7 @@ UnknownScript_0x195e2c:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x196126, 0
-	scriptedtrainerdata LASS, ALICE
+	loadtrainer LASS, ALICE
 	startbattle
 	iftrue UnknownScript_0x195e4a
 	returnafterbattle
@@ -109,7 +109,7 @@ UnknownScript_0x195e66:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x19617b, 0
-	scriptedtrainerdata LASS, LINDA
+	loadtrainer LASS, LINDA
 	startbattle
 	iftrue UnknownScript_0x195e84
 	returnafterbattle
@@ -143,7 +143,7 @@ UnknownScript_0x195ea0:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x1961f1, 0
-	scriptedtrainerdata PICNICKER, CINDY
+	loadtrainer PICNICKER, CINDY
 	startbattle
 	iftrue UnknownScript_0x195ebe
 	returnafterbattle
@@ -177,7 +177,7 @@ UnknownScript_0x195eda:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x19624a, 0
-	scriptedtrainerdata CAMPER, BARRY
+	loadtrainer CAMPER, BARRY
 	startbattle
 	iftrue UnknownScript_0x195ef8
 	returnafterbattle

maps/GoldenrodGym.asm

@@ -32,7 +32,7 @@ WhitneyScript_0x5400c:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x541a5, 0
-	scriptedtrainerdata WHITNEY, 1
+	loadtrainer WHITNEY, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_WHITNEY

maps/IlexForest.asm

@@ -464,14 +464,14 @@ MapIlexForestSignpost4Script:
 	closetext
 	pause 20
 	showemote EMOTE_SHOCK, PLAYER, 20
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	applymovement PLAYER, MovementData_0x6ef58
 	pause 30
 	spriteface PLAYER, DOWN
 	pause 20
 	clearflag ENGINE_HAVE_EXAMINED_GS_BALL
 	special Special_CelebiShrineEvent
-	scriptedpokedata CELEBI, 30
+	loadwildmon CELEBI, 30
 	startbattle
 	returnafterbattle
 	pause 20

maps/IndigoPlateauPokeCenter1F.asm

@@ -63,7 +63,7 @@ UnknownScript_0x180053:
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
 	spriteface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x180164
 	playmusic MUSIC_RIVAL_ENCOUNTER
@@ -84,7 +84,7 @@ UnknownScript_0x180094:
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
 	spriteface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x18016b
 	playmusic MUSIC_RIVAL_ENCOUNTER
@@ -101,7 +101,7 @@ UnknownScript_0x1800ce:
 	iftrue UnknownScript_0x180103
 	winlosstext UnknownText_0x180295, UnknownText_0x1802fd
 	setlasttalked $5
-	scriptedtrainerdata RIVAL2, 6
+	loadtrainer RIVAL2, 6
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -110,7 +110,7 @@ UnknownScript_0x1800ce:
 UnknownScript_0x1800f3:
 	winlosstext UnknownText_0x180295, UnknownText_0x1802fd
 	setlasttalked $5
-	scriptedtrainerdata RIVAL2, 4
+	loadtrainer RIVAL2, 4
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -119,7 +119,7 @@ UnknownScript_0x1800f3:
 UnknownScript_0x180103:
 	winlosstext UnknownText_0x180295, UnknownText_0x1802fd
 	setlasttalked $5
-	scriptedtrainerdata RIVAL2, 5
+	loadtrainer RIVAL2, 5
 	startbattle
 	reloadmapmusic
 	returnafterbattle

maps/KarensRoom.asm

@@ -56,7 +56,7 @@ KarenScript_0x180bee:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x180cf8, 0
-	scriptedtrainerdata KAREN, 1
+	loadtrainer KAREN, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_ELITE_4_KAREN

maps/KogasRoom.asm

@@ -56,7 +56,7 @@ KogaScript_0x18075a:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x1808a9, 0
-	scriptedtrainerdata KOGA, 1
+	loadtrainer KOGA, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_ELITE_4_KOGA

maps/KurtsHouse.asm

@@ -47,7 +47,7 @@ KurtScript_0x18e178:
 	writetext UnknownText_0x18e473
 	waitbutton
 	closetext
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
 	checkcode VAR_FACING
 	if_equal UP, .RunAround
@@ -294,7 +294,7 @@ KurtScript_0x18e178:
 	setevent EVENT_FOREST_IS_RESTLESS
 	clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
 	clearevent EVENT_GAVE_GS_BALL_TO_KURT
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 20
 	showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30
 	checkcode VAR_FACING

maps/LakeofRage.asm

@@ -91,7 +91,7 @@ GyaradosScript_0x70063:
 	pause 15
 	cry GYARADOS
 	closetext
-	scriptedpokedata GYARADOS, 30
+	loadwildmon GYARADOS, 30
 	writecode VAR_BATTLETYPE, BATTLETYPE_SHINY
 	startbattle
 	if_equal $1, UnknownScript_0x7007a

maps/LancesRoom.asm

@@ -49,12 +49,12 @@ UnknownScript_0x180e53:
 	end
 
 UnknownScript_0x180e6a:
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	applymovement PLAYER, MovementData_0x180f38
 	jump LanceScript_0x180e7b
 
 UnknownScript_0x180e74:
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	applymovement PLAYER, MovementData_0x180f3c
 LanceScript_0x180e7b:
 	spriteface LANCESROOM_LANCE, LEFT
@@ -64,7 +64,7 @@ LanceScript_0x180e7b:
 	closetext
 	winlosstext UnknownText_0x1810a4, 0
 	setlasttalked $2
-	scriptedtrainerdata CHAMPION, LANCE
+	loadtrainer CHAMPION, LANCE
 	startbattle
 	reloadmapmusic
 	returnafterbattle

maps/MahoganyGym.asm

@@ -23,7 +23,7 @@ PryceScript_0x199a9e:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x199cb3, 0
-	scriptedtrainerdata PRYCE, 1
+	loadtrainer PRYCE, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_PRYCE

maps/MountMoon.asm

@@ -22,7 +22,7 @@ UnknownScript_0x7408d:
 UnknownScript_0x7408e:
 	spriteface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	applymovement MOUNTMOON_SILVER, MovementData_0x740f9
 	playmusic MUSIC_RIVAL_ENCOUNTER
@@ -36,7 +36,7 @@ UnknownScript_0x7408e:
 	iftrue UnknownScript_0x740d3
 	winlosstext UnknownText_0x7419d, UnknownText_0x742e0
 	setlasttalked $2
-	scriptedtrainerdata RIVAL2, 3
+	loadtrainer RIVAL2, 3
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -45,7 +45,7 @@ UnknownScript_0x7408e:
 UnknownScript_0x740c3:
 	winlosstext UnknownText_0x7419d, UnknownText_0x742e0
 	setlasttalked $2
-	scriptedtrainerdata RIVAL2, 1
+	loadtrainer RIVAL2, 1
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -54,7 +54,7 @@ UnknownScript_0x740c3:
 UnknownScript_0x740d3:
 	winlosstext UnknownText_0x7419d, UnknownText_0x742e0
 	setlasttalked $2
-	scriptedtrainerdata RIVAL2, 2
+	loadtrainer RIVAL2, 2
 	startbattle
 	reloadmapmusic
 	returnafterbattle

maps/MountMortarB1F.asm

@@ -25,7 +25,7 @@ BlackBeltScript_0x7e1f6:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x7e2a9, 0
-	scriptedtrainerdata BLACKBELT_T, KIYO
+	loadtrainer BLACKBELT_T, KIYO
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_BLACKBELT_KIYO

maps/NationalPark.asm

@@ -122,7 +122,7 @@ UnknownScript_0x5c088:
 	checkflag ENGINE_FLYPOINT_OLIVINE
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata SCHOOLBOY, JACK1
+	loadtrainer SCHOOLBOY, JACK1
 	startbattle
 	returnafterbattle
 	loadvar wJackFightCount, 1
@@ -130,7 +130,7 @@ UnknownScript_0x5c088:
 	end
 
 .LoadFight1
-	scriptedtrainerdata SCHOOLBOY, JACK2
+	loadtrainer SCHOOLBOY, JACK2
 	startbattle
 	returnafterbattle
 	loadvar wJackFightCount, 2
@@ -138,7 +138,7 @@ UnknownScript_0x5c088:
 	end
 
 .LoadFight2
-	scriptedtrainerdata SCHOOLBOY, JACK3
+	loadtrainer SCHOOLBOY, JACK3
 	startbattle
 	returnafterbattle
 	loadvar wJackFightCount, 3
@@ -146,7 +146,7 @@ UnknownScript_0x5c088:
 	end
 
 .LoadFight3
-	scriptedtrainerdata SCHOOLBOY, JACK4
+	loadtrainer SCHOOLBOY, JACK4
 	startbattle
 	returnafterbattle
 	loadvar wJackFightCount, 4
@@ -154,7 +154,7 @@ UnknownScript_0x5c088:
 	end
 
 .LoadFight4
-	scriptedtrainerdata SCHOOLBOY, JACK5
+	loadtrainer SCHOOLBOY, JACK5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_JACK

maps/OlivineCity.asm

@@ -31,7 +31,7 @@ OlivineCity_MapScriptHeader:
 UnknownScript_0x1a8833:
 	spriteface PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	playsound SFX_ENTER_DOOR
 	appear OLIVINECITY_OLIVINE_RIVAL
@@ -55,7 +55,7 @@ UnknownScript_0x1a8833:
 UnknownScript_0x1a886b:
 	spriteface PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	playsound SFX_ENTER_DOOR
 	appear OLIVINECITY_OLIVINE_RIVAL

maps/OlivineGym.asm

@@ -18,7 +18,7 @@ JasmineScript_0x9c12f:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x9c2bb, 0
-	scriptedtrainerdata JASMINE, 1
+	loadtrainer JASMINE, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_JASMINE

maps/OlivineLighthouse2F.asm

@@ -65,7 +65,7 @@ UnknownScript_0x5afc7:
 	checkevent EVENT_CLEARED_RADIO_TOWER
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata SAILOR, HUEY1
+	loadtrainer SAILOR, HUEY1
 	startbattle
 	returnafterbattle
 	loadvar wHueyFightCount, 1
@@ -73,7 +73,7 @@ UnknownScript_0x5afc7:
 	end
 
 .LoadFight1
-	scriptedtrainerdata SAILOR, HUEY2
+	loadtrainer SAILOR, HUEY2
 	startbattle
 	returnafterbattle
 	loadvar wHueyFightCount, 2
@@ -81,7 +81,7 @@ UnknownScript_0x5afc7:
 	end
 
 .LoadFight2
-	scriptedtrainerdata SAILOR, HUEY3
+	loadtrainer SAILOR, HUEY3
 	startbattle
 	returnafterbattle
 	loadvar wHueyFightCount, 3
@@ -89,7 +89,7 @@ UnknownScript_0x5afc7:
 	end
 
 .LoadFight3
-	scriptedtrainerdata SAILOR, HUEY4
+	loadtrainer SAILOR, HUEY4
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_HUEY

maps/PewterGym.asm

@@ -19,7 +19,7 @@ BrockScript_0x1a2864:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x1a29bb, 0
-	scriptedtrainerdata BROCK, 1
+	loadtrainer BROCK, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_BROCK

maps/RadioTower2F.asm

@@ -153,7 +153,7 @@ UnknownScript_0x5d7be:
 	writetext UnknownText_0x5e054
 	waitbutton
 	closetext
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 20
 	special RestartMapMusic
 	checkcode VAR_BLUECARDBALANCE
@@ -182,7 +182,7 @@ UnknownScript_0x5d81e:
 	waitbutton
 	closetext
 	spriteface RADIOTOWER2F_BUENA, RIGHT
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 20
 	special RestartMapMusic
 	end
@@ -213,7 +213,7 @@ UnknownScript_0x5d845:
 	waitbutton
 	closetext
 	spriteface RADIOTOWER2F_BUENA, RIGHT
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 20
 	special RestartMapMusic
 	end

maps/RadioTower5F.asm

@@ -41,7 +41,7 @@ UnknownScript_0x60011:
 	closetext
 	winlosstext UnknownText_0x60223, 0
 	setlasttalked $2
-	scriptedtrainerdata EXECUTIVEM, 3
+	loadtrainer EXECUTIVEM, 3
 	startbattle
 	returnafterbattle
 	loadfont
@@ -90,7 +90,7 @@ UnknownScript_0x6006e:
 	closetext
 	winlosstext UnknownText_0x604f3, 0
 	setlasttalked $3
-	scriptedtrainerdata EXECUTIVEM, 1
+	loadtrainer EXECUTIVEM, 1
 	startbattle
 	returnafterbattle
 	loadfont

maps/Route24.asm

@@ -16,7 +16,7 @@ RocketScript_0x1adbfa:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x1add67, -1
-	scriptedtrainerdata GRUNTM, 31
+	loadtrainer GRUNTM, 31
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -24,7 +24,7 @@ RocketScript_0x1adbfa:
 	loadfont
 	writetext UnknownText_0x1addc0
 	buttonsound
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	writetext UnknownText_0x1adee1
 	waitbutton
 	closetext

maps/Route25.asm

@@ -174,7 +174,7 @@ UnknownScript_0x19efc7:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x19f4fd, 0
-	scriptedtrainerdata COOLTRAINERM, KEVIN
+	loadtrainer COOLTRAINERM, KEVIN
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_COOLTRAINERM_KEVIN

maps/Route26.asm

@@ -69,7 +69,7 @@ UnknownScript_0x1a4d79:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata COOLTRAINERM, GAVEN3
+	loadtrainer COOLTRAINERM, GAVEN3
 	startbattle
 	returnafterbattle
 	loadvar wGavenFightCount, 1
@@ -77,7 +77,7 @@ UnknownScript_0x1a4d79:
 	end
 
 .LoadFight1
-	scriptedtrainerdata COOLTRAINERM, GAVEN1
+	loadtrainer COOLTRAINERM, GAVEN1
 	startbattle
 	returnafterbattle
 	loadvar wGavenFightCount, 2
@@ -85,7 +85,7 @@ UnknownScript_0x1a4d79:
 	end
 
 .LoadFight2
-	scriptedtrainerdata COOLTRAINERM, GAVEN2
+	loadtrainer COOLTRAINERM, GAVEN2
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_GAVEN
@@ -173,7 +173,7 @@ UnknownScript_0x1a4e35:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata COOLTRAINERF, BETH1
+	loadtrainer COOLTRAINERF, BETH1
 	startbattle
 	returnafterbattle
 	loadvar wBethFightCount, 1
@@ -181,7 +181,7 @@ UnknownScript_0x1a4e35:
 	end
 
 .LoadFight1
-	scriptedtrainerdata COOLTRAINERF, BETH2
+	loadtrainer COOLTRAINERF, BETH2
 	startbattle
 	returnafterbattle
 	loadvar wBethFightCount, 2
@@ -189,7 +189,7 @@ UnknownScript_0x1a4e35:
 	end
 
 .LoadFight2
-	scriptedtrainerdata COOLTRAINERF, BETH3
+	loadtrainer COOLTRAINERF, BETH3
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_BETH

maps/Route27.asm

@@ -106,7 +106,7 @@ UnknownScript_0x1a08ff:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata BIRD_KEEPER, JOSE2
+	loadtrainer BIRD_KEEPER, JOSE2
 	startbattle
 	returnafterbattle
 	loadvar wJoseFightCount, 1
@@ -114,7 +114,7 @@ UnknownScript_0x1a08ff:
 	end
 
 .LoadFight1
-	scriptedtrainerdata BIRD_KEEPER, JOSE1
+	loadtrainer BIRD_KEEPER, JOSE1
 	startbattle
 	returnafterbattle
 	loadvar wJoseFightCount, 2
@@ -122,7 +122,7 @@ UnknownScript_0x1a08ff:
 	end
 
 .LoadFight2
-	scriptedtrainerdata BIRD_KEEPER, JOSE3
+	loadtrainer BIRD_KEEPER, JOSE3
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_JOSE
@@ -239,7 +239,7 @@ UnknownScript_0x1a09e9:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata COOLTRAINERF, REENA1
+	loadtrainer COOLTRAINERF, REENA1
 	startbattle
 	returnafterbattle
 	loadvar wReenaFightCount, 1
@@ -247,7 +247,7 @@ UnknownScript_0x1a09e9:
 	end
 
 .LoadFight1
-	scriptedtrainerdata COOLTRAINERF, REENA2
+	loadtrainer COOLTRAINERF, REENA2
 	startbattle
 	returnafterbattle
 	loadvar wReenaFightCount, 2
@@ -255,7 +255,7 @@ UnknownScript_0x1a09e9:
 	end
 
 .LoadFight2
-	scriptedtrainerdata COOLTRAINERF, REENA3
+	loadtrainer COOLTRAINERF, REENA3
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_REENA

maps/Route29.asm

@@ -57,7 +57,7 @@ UnknownScript_0x1a0f6d:
 	follow ROUTE29_COOLTRAINER_M1, PLAYER
 	applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a109a
 	stopfollow
-	scriptedpokedata RATTATA, 5
+	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
 	spriteface ROUTE29_COOLTRAINER_M1, UP
 	loadfont
@@ -82,7 +82,7 @@ UnknownScript_0x1a0fa3:
 	follow ROUTE29_COOLTRAINER_M1, PLAYER
 	applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a10a1
 	stopfollow
-	scriptedpokedata RATTATA, 5
+	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
 	spriteface ROUTE29_COOLTRAINER_M1, UP
 	loadfont
@@ -122,7 +122,7 @@ CooltrainerMScript_0x1a0ff1:
 	yesorno
 	iffalse UnknownScript_0x1a1022
 	closetext
-	scriptedpokedata RATTATA, 5
+	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
 	loadfont
 	writetext UnknownText_0x1a114d

maps/Route30.asm

@@ -89,7 +89,7 @@ UnknownScript_0x1a16e0:
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata YOUNGSTER, JOEY1
+	loadtrainer YOUNGSTER, JOEY1
 	startbattle
 	returnafterbattle
 	loadvar wJoeyFightCount, 1
@@ -97,7 +97,7 @@ UnknownScript_0x1a16e0:
 	end
 
 .LoadFight1
-	scriptedtrainerdata YOUNGSTER, JOEY2
+	loadtrainer YOUNGSTER, JOEY2
 	startbattle
 	returnafterbattle
 	loadvar wJoeyFightCount, 2
@@ -105,7 +105,7 @@ UnknownScript_0x1a16e0:
 	end
 
 .LoadFight2
-	scriptedtrainerdata YOUNGSTER, JOEY3
+	loadtrainer YOUNGSTER, JOEY3
 	startbattle
 	returnafterbattle
 	loadvar wJoeyFightCount, 3
@@ -113,7 +113,7 @@ UnknownScript_0x1a16e0:
 	end
 
 .LoadFight3
-	scriptedtrainerdata YOUNGSTER, JOEY4
+	loadtrainer YOUNGSTER, JOEY4
 	startbattle
 	returnafterbattle
 	loadvar wJoeyFightCount, 4
@@ -121,7 +121,7 @@ UnknownScript_0x1a16e0:
 	end
 
 .LoadFight4
-	scriptedtrainerdata YOUNGSTER, JOEY5
+	loadtrainer YOUNGSTER, JOEY5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_JOEY

maps/Route31.asm

@@ -80,7 +80,7 @@ Bug_catcherWade1Script:
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata BUG_CATCHER, WADE1
+	loadtrainer BUG_CATCHER, WADE1
 	startbattle
 	returnafterbattle
 	loadvar wWadeFightCount, 1
@@ -88,7 +88,7 @@ Bug_catcherWade1Script:
 	end
 
 .LoadFight1
-	scriptedtrainerdata BUG_CATCHER, WADE2
+	loadtrainer BUG_CATCHER, WADE2
 	startbattle
 	returnafterbattle
 	loadvar wWadeFightCount, 2
@@ -96,7 +96,7 @@ Bug_catcherWade1Script:
 	end
 
 .LoadFight2
-	scriptedtrainerdata BUG_CATCHER, WADE3
+	loadtrainer BUG_CATCHER, WADE3
 	startbattle
 	returnafterbattle
 	loadvar wWadeFightCount, 3
@@ -104,7 +104,7 @@ Bug_catcherWade1Script:
 	end
 
 .LoadFight3
-	scriptedtrainerdata BUG_CATCHER, WADE4
+	loadtrainer BUG_CATCHER, WADE4
 	startbattle
 	returnafterbattle
 	loadvar wWadeFightCount, 4
@@ -112,7 +112,7 @@ Bug_catcherWade1Script:
 	end
 
 .LoadFight4
-	scriptedtrainerdata BUG_CATCHER, WADE5
+	loadtrainer BUG_CATCHER, WADE5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_WADE

maps/Route32.asm

@@ -223,7 +223,7 @@ UnknownScript_0x19057d:
 	checkflag ENGINE_FLYPOINT_ECRUTEAK
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata FISHER, RALPH1
+	loadtrainer FISHER, RALPH1
 	startbattle
 	returnafterbattle
 	loadvar wRalphFightCount, 1
@@ -231,7 +231,7 @@ UnknownScript_0x19057d:
 	end
 
 .LoadFight1
-	scriptedtrainerdata FISHER, RALPH2
+	loadtrainer FISHER, RALPH2
 	startbattle
 	returnafterbattle
 	loadvar wRalphFightCount, 2
@@ -239,7 +239,7 @@ UnknownScript_0x19057d:
 	end
 
 .LoadFight2
-	scriptedtrainerdata FISHER, RALPH3
+	loadtrainer FISHER, RALPH3
 	startbattle
 	returnafterbattle
 	loadvar wRalphFightCount, 3
@@ -247,7 +247,7 @@ UnknownScript_0x19057d:
 	end
 
 .LoadFight3
-	scriptedtrainerdata FISHER, RALPH4
+	loadtrainer FISHER, RALPH4
 	startbattle
 	returnafterbattle
 	loadvar wRalphFightCount, 4
@@ -255,7 +255,7 @@ UnknownScript_0x19057d:
 	end
 
 .LoadFight4
-	scriptedtrainerdata FISHER, RALPH5
+	loadtrainer FISHER, RALPH5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_RALPH
@@ -357,7 +357,7 @@ UnknownScript_0x19066d:
 	checkflag ENGINE_FLYPOINT_ECRUTEAK
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata PICNICKER, LIZ1
+	loadtrainer PICNICKER, LIZ1
 	startbattle
 	returnafterbattle
 	loadvar wLizFightCount, 1
@@ -365,7 +365,7 @@ UnknownScript_0x19066d:
 	end
 
 .LoadFight1
-	scriptedtrainerdata PICNICKER, LIZ2
+	loadtrainer PICNICKER, LIZ2
 	startbattle
 	returnafterbattle
 	loadvar wLizFightCount, 2
@@ -373,7 +373,7 @@ UnknownScript_0x19066d:
 	end
 
 .LoadFight2
-	scriptedtrainerdata PICNICKER, LIZ3
+	loadtrainer PICNICKER, LIZ3
 	startbattle
 	returnafterbattle
 	loadvar wLizFightCount, 3
@@ -381,7 +381,7 @@ UnknownScript_0x19066d:
 	end
 
 .LoadFight3
-	scriptedtrainerdata PICNICKER, LIZ4
+	loadtrainer PICNICKER, LIZ4
 	startbattle
 	returnafterbattle
 	loadvar wLizFightCount, 4
@@ -389,7 +389,7 @@ UnknownScript_0x19066d:
 	end
 
 .LoadFight4
-	scriptedtrainerdata PICNICKER, LIZ5
+	loadtrainer PICNICKER, LIZ5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_LIZ

maps/Route33.asm

@@ -66,7 +66,7 @@ UnknownScript_0x1ac051:
 	checkflag ENGINE_FLYPOINT_OLIVINE
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata HIKER, ANTHONY2
+	loadtrainer HIKER, ANTHONY2
 	startbattle
 	returnafterbattle
 	loadvar wAnthonyFightCount, 1
@@ -74,7 +74,7 @@ UnknownScript_0x1ac051:
 	end
 
 .LoadFight1
-	scriptedtrainerdata HIKER, ANTHONY1
+	loadtrainer HIKER, ANTHONY1
 	startbattle
 	returnafterbattle
 	loadvar wAnthonyFightCount, 2
@@ -82,7 +82,7 @@ UnknownScript_0x1ac051:
 	end
 
 .LoadFight2
-	scriptedtrainerdata HIKER, ANTHONY3
+	loadtrainer HIKER, ANTHONY3
 	startbattle
 	returnafterbattle
 	loadvar wAnthonyFightCount, 3
@@ -90,7 +90,7 @@ UnknownScript_0x1ac051:
 	end
 
 .LoadFight3
-	scriptedtrainerdata HIKER, ANTHONY4
+	loadtrainer HIKER, ANTHONY4
 	startbattle
 	returnafterbattle
 	loadvar wAnthonyFightCount, 4
@@ -98,7 +98,7 @@ UnknownScript_0x1ac051:
 	end
 
 .LoadFight4
-	scriptedtrainerdata HIKER, ANTHONY5
+	loadtrainer HIKER, ANTHONY5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_ANTHONY

maps/Route34.asm

@@ -143,7 +143,7 @@ UnknownScript_0x780bd:
 	checkflag ENGINE_FLYPOINT_CIANWOOD
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata CAMPER, TODD1
+	loadtrainer CAMPER, TODD1
 	startbattle
 	returnafterbattle
 	loadvar wToddFightCount, 1
@@ -151,7 +151,7 @@ UnknownScript_0x780bd:
 	end
 
 .LoadFight1
-	scriptedtrainerdata CAMPER, TODD2
+	loadtrainer CAMPER, TODD2
 	startbattle
 	returnafterbattle
 	loadvar wToddFightCount, 2
@@ -159,7 +159,7 @@ UnknownScript_0x780bd:
 	end
 
 .LoadFight2
-	scriptedtrainerdata CAMPER, TODD3
+	loadtrainer CAMPER, TODD3
 	startbattle
 	returnafterbattle
 	loadvar wToddFightCount, 3
@@ -167,7 +167,7 @@ UnknownScript_0x780bd:
 	end
 
 .LoadFight3
-	scriptedtrainerdata CAMPER, TODD4
+	loadtrainer CAMPER, TODD4
 	startbattle
 	returnafterbattle
 	loadvar wToddFightCount, 4
@@ -175,7 +175,7 @@ UnknownScript_0x780bd:
 	end
 
 .LoadFight4
-	scriptedtrainerdata CAMPER, TODD5
+	loadtrainer CAMPER, TODD5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_TODD
@@ -268,7 +268,7 @@ UnknownScript_0x7819f:
 	checkflag ENGINE_FLYPOINT_MAHOGANY
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata PICNICKER, GINA1
+	loadtrainer PICNICKER, GINA1
 	startbattle
 	returnafterbattle
 	loadvar wGinaFightCount, 1
@@ -276,7 +276,7 @@ UnknownScript_0x7819f:
 	end
 
 .LoadFight1
-	scriptedtrainerdata PICNICKER, GINA2
+	loadtrainer PICNICKER, GINA2
 	startbattle
 	returnafterbattle
 	loadvar wGinaFightCount, 2
@@ -284,7 +284,7 @@ UnknownScript_0x7819f:
 	end
 
 .LoadFight2
-	scriptedtrainerdata PICNICKER, GINA3
+	loadtrainer PICNICKER, GINA3
 	startbattle
 	returnafterbattle
 	loadvar wGinaFightCount, 3
@@ -292,7 +292,7 @@ UnknownScript_0x7819f:
 	end
 
 .LoadFight3
-	scriptedtrainerdata PICNICKER, GINA4
+	loadtrainer PICNICKER, GINA4
 	startbattle
 	returnafterbattle
 	loadvar wGinaFightCount, 4
@@ -300,7 +300,7 @@ UnknownScript_0x7819f:
 	end
 
 .LoadFight4
-	scriptedtrainerdata PICNICKER, GINA5
+	loadtrainer PICNICKER, GINA5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_GINA
@@ -365,7 +365,7 @@ OfficerScript_0x7824c:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x78609, 0
-	scriptedtrainerdata OFFICER, KEITH
+	loadtrainer OFFICER, KEITH
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_OFFICER_KEITH

maps/Route35.asm

@@ -181,7 +181,7 @@ UnknownScript_0x19c9bb:
 	checkflag ENGINE_FLYPOINT_LAKE_OF_RAGE
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata BUG_CATCHER, ARNIE1
+	loadtrainer BUG_CATCHER, ARNIE1
 	startbattle
 	returnafterbattle
 	loadvar wArnieFightCount, 1
@@ -189,7 +189,7 @@ UnknownScript_0x19c9bb:
 	end
 
 .LoadFight1
-	scriptedtrainerdata BUG_CATCHER, ARNIE2
+	loadtrainer BUG_CATCHER, ARNIE2
 	startbattle
 	returnafterbattle
 	loadvar wArnieFightCount, 2
@@ -197,7 +197,7 @@ UnknownScript_0x19c9bb:
 	end
 
 .LoadFight2
-	scriptedtrainerdata BUG_CATCHER, ARNIE3
+	loadtrainer BUG_CATCHER, ARNIE3
 	startbattle
 	returnafterbattle
 	loadvar wArnieFightCount, 3
@@ -205,7 +205,7 @@ UnknownScript_0x19c9bb:
 	end
 
 .LoadFight3
-	scriptedtrainerdata BUG_CATCHER, ARNIE4
+	loadtrainer BUG_CATCHER, ARNIE4
 	startbattle
 	returnafterbattle
 	loadvar wArnieFightCount, 4
@@ -213,7 +213,7 @@ UnknownScript_0x19c9bb:
 	end
 
 .LoadFight4
-	scriptedtrainerdata BUG_CATCHER, ARNIE5
+	loadtrainer BUG_CATCHER, ARNIE5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_ARNIE
@@ -248,7 +248,7 @@ OfficerScript_0x19ca49:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x19cf06, 0
-	scriptedtrainerdata OFFICER, DIRK
+	loadtrainer OFFICER, DIRK
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_OFFICER_DIRK

maps/Route36.asm

@@ -82,7 +82,7 @@ WateredWeirdTreeScript::
 	writetext UnknownText_0x1942aa
 	waitbutton
 	closetext
-	scriptedpokedata SUDOWOODO, 20
+	loadwildmon SUDOWOODO, 20
 	startbattle
 	setevent EVENT_FOUGHT_SUDOWOODO
 	if_equal $2, UnknownScript_0x19407b
@@ -225,7 +225,7 @@ UnknownScript_0x194140:
 	checkflag ENGINE_FLYPOINT_OLIVINE
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata SCHOOLBOY, ALAN1
+	loadtrainer SCHOOLBOY, ALAN1
 	startbattle
 	returnafterbattle
 	loadvar wAlanFightCount, 1
@@ -233,7 +233,7 @@ UnknownScript_0x194140:
 	end
 
 .LoadFight1
-	scriptedtrainerdata SCHOOLBOY, ALAN2
+	loadtrainer SCHOOLBOY, ALAN2
 	startbattle
 	returnafterbattle
 	loadvar wAlanFightCount, 2
@@ -241,7 +241,7 @@ UnknownScript_0x194140:
 	end
 
 .LoadFight2
-	scriptedtrainerdata SCHOOLBOY, ALAN3
+	loadtrainer SCHOOLBOY, ALAN3
 	startbattle
 	returnafterbattle
 	loadvar wAlanFightCount, 3
@@ -249,7 +249,7 @@ UnknownScript_0x194140:
 	end
 
 .LoadFight3
-	scriptedtrainerdata SCHOOLBOY, ALAN4
+	loadtrainer SCHOOLBOY, ALAN4
 	startbattle
 	returnafterbattle
 	loadvar wAlanFightCount, 4
@@ -257,7 +257,7 @@ UnknownScript_0x194140:
 	end
 
 .LoadFight4
-	scriptedtrainerdata SCHOOLBOY, ALAN5
+	loadtrainer SCHOOLBOY, ALAN5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_ALAN

maps/Route38.asm

@@ -89,7 +89,7 @@ TrainerLassDana1:
 	checkflag ENGINE_FLYPOINT_CIANWOOD
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata LASS, DANA1
+	loadtrainer LASS, DANA1
 	startbattle
 	returnafterbattle
 	loadvar wDanaFightCount, 1
@@ -97,7 +97,7 @@ TrainerLassDana1:
 	end
 
 .LoadFight1
-	scriptedtrainerdata LASS, DANA2
+	loadtrainer LASS, DANA2
 	startbattle
 	returnafterbattle
 	loadvar wDanaFightCount, 2
@@ -105,7 +105,7 @@ TrainerLassDana1:
 	end
 
 .LoadFight2
-	scriptedtrainerdata LASS, DANA3
+	loadtrainer LASS, DANA3
 	startbattle
 	returnafterbattle
 	loadvar wDanaFightCount, 3
@@ -113,7 +113,7 @@ TrainerLassDana1:
 	end
 
 .LoadFight3
-	scriptedtrainerdata LASS, DANA4
+	loadtrainer LASS, DANA4
 	startbattle
 	returnafterbattle
 	loadvar wDanaFightCount, 4
@@ -121,7 +121,7 @@ TrainerLassDana1:
 	end
 
 .LoadFight4
-	scriptedtrainerdata LASS, DANA5
+	loadtrainer LASS, DANA5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_DANA
@@ -225,7 +225,7 @@ TrainerSchoolboyChad1:
 	checkflag ENGINE_FLYPOINT_MAHOGANY
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata SCHOOLBOY, CHAD1
+	loadtrainer SCHOOLBOY, CHAD1
 	startbattle
 	returnafterbattle
 	loadvar wChadFightCount, 1
@@ -233,7 +233,7 @@ TrainerSchoolboyChad1:
 	end
 
 .LoadFight1
-	scriptedtrainerdata SCHOOLBOY, CHAD2
+	loadtrainer SCHOOLBOY, CHAD2
 	startbattle
 	returnafterbattle
 	loadvar wChadFightCount, 2
@@ -241,7 +241,7 @@ TrainerSchoolboyChad1:
 	end
 
 .LoadFight2
-	scriptedtrainerdata SCHOOLBOY, CHAD3
+	loadtrainer SCHOOLBOY, CHAD3
 	startbattle
 	returnafterbattle
 	loadvar wChadFightCount, 3
@@ -249,7 +249,7 @@ TrainerSchoolboyChad1:
 	end
 
 .LoadFight3
-	scriptedtrainerdata SCHOOLBOY, CHAD4
+	loadtrainer SCHOOLBOY, CHAD4
 	startbattle
 	returnafterbattle
 	loadvar wChadFightCount, 4
@@ -257,7 +257,7 @@ TrainerSchoolboyChad1:
 	end
 
 .LoadFight4
-	scriptedtrainerdata SCHOOLBOY, CHAD5
+	loadtrainer SCHOOLBOY, CHAD5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_CHAD

maps/Route39.asm

@@ -148,7 +148,7 @@ PokefanFScript_0x1a5bbe:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x1a5f17, 0
-	scriptedtrainerdata POKEFANF, JAIME
+	loadtrainer POKEFANF, JAIME
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_POKEFANF_JAIME

maps/Route42.asm

@@ -87,7 +87,7 @@ UnknownScript_0x1a927f:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata FISHER, TULLY1
+	loadtrainer FISHER, TULLY1
 	startbattle
 	returnafterbattle
 	loadvar wTullyFightCount, 1
@@ -95,7 +95,7 @@ UnknownScript_0x1a927f:
 	end
 
 .LoadFight1
-	scriptedtrainerdata FISHER, TULLY2
+	loadtrainer FISHER, TULLY2
 	startbattle
 	returnafterbattle
 	loadvar wTullyFightCount, 2
@@ -103,7 +103,7 @@ UnknownScript_0x1a927f:
 	end
 
 .LoadFight2
-	scriptedtrainerdata FISHER, TULLY3
+	loadtrainer FISHER, TULLY3
 	startbattle
 	returnafterbattle
 	loadvar wTullyFightCount, 3
@@ -111,7 +111,7 @@ UnknownScript_0x1a927f:
 	end
 
 .LoadFight3
-	scriptedtrainerdata FISHER, TULLY4
+	loadtrainer FISHER, TULLY4
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_TULLY

maps/Route43.asm

@@ -98,7 +98,7 @@ UnknownScript_0x19d0cf:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata POKEMANIAC, BRENT1
+	loadtrainer POKEMANIAC, BRENT1
 	startbattle
 	returnafterbattle
 	loadvar wBrentFightCount, 1
@@ -106,7 +106,7 @@ UnknownScript_0x19d0cf:
 	end
 
 .LoadFight1
-	scriptedtrainerdata POKEMANIAC, BRENT2
+	loadtrainer POKEMANIAC, BRENT2
 	startbattle
 	returnafterbattle
 	loadvar wBrentFightCount, 2
@@ -114,7 +114,7 @@ UnknownScript_0x19d0cf:
 	end
 
 .LoadFight2
-	scriptedtrainerdata POKEMANIAC, BRENT3
+	loadtrainer POKEMANIAC, BRENT3
 	startbattle
 	returnafterbattle
 	loadvar wBrentFightCount, 3
@@ -122,7 +122,7 @@ UnknownScript_0x19d0cf:
 	end
 
 .LoadFight3
-	scriptedtrainerdata POKEMANIAC, BRENT4
+	loadtrainer POKEMANIAC, BRENT4
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_BRENT
@@ -229,7 +229,7 @@ UnknownScript_0x19d1c1:
 	checkevent EVENT_CLEARED_RADIO_TOWER
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata PICNICKER, TIFFANY3
+	loadtrainer PICNICKER, TIFFANY3
 	startbattle
 	returnafterbattle
 	loadvar wTiffanyFightCount, 1
@@ -237,7 +237,7 @@ UnknownScript_0x19d1c1:
 	end
 
 .LoadFight1
-	scriptedtrainerdata PICNICKER, TIFFANY1
+	loadtrainer PICNICKER, TIFFANY1
 	startbattle
 	returnafterbattle
 	loadvar wTiffanyFightCount, 2
@@ -245,7 +245,7 @@ UnknownScript_0x19d1c1:
 	end
 
 .LoadFight2
-	scriptedtrainerdata PICNICKER, TIFFANY2
+	loadtrainer PICNICKER, TIFFANY2
 	startbattle
 	returnafterbattle
 	loadvar wTiffanyFightCount, 3
@@ -253,7 +253,7 @@ UnknownScript_0x19d1c1:
 	end
 
 .LoadFight3
-	scriptedtrainerdata PICNICKER, TIFFANY4
+	loadtrainer PICNICKER, TIFFANY4
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_TIFFANY

maps/Route44.asm

@@ -61,7 +61,7 @@ UnknownScript_0x19d86a:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata BIRD_KEEPER, VANCE1
+	loadtrainer BIRD_KEEPER, VANCE1
 	startbattle
 	returnafterbattle
 	loadvar wVanceFightCount, 1
@@ -69,7 +69,7 @@ UnknownScript_0x19d86a:
 	end
 
 .LoadFight1
-	scriptedtrainerdata BIRD_KEEPER, VANCE2
+	loadtrainer BIRD_KEEPER, VANCE2
 	startbattle
 	returnafterbattle
 	loadvar wVanceFightCount, 2
@@ -77,7 +77,7 @@ UnknownScript_0x19d86a:
 	end
 
 .LoadFight2
-	scriptedtrainerdata BIRD_KEEPER, VANCE3
+	loadtrainer BIRD_KEEPER, VANCE3
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_VANCE
@@ -205,7 +205,7 @@ UnknownScript_0x19d96e:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata FISHER, WILTON1
+	loadtrainer FISHER, WILTON1
 	startbattle
 	returnafterbattle
 	loadvar wWiltonFightCount, 1
@@ -213,7 +213,7 @@ UnknownScript_0x19d96e:
 	end
 
 .LoadFight1
-	scriptedtrainerdata FISHER, WILTON2
+	loadtrainer FISHER, WILTON2
 	startbattle
 	returnafterbattle
 	loadvar wWiltonFightCount, 2
@@ -221,7 +221,7 @@ UnknownScript_0x19d96e:
 	end
 
 .LoadFight2
-	scriptedtrainerdata FISHER, WILTON3
+	loadtrainer FISHER, WILTON3
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_WILTON

maps/Route45.asm

@@ -189,7 +189,7 @@ UnknownScript_0x19e1b8:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata HIKER, PARRY3
+	loadtrainer HIKER, PARRY3
 	startbattle
 	returnafterbattle
 	loadvar wParryFightCount, 1
@@ -197,7 +197,7 @@ UnknownScript_0x19e1b8:
 	end
 
 .LoadFight1
-	scriptedtrainerdata HIKER, PARRY1
+	loadtrainer HIKER, PARRY1
 	startbattle
 	returnafterbattle
 	loadvar wParryFightCount, 2
@@ -205,7 +205,7 @@ UnknownScript_0x19e1b8:
 	end
 
 .LoadFight2
-	scriptedtrainerdata HIKER, PARRY2
+	loadtrainer HIKER, PARRY2
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_PARRY
@@ -274,7 +274,7 @@ YoungsterScript_0x19e269:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x19e899, 0
-	scriptedtrainerdata CAMPER, QUENTIN
+	loadtrainer CAMPER, QUENTIN
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_CAMPER_QUENTIN

maps/Route46.asm

@@ -67,7 +67,7 @@ UnknownScript_0x1a96da:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight1
 .LoadFight0
-	scriptedtrainerdata PICNICKER, ERIN1
+	loadtrainer PICNICKER, ERIN1
 	startbattle
 	returnafterbattle
 	loadvar wErinFightCount, 1
@@ -75,7 +75,7 @@ UnknownScript_0x1a96da:
 	end
 
 .LoadFight1
-	scriptedtrainerdata PICNICKER, ERIN2
+	loadtrainer PICNICKER, ERIN2
 	startbattle
 	returnafterbattle
 	loadvar wErinFightCount, 2
@@ -83,7 +83,7 @@ UnknownScript_0x1a96da:
 	end
 
 .LoadFight2
-	scriptedtrainerdata PICNICKER, ERIN3
+	loadtrainer PICNICKER, ERIN3
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_ERIN

maps/SaffronGym.asm

@@ -22,7 +22,7 @@ SabrinaScript_0x189c2e:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x189df4, 0
-	scriptedtrainerdata SABRINA, 1
+	loadtrainer SABRINA, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_SABRINA

maps/SeafoamGym.asm

@@ -24,7 +24,7 @@ BlaineScript_0x1ab4fb:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x1ab646, 0
-	scriptedtrainerdata BLAINE, 1
+	loadtrainer BLAINE, 1
 	startbattle
 	iftrue .ReturnAfterBattle
 	appear SEAFOAMGYM_GYM_GUY

maps/SilverCaveRoom3.asm

@@ -9,18 +9,18 @@ SilverCaveRoom3_MapScriptHeader:
 	db 0
 
 RedScript_0x18c603:
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	faceplayer
 	loadfont
 	writetext UnknownText_0x18c637
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x18c63c, UnknownText_0x18c63c
-	scriptedtrainerdata RED, 1
+	loadtrainer RED, 1
 	startbattle
 	reloadmapmusic
 	returnafterbattle
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	loadfont
 	writetext UnknownText_0x18c63f
 	waitbutton

maps/SproutTower3F.asm

@@ -27,7 +27,7 @@ UnknownScript_0x184946:
 UnknownScript_0x184947:
 	spriteface PLAYER, UP
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	playsound SFX_TACKLE
 	playsound SFX_ELEVATOR
 	earthquake 79
@@ -74,7 +74,7 @@ SageLiScript:
 	waitbutton
 	closetext
 	winlosstext SageLiBeatenText, 0
-	scriptedtrainerdata SAGE, LI
+	loadtrainer SAGE, LI
 	startbattle
 	returnafterbattle
 	loadfont

maps/TeamRocketBaseB1F.asm

@@ -243,7 +243,7 @@ TrainerCameraGrunt1:
 	closetext
 	winlosstext CameraGrunt1BeatenText, 0
 	setlasttalked $2
-	scriptedtrainerdata GRUNTM, 20
+	loadtrainer GRUNTM, 20
 	startbattle
 	disappear TEAMROCKETBASEB1F_ROCKET1
 	returnafterbattle
@@ -256,7 +256,7 @@ TrainerCameraGrunt2:
 	closetext
 	winlosstext CameraGrunt2BeatenText, 0
 	setlasttalked $2
-	scriptedtrainerdata GRUNTM, 21
+	loadtrainer GRUNTM, 21
 	startbattle
 	disappear TEAMROCKETBASEB1F_ROCKET1
 	returnafterbattle
@@ -458,7 +458,7 @@ VoltorbExplodingTrap:
 	special FadeInPalettes
 	setlasttalked $ff
 	writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
-	scriptedpokedata VOLTORB, 23
+	loadwildmon VOLTORB, 23
 	startbattle
 	end
 
@@ -468,7 +468,7 @@ GeodudeExplodingTrap:
 	special FadeInPalettes
 	setlasttalked $ff
 	writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
-	scriptedpokedata GEODUDE, 21
+	loadwildmon GEODUDE, 21
 	startbattle
 	end
 
@@ -478,7 +478,7 @@ KoffingExplodingTrap:
 	special FadeInPalettes
 	setlasttalked $ff
 	writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
-	scriptedpokedata KOFFING, 21
+	loadwildmon KOFFING, 21
 	startbattle
 	end
 

maps/TeamRocketBaseB2F.asm

@@ -102,7 +102,7 @@ UnknownScript_0x6cfac:
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248
 	winlosstext UnknownText_0x6d45c, 0
 	setlasttalked $3
-	scriptedtrainerdata EXECUTIVEF, 2
+	loadtrainer EXECUTIVEF, 2
 	startbattle
 	disappear TEAMROCKETBASEB2F_DRAGON
 	setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
@@ -228,7 +228,7 @@ GruntM19Script:
 
 VoltorbScript_0x6d101:
 	cry ELECTRODE
-	scriptedpokedata ELECTRODE, 23
+	loadwildmon ELECTRODE, 23
 	startbattle
 	iftrue UnknownScript_0x6d182
 	disappear TEAMROCKETBASEB2F_VOLTORB1
@@ -246,7 +246,7 @@ VoltorbScript_0x6d101:
 
 VoltorbScript_0x6d12c:
 	cry ELECTRODE
-	scriptedpokedata ELECTRODE, 23
+	loadwildmon ELECTRODE, 23
 	startbattle
 	iftrue UnknownScript_0x6d182
 	disappear TEAMROCKETBASEB2F_VOLTORB2
@@ -264,7 +264,7 @@ VoltorbScript_0x6d12c:
 
 VoltorbScript_0x6d157:
 	cry ELECTRODE
-	scriptedpokedata ELECTRODE, 23
+	loadwildmon ELECTRODE, 23
 	startbattle
 	iftrue UnknownScript_0x6d182
 	disappear TEAMROCKETBASEB2F_VOLTORB3

maps/TeamRocketBaseB3F.asm

@@ -71,7 +71,7 @@ LanceScript_0x6dffc:
 UnknownScript_0x6e019:
 	spriteface PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	appear TEAMROCKETBASEB3F_SILVER
 	applymovement TEAMROCKETBASEB3F_SILVER, MovementData_0x6e164
 	spriteface PLAYER, LEFT
@@ -109,7 +109,7 @@ UnknownScript_0x6e056:
 	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142
 	winlosstext UnknownText_0x6e511, 0
 	setlasttalked $3
-	scriptedtrainerdata EXECUTIVEM, 4
+	loadtrainer EXECUTIVEM, 4
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4

maps/TinTower1F.asm

@@ -124,7 +124,7 @@ UnknownScript_0x1850d7:
 	applymovement TINTOWER1F_SUICUNE, MovementData_0x1851e4
 	cry SUICUNE
 	pause 20
-	scriptedpokedata SUICUNE, 40
+	loadwildmon SUICUNE, 40
 	writecode VAR_BATTLETYPE, BATTLETYPE_SUICUNE
 	startbattle
 	reloadmapmusic
@@ -170,7 +170,7 @@ UnknownScript_0x1850d7:
 	playsound SFX_EXIT_BUILDING
 	disappear TINTOWER1F_SUPER_NERD
 	waitsfx
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 20
 	playmapmusic
 	end

maps/TinTowerRoof.asm

@@ -36,7 +36,7 @@ HoOhScript_0x77244:
 	closetext
 	setevent EVENT_FOUGHT_HO_OH
 	writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM
-	scriptedpokedata HO_OH, 60
+	loadwildmon HO_OH, 60
 	startbattle
 	disappear TINTOWERROOF_HO_OH
 	returnafterbattle

maps/TrainerHouseB1F.asm

@@ -48,14 +48,14 @@ UnknownScript_0x9b3aa:
 	iffalse UnknownScript_0x9b3dc
 	winlosstext UnknownText_0x9b578, 0
 	setlasttalked $3
-	scriptedtrainerdata CAL, CAL2
+	loadtrainer CAL, CAL2
 	startbattle
 	returnafterbattle
 	iffalse UnknownScript_0x9b3e8
 UnknownScript_0x9b3dc:
 	winlosstext UnknownText_0x9b578, 0
 	setlasttalked $3
-	scriptedtrainerdata CAL, CAL3
+	loadtrainer CAL, CAL3
 	startbattle
 	returnafterbattle
 UnknownScript_0x9b3e8:

maps/UndergroundPathSwitchRoomEntrances.asm

@@ -93,7 +93,7 @@ TeacherScript_0x7ca7d:
 UnknownScript_0x7ca80:
 	spriteface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	playsound SFX_EXIT_BUILDING
 	appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
@@ -112,7 +112,7 @@ UnknownScript_0x7ca80:
 UnknownScript_0x7caaa:
 	spriteface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	playsound SFX_EXIT_BUILDING
 	appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
@@ -146,7 +146,7 @@ UnknownScript_0x7cae1:
 	iftrue UnknownScript_0x7cb19
 	winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102
 	setlasttalked $c
-	scriptedtrainerdata RIVAL1, RIVAL1_12
+	loadtrainer RIVAL1, RIVAL1_12
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -155,7 +155,7 @@ UnknownScript_0x7cae1:
 UnknownScript_0x7cb09:
 	winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102
 	setlasttalked $c
-	scriptedtrainerdata RIVAL1, RIVAL1_10
+	loadtrainer RIVAL1, RIVAL1_10
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -164,7 +164,7 @@ UnknownScript_0x7cb09:
 UnknownScript_0x7cb19:
 	winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102
 	setlasttalked $c
-	scriptedtrainerdata RIVAL1, RIVAL1_11
+	loadtrainer RIVAL1, RIVAL1_11
 	startbattle
 	reloadmapmusic
 	returnafterbattle

maps/UnionCaveB2F.asm

@@ -33,7 +33,7 @@ UnknownScript_0x5a31c:
 SurfScript_0x5a31f:
 	faceplayer
 	cry LAPRAS
-	scriptedpokedata LAPRAS, 20
+	loadwildmon LAPRAS, 20
 	startbattle
 	disappear UNIONCAVEB2F_SURF
 	setflag ENGINE_UNION_CAVE_LAPRAS

maps/VermilionCity.asm

@@ -57,7 +57,7 @@ UnknownScript_0x1aa9ab:
 	cry SNORLAX
 	closetext
 	writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM
-	scriptedpokedata SNORLAX, 50
+	loadwildmon SNORLAX, 50
 	startbattle
 	disappear VERMILIONCITY_BIG_SNORLAX
 	setevent EVENT_FOUGHT_SNORLAX

maps/VermilionGym.asm

@@ -21,7 +21,7 @@ SurgeScript_0x1920a5:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x192238, 0
-	scriptedtrainerdata LT_SURGE, 1
+	loadtrainer LT_SURGE, 1
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_LTSURGE

maps/VictoryRoad.asm

@@ -27,7 +27,7 @@ UnknownScript_0x74492:
 	moveperson VICTORYROAD_SILVER, $12, $b
 	spriteface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	appear VICTORYROAD_SILVER
 	applymovement VICTORYROAD_SILVER, MovementData_0x74539
@@ -41,7 +41,7 @@ UnknownScript_0x74492:
 UnknownScript_0x744b5:
 	spriteface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_RotatePalettesRightMusic
+	special Special_FadeOutMusic
 	pause 15
 	appear VICTORYROAD_SILVER
 	applymovement VICTORYROAD_SILVER, MovementData_0x74542
@@ -66,7 +66,7 @@ UnknownScript_0x744d4:
 	iftrue UnknownScript_0x7450f
 	winlosstext UnknownText_0x7463d, UnknownText_0x747aa
 	setlasttalked $2
-	scriptedtrainerdata RIVAL1, RIVAL1_15
+	loadtrainer RIVAL1, RIVAL1_15
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -75,7 +75,7 @@ UnknownScript_0x744d4:
 UnknownScript_0x744ff:
 	winlosstext UnknownText_0x7463d, UnknownText_0x747aa
 	setlasttalked $2
-	scriptedtrainerdata RIVAL1, RIVAL1_13
+	loadtrainer RIVAL1, RIVAL1_13
 	startbattle
 	reloadmapmusic
 	returnafterbattle
@@ -84,7 +84,7 @@ UnknownScript_0x744ff:
 UnknownScript_0x7450f:
 	winlosstext UnknownText_0x7463d, UnknownText_0x747aa
 	setlasttalked $2
-	scriptedtrainerdata RIVAL1, RIVAL1_14
+	loadtrainer RIVAL1, RIVAL1_14
 	startbattle
 	reloadmapmusic
 	returnafterbattle