Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

# Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
2018-01-14 22:56:36 -05:00
parent 8e1e583640 2c789b64b1
commit 5c28d05bb4
249 changed files with 1382 additions and 1408 deletions
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -1,11 +1,11 @@
-BattleTowerRoomMenu: ; 1700b0
+Special_BattleTowerRoomMenu: ; 1700b0
 ; special
 	call InitBattleTowerChallengeRAM
 	farcall _BattleTowerRoomMenu
 	ret
 ; 1700ba

-Function1700ba: ; 1700ba
+Special_Function1700ba: ; 1700ba
 	call InitBattleTowerChallengeRAM
 	farcall Function11811a
 	ret
@@ -53,7 +53,7 @@ Function1700c4: ; 1700c4
 	ret
 ; 170114

-Function170114: ; 170114
+Special_Function170114: ; 170114
 	call InitBattleTowerChallengeRAM
 	call .Function170121
 	farcall Function11805f
@@ -182,14 +182,14 @@ Function170139: ; 170139
 	ret
 ; 170215

-BattleTowerBattle: ; 170215
+Special_BattleTowerBattle: ; 170215
 	xor a
 	ld [wBattleTowerBattleEnded], a
 	call _BattleTowerBattle
 	ret
 ; 17021d

-EmptySpecial_17021d: ; 17021d
+DummySpecial_17021d: ; 17021d
 	ret
 ; 17021e

@@ -243,12 +243,12 @@ RunBattleTowerTrainer: ; 17024d

 	xor a
 	ld [wLinkMode], a
-	farcall TrainerRankings_Healings
+	farcall Special_StubbedTrainerRankings_Healings
 	farcall HealParty
 	call ReadBTTrainerParty
 	call Clears5_a89a

-	predef StartBattle
+	predef Predef_StartBattle

 	farcall LoadPokemonData
 	farcall HealParty
@@ -484,7 +484,7 @@ endr
 	ld hl, MON_STAT_EXP - 1
 	add hl, bc
 	ld b, $1
-	predef CalcPkmnStats
+	predef Predef_CalcPkmnStats
 	pop de
 	pop hl
 	dec de
@@ -599,8 +599,7 @@ SkipBattleTowerTrainer: ; 1704c9
 	ret
 ; 1704ca

-Function1704ca: ; 1704ca
-; unreferenced mobile function
+Unreferenced_Function1704ca: ; 1704ca
 	ld a, [$be46]
 	cp $7
 	jr c, .asm_1704d3
@@ -620,8 +619,7 @@ Function1704ca: ; 1704ca
 	ret
 ; 1704e1

-Function1704e1: ; 1704e1
-; unreferenced special
+UnusedSpecial_Function1704e1: ; 1704e1
 	call SpeechTextBox
 	call FadeToMenu
 	call InitBattleTowerChallengeRAM
@@ -902,7 +900,7 @@ Function1704e1: ; 1704e1
 	db "れきだいりーダーいちらん@"
 ; 170687

-BattleTowerAction: ; 170687
+Special_BattleTowerAction: ; 170687
 	ld a, [ScriptVar]
 	ld e, a
 	ld d, 0
@@ -1605,7 +1603,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19
 	ld [ScriptVar], a
 	ret

-Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44
+Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
 	farcall Function_LoadOpponentTrainerAndPokemons
 	ld a, [rSVBK]
 	push af
@@ -1652,11 +1650,11 @@ Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44

 INCLUDE "data/trainers/sprites.asm"

-ret_170bd2: ; 170bd2
+DummySpecial_170bd2: ; 170bd2
 	ret
 ; 170bd3

-SpecialCheckForBattleTowerRules: ; 170bd3
+Special_CheckForBattleTowerRules: ; 170bd3
 	farcall CheckForBattleTowerRules
 	jr c, .asm_170bde
 	xor a ; FALSE
--- a/engine/events/buena.asm
+++ b/engine/events/buena.asm
@@ -1,4 +1,4 @@
-SpecialBuenasPassword: ; 8af6b
+Special_BuenasPassword: ; 8af6b
 	xor a
 	ld [wWhichIndexSet], a
 	ld hl, .MenuDataHeader
@@ -63,7 +63,7 @@ SpecialBuenasPassword: ; 8af6b
 	ret
 ; 8afd4

-SpecialBuenaPrize: ; 8afd4
+Special_BuenaPrize: ; 8afd4
 	xor a
 	ld [wMenuScrollPosition], a
 	ld a, $1
--- a/engine/events/buena_menu.asm
+++ b/engine/events/buena_menu.asm
@@ -1,4 +1,4 @@
-AskRememberPassword: ; 4ae12
+Special_AskRememberPassword: ; 4ae12
 	call .DoMenu
 	ld a, $0
 	jr c, .okay
--- a/engine/events/bug_contest/contest_2.asm
+++ b/engine/events/bug_contest/contest_2.asm
@@ -76,7 +76,7 @@ Special_CheckBugContestContestantFlag: ; 139ed

 INCLUDE "data/bug_contest_flags.asm"

-ContestDropOffMons: ; 13a12
+Special_ContestDropOffMons: ; 13a12
 	ld hl, PartyMon1HP
 	ld a, [hli]
 	or [hl]
@@ -101,7 +101,7 @@ ContestDropOffMons: ; 13a12
 	ret
 ; 13a31

-ContestReturnMons: ; 13a31
+Special_ContestReturnMons: ; 13a31
 ; Restore the species of the second mon.
 	ld hl, PartySpecies + 1
 	ld a, [wBugContestSecondPartySpecies]
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -101,7 +101,7 @@ DisplayAlreadyCaughtText: ; cc0c7
 	text_jump UnknownText_0x1c10dd
 	db "@"

-Predef2F:
-Predef38:
-Predef39: ; cc0d5
+DummyPredef2F:
+DummyPredef38:
+DummyPredef39: ; cc0d5
 	ret
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -1,6 +1,6 @@
-_BugContestJudging: ; 1369d
+_Special_BugContestJudging: ; 1369d
 	call ContestScore
-	farcall TrainerRankings_BugContestScore
+	farcall StubbedTrainerRankings_BugContestScore
 	call BugContest_JudgeContestants
 	ld a, [wBugContestThirdPlaceWinnerID]
 	call LoadContestantName
--- a/engine/events/catch_tutorial.asm
+++ b/engine/events/catch_tutorial.asm
@@ -41,7 +41,7 @@ CatchTutorial:: ; 4e554
 	ld hl, .AutoInput
 	ld a, BANK(.AutoInput)
 	call StartAutoInput
-	callfar StartBattle
+	callfar Predef_StartBattle
 	call StopAutoInput
 	pop af

--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -362,7 +362,7 @@ CelebiEvent_SetBattleType: ; 49bf3

 ; 49bf9

-CheckCaughtCelebi: ; 49bf9
+Special_CheckCaughtCelebi: ; 49bf9
 	ld a, [wBattleResult]
 	bit 6, a
 	jr z, .false
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@@ -565,7 +565,7 @@ DayCare_GiveEgg: ; 169ac
 	pop hl
 	push bc
 	ld b, $0
-	predef CalcPkmnStats
+	predef Predef_CalcPkmnStats
 	pop bc
 	ld hl, MON_HP
 	add hl, bc
@@ -639,7 +639,7 @@ DayCare_InitBreeding: ; 16a3b
 	cp DITTO
 	ld a, $0
 	jr z, .LoadWhichBreedmonIsTheMother
-	farcall GetGender
+	farcall Predef_GetGender
 	ld a, $0
 	jr z, .LoadWhichBreedmonIsTheMother
 	inc a
@@ -684,7 +684,7 @@ DayCare_InitBreeding: ; 16a3b
 	ld de, wEggMonMoves
 	xor a
 	ld [Buffer1], a
-	predef FillMoves
+	predef Predef_FillMoves
 	farcall InitEggMoves
 	ld hl, wEggMonID
 	ld a, [PlayerID]
@@ -726,7 +726,7 @@ DayCare_InitBreeding: ; 16a3b
 	ld a, TEMPMON
 	ld [MonType], a
 	push hl
-	farcall GetGender
+	farcall Predef_GetGender
 	pop hl
 	ld de, wBreedMon1DVs
 	ld bc, wBreedMon2DVs
@@ -770,7 +770,7 @@ DayCare_InitBreeding: ; 16a3b
 	call CopyBytes
 	ld hl, wEggMonMoves
 	ld de, wEggMonPP
-	predef FillPP
+	predef Predef_FillPP
 	ld hl, wMonOrItemNameBuffer
 	ld de, StringBuffer1
 	ld bc, NAME_LENGTH
--- a/engine/events/dratini.asm
+++ b/engine/events/dratini.asm
@@ -1,4 +1,4 @@
-SpecialDratini: ; 0x8b170
+Special_Dratini: ; 0x8b170
 ; if ScriptVar is 0 or 1, change the moveset of the last Dratini in the party.
 ;  0: give it a special moveset with Extremespeed.
 ;  1: give it the normal moveset of a level 15 Dratini.
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4
 ; 8c7e1

 BlindingFlash: ; 8c7e1
-	farcall FadeOutPalettes
+	farcall Special_FadeOutPalettes
 	ld hl, wStatusFlags
 	set 2, [hl] ; Flash
 	farcall ReplaceTimeOfDayPals
@@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1
 	ld b, SCGB_MAPPALS
 	call GetSGBLayout
 	farcall LoadOW_BGPal7
-	farcall FadeInPalettes
+	farcall Special_FadeInPalettes
 	ret
 ; 8c80a

--- a/engine/events/fruit_trees.asm
+++ b/engine/events/fruit_trees.asm
@@ -58,7 +58,7 @@ CheckFruitTree: ; 44055
 ; 4405f

 PickedFruitTree: ; 4405f
-	farcall TrainerRankings_FruitPicked
+	farcall StubbedTrainerRankings_FruitPicked
 	ld b, 1
 	jp GetFruitTreeFlag
 ; 4406a
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -42,7 +42,7 @@ RedCredits:: ; 86455
 	ld [MusicFadeID + 1], a
 	ld a, 10
 	ld [MusicFade], a
-	farcall FadeOutPalettes
+	farcall Special_FadeOutPalettes
 	xor a
 	ld [VramState], a
 	ld [hMapAnims], a
@@ -65,7 +65,7 @@ HallOfFame_FadeOutMusic: ; 8648e
 	ld [MusicFadeID + 1], a
 	ld a, 10
 	ld [MusicFade], a
-	farcall FadeOutPalettes
+	farcall Special_FadeOutPalettes
 	xor a
 	ld [VramState], a
 	ld [hMapAnims], a
@@ -130,7 +130,7 @@ AnimateHallOfFame: ; 864c3
 	call WaitBGMap
 	decoord 6, 5
 	ld c, $6
-	predef HOF_AnimateFrontpic
+	predef HOF_Predef_AnimateFrontpic
 	ld c, 60
 	call DelayFrames
 	and a
@@ -244,18 +244,18 @@ AnimateHOFMonEntrance: ; 865b5
 	ld a, [hli]
 	ld [TempMonDVs + 1], a
 	ld hl, TempMonDVs
-	predef GetUnownLetter
+	predef Predef_GetUnownLetter
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
 	call ByteFill
 	ld de, vTiles2 tile $31
-	predef GetMonBackpic
+	predef Predef_GetMonBackpic
 	ld a, $31
 	ld [hGraphicStartTile], a
 	hlcoord 6, 6
 	lb bc, 6, 6
-	predef PlaceGraphic
+	predef Predef_PlaceGraphic
 	ld a, $d0
 	ld [hSCY], a
 	ld a, $90
@@ -403,7 +403,7 @@ _HallOfFamePC: ; 86650
 	call SetPalettes
 	decoord 6, 5
 	ld c, $6
-	predef HOF_AnimateFrontpic
+	predef HOF_Predef_AnimateFrontpic
 	and a
 	ret

@@ -478,7 +478,7 @@ DisplayHOFMon: ; 86748
 	ld [CurPartySpecies], a
 	ld [wd265], a
 	ld hl, TempMonDVs
-	predef GetUnownLetter
+	predef Predef_GetUnownLetter
 	xor a
 	ld [wBoxAlignment], a
 	hlcoord 6, 5
@@ -499,7 +499,7 @@ DisplayHOFMon: ; 86748
 	call PlaceString
 	ld a, TEMPMON
 	ld [MonType], a
-	farcall GetGender
+	farcall Predef_GetGender
 	ld a, " "
 	jr c, .got_gender
 	ld a, "♂"
@@ -546,7 +546,7 @@ HOF_AnimatePlayerPic: ; 86810
 	ld [hGraphicStartTile], a
 	hlcoord 6, 6
 	lb bc, 6, 6
-	predef PlaceGraphic
+	predef Predef_PlaceGraphic
 	ld a, $d0
 	ld [hSCY], a
 	ld a, $90
@@ -570,7 +570,7 @@ HOF_AnimatePlayerPic: ; 86810
 	ld [hGraphicStartTile], a
 	hlcoord 12, 5
 	lb bc, 7, 7
-	predef PlaceGraphic
+	predef Predef_PlaceGraphic
 	ld a, $c0
 	ld [hSCX], a
 	call WaitBGMap
--- a/engine/events/happiness_egg.asm
+++ b/engine/events/happiness_egg.asm
@@ -1,4 +1,4 @@
-GetFirstPokemonHappiness: ; 718d
+Special_GetFirstPokemonHappiness: ; 718d
 	ld hl, PartyMon1Happiness
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld de, PartySpecies
@@ -17,7 +17,7 @@ GetFirstPokemonHappiness: ; 718d
 	call GetPokemonName
 	jp CopyPokemonName_Buffer1_Buffer3

-CheckFirstMonIsEgg: ; 71ac
+Special_CheckFirstMonIsEgg: ; 71ac
 	ld a, [PartySpecies]
 	ld [wd265], a
 	cp EGG
--- a/engine/events/heal_machine_anim.asm
+++ b/engine/events/heal_machine_anim.asm
@@ -1,4 +1,4 @@
-HealMachineAnim: ; 12324
+Special_HealMachineAnim: ; 12324
 	; If you have no Pokemon, don't change the buffer.  This can lead to some glitchy effects if you have no Pokemon.
 	ld a, [PartyCount]
 	and a
--- a/engine/events/kurt.asm
+++ b/engine/events/kurt.asm
@@ -161,7 +161,7 @@ Kurt_SelectQuantity: ; 880c2
 	db $40 ; flags
 	menu_coords 6, 9, SCREEN_WIDTH - 1, 12

-	; XXX
+	; unused
 	dw 0
 	db -1
 	db 0
--- a/engine/events/lucky_number.asm
+++ b/engine/events/lucky_number.asm
@@ -103,7 +103,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a
 	ld a, [ScriptVar]
 	and a
 	ret z ; found nothing
-	farcall TrainerRankings_LuckyNumberShow
+	farcall StubbedTrainerRankings_LuckyNumberShow
 	ld a, [wFoundMatchingIDInParty]
 	and a
 	push af
--- a/engine/events/magikarp.asm
+++ b/engine/events/magikarp.asm
@@ -28,7 +28,7 @@ Special_CheckMagikarpLength: ; fbb32
 	ld c, l
 	call CalcMagikarpLength
 	call PrintMagikarpLength
-	farcall TrainerRankings_MagikarpLength
+	farcall StubbedTrainerRankings_MagikarpLength
 	ld hl, .MeasureItText
 	call PrintText

--- a/engine/events/misc_scripts.asm
+++ b/engine/events/misc_scripts.asm
@@ -2,7 +2,7 @@ Script_AbortBugContest: ; 0x122c1
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iffalse .finish
 	setflag ENGINE_DAILY_BUG_CONTEST
-	special ContestReturnMons
+	special Special_ContestReturnMons
 .finish
 	end

--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
@@ -217,7 +217,7 @@ endr

 INCLUDE "data/items/mom_phone.asm"

-	db 0, 0, 0 ; XXX
+	db 0, 0, 0 ; unused

 _MomText_HiHowAreYou: ; 0xfd1b1
 	; Hi,  ! How are you?
@@ -255,10 +255,10 @@ _MomText_ItsInRoom: ; 0xfd1ca
 	db "@"
 ; 0xfd1cf

-	db 0 ; XXX
+	db 0 ; unused

-Predef3A: ; fd1d0
+DummyPredef3A: ; fd1d0
 	ret
 ; fd1d1

-	ret ; XXX
+	ret ; unused
--- a/engine/events/move_deleter.asm
+++ b/engine/events/move_deleter.asm
@@ -1,4 +1,4 @@
-MoveDeletion:
+Special_MoveDeletion:
 	ld hl, .IntroText
 	call PrintText
 	call YesNoBox
--- a/engine/events/move_tutor.asm
+++ b/engine/events/move_tutor.asm
@@ -55,7 +55,7 @@ CheckCanLearnMoveTutorMove: ; 492b9
 	ld hl, .MenuDataHeader
 	call LoadMenuDataHeader

-	predef CanLearnTMHMMove
+	predef Predef_CanLearnTMHMMove

 	push bc
 	ld a, [CurPartyMon]
@@ -79,7 +79,7 @@ CheckCanLearnMoveTutorMove: ; 492b9
 	callfar KnowsMove
 	jr c, .didnt_learn

-	predef LearnMove
+	predef Predef_LearnMove
 	ld a, b
 	and a
 	jr z, .didnt_learn
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -427,7 +427,7 @@ UsedSurfScript: ; c986
 	end

 .empty_fn ; c9a2
-	farcall TrainerRankings_Surf
+	farcall StubbedTrainerRankings_Surf
 	ret

 UsedSurfText: ; c9a9
@@ -623,7 +623,7 @@ FlyFunction: ; ca3b
 	special UpdateTimePals
 	callasm FlyFromAnim
 	farscall Script_AbortBugContest
-	special WarpToSpawnPoint
+	special Special_WarpToSpawnPoint
 	callasm DelayLoadingNewSprites
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
 	newloadmap MAPSETUP_FLY
@@ -700,7 +700,7 @@ Script_UsedWaterfall: ; 0xcb20
 	ld a, [PlayerStandingTile]
 	call CheckWaterfallTile
 	ret z
-	farcall TrainerRankings_Waterfall
+	farcall StubbedTrainerRankings_Waterfall
 	ld a, $1
 	ld [ScriptVar], a
 	ret
@@ -871,7 +871,7 @@ dig_incave
 	playsound SFX_WARP_TO
 	applymovement PLAYER, .DigOut
 	farscall Script_AbortBugContest
-	special WarpToSpawnPoint
+	special Special_WarpToSpawnPoint
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
 	newloadmap MAPSETUP_DOOR
 	playsound SFX_WARP_FROM
@@ -958,7 +958,7 @@ TeleportFunction: ; cc61
 	playsound SFX_WARP_TO
 	applymovement PLAYER, .TeleportFrom
 	farscall Script_AbortBugContest
-	special WarpToSpawnPoint
+	special Special_WarpToSpawnPoint
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
 	newloadmap MAPSETUP_TELEPORT
 	playsound SFX_WARP_FROM
@@ -986,7 +986,7 @@ StrengthFunction: ; cce5
 	jr c, .Failed
 	jr .UseStrength

-.AlreadyUsing: ; unreferenced
+.Unreferenced_AlreadyUsing:
 	ld hl, .JumpText
 	call MenuTextBoxBackup
 	ld a, $80
@@ -1749,7 +1749,7 @@ Script_GetOnBike_Register: ; 0xd14e
 	special ReplaceKrisSprite
 	end

-; XXX
+; unused
 	nop
 	ret

--- a/engine/events/poisonstep.asm
+++ b/engine/events/poisonstep.asm
@@ -104,7 +104,7 @@ DoPoisonStep:: ; 505da
 	ld de, SFX_POISON
 	call PlaySFX
 	ld b, $2
-	predef LoadPoisonBGPals
+	predef Predef_LoadPoisonBGPals
 	call DelayFrame
 	ret
 ; 50669
@@ -145,7 +145,7 @@ DoPoisonStep:: ; 505da
 	ld a, [PartyCount]
 	cp [hl]
 	jr nz, .party_loop
-	predef CheckPlayerPartyForFitPkmn
+	predef Predef_CheckPlayerPartyForFitPkmn
 	ld a, d
 	ld [ScriptVar], a
 	ret
--- a/engine/events/poisonstep_pals.asm
+++ b/engine/events/poisonstep_pals.asm
@@ -1,4 +1,4 @@
-LoadPoisonBGPals: ; cbcdd
+Predef_LoadPoisonBGPals: ; cbcdd
 	call .LoadPals
 	ld a, [hCGB]
 	and a
--- a/engine/events/poke_seer.asm
+++ b/engine/events/poke_seer.asm
@@ -15,7 +15,7 @@
 	const SEERACTION_CANT_TELL_2
 	const SEERACTION_LEVEL_ONLY

-SpecialPokeSeer: ; 4f0bc
+Special_PokeSeer: ; 4f0bc
 	ld a, SEER_INTRO
 	call PrintSeerText
 	call JoyWaitAorB
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -1,4 +1,4 @@
-PokemonCenterPC: ; 1559a
+Special_PokemonCenterPC: ; 1559a
 	call PC_CheckPartyForPokemon
 	ret c
 	call PC_PlayBootSound
@@ -353,7 +353,7 @@ KrisWithdrawItemMenu: ; 0x157d1
 	ld [CurItemQuantity], a
 	ld hl, PCItems
 	call TossItem
-	predef PartyMonItemName
+	predef Predef_PartyMonItemName
 	ld hl, .WithdrewText
 	call MenuTextBox
 	xor a
@@ -517,7 +517,7 @@ KrisDepositItemMenu: ; 0x1588b
 	ld [CurItemQuantity], a
 	ld hl, NumItems
 	call TossItem
-	predef PartyMonItemName
+	predef Predef_PartyMonItemName
 	ld hl, .DepositText
 	call PrintText
 	ret
--- a/engine/events/pokepic.asm
+++ b/engine/events/pokepic.asm
@@ -12,7 +12,7 @@ Pokepic:: ; 244e3
 	ld [CurSpecies], a
 	call GetBaseData
 	ld de, vTiles1
-	predef GetMonFrontpic
+	predef Predef_GetMonFrontpic
 	ld a, [wMenuBorderTopCoord]
 	inc a
 	ld b, a
@@ -23,7 +23,7 @@ Pokepic:: ; 244e3
 	ld a, $80
 	ld [hGraphicStartTile], a
 	lb bc, 7, 7
-	predef PlaceGraphic
+	predef Predef_PlaceGraphic
 	call WaitBGMap
 	ret

--- a/engine/events/print_photo.asm
+++ b/engine/events/print_photo.asm
@@ -1,4 +1,4 @@
-PhotoStudio: ; 16dc7
+Special_PhotoStudio: ; 16dc7
 	ld hl, .Text_AskWhichMon
 	call PrintText
 	farcall SelectMonFromParty
--- a/engine/events/print_unown.asm
+++ b/engine/events/print_unown.asm
@@ -140,13 +140,13 @@ UnownPrinter: ; 16be4
 	xor a
 	ld [wBoxAlignment], a
 	ld de, vTiles2
-	predef GetMonFrontpic
+	predef Predef_GetMonFrontpic
 	call .Load2bppToSRAM
 	hlcoord 1, 6
 	xor a
 	ld [hGraphicStartTile], a
 	lb bc, 7, 7
-	predef PlaceGraphic
+	predef Predef_PlaceGraphic
 	ld de, vTiles2 tile $31
 	farcall RotateUnownFrontpic
 	ret
@@ -228,6 +228,6 @@ PlaceUnownPrinterFrontpic: ; 16dac
 	ld a, $31
 	ld [hGraphicStartTile], a
 	lb bc, 7, 7
-	predef PlaceGraphic
+	predef Predef_PlaceGraphic
 	ret
 ; 16dc7
--- a/engine/events/prof_oaks_pc.asm
+++ b/engine/events/prof_oaks_pc.asm
@@ -3,7 +3,7 @@ ProfOaksPC: ; 0x265d3
 	call MenuTextBox
 	call YesNoBox
 	jr c, .shutdown
-	call ProfOaksPCBoot ; player chose "yes"?
+	call Special_ProfOaksPCBoot ; player chose "yes"?
 .shutdown
 	ld hl, OakPCText4
 	call PrintText
@@ -11,7 +11,7 @@ ProfOaksPC: ; 0x265d3
 	call ExitMenu
 	ret

-ProfOaksPCBoot ; 0x265ee
+Special_ProfOaksPCBoot ; 0x265ee
 	ld hl, OakPCText2
 	call PrintText
 	call Rate
--- a/engine/events/sacred_ash.asm
+++ b/engine/events/sacred_ash.asm
@@ -52,12 +52,12 @@ SacredAshScript: ; 0x50821
 	special HealParty
 	reloadmappart
 	playsound SFX_WARP_TO
-	special FadeOutPalettes
-	special FadeInPalettes
-	special FadeOutPalettes
-	special FadeInPalettes
-	special FadeOutPalettes
-	special FadeInPalettes
+	special Special_FadeOutPalettes
+	special Special_FadeInPalettes
+	special Special_FadeOutPalettes
+	special Special_FadeInPalettes
+	special Special_FadeOutPalettes
+	special Special_FadeInPalettes
 	waitsfx
 	writetext UnknownText_0x50845
 	playsound SFX_CAUGHT_MON
--- a/engine/events/special.asm
+++ b/engine/events/special.asm
@@ -1,6 +1,6 @@
 MANIA_OT_ID EQU 00518

-SpecialGiveShuckle: ; 7305
+Special_GiveShuckle: ; 7305

 ; Adding to the party.
 	xor a
@@ -12,7 +12,7 @@ SpecialGiveShuckle: ; 7305
 	ld a, 15
 	ld [CurPartyLevel], a

-	predef TryAddMonToParty
+	predef Predef_TryAddMonToParty
 	jr nc, .NotGiven

 ; Caught data.
@@ -71,7 +71,7 @@ SpecialShuckleOT:
 SpecialShuckleNick:
 	db "SHUCKIE@"

-SpecialReturnShuckle: ; 737e
+Special_ReturnShuckle: ; 737e
 	farcall SelectMonFromParty
 	jr c, .refused

@@ -231,6 +231,5 @@ CopyPokemonName_Buffer1_Buffer3: ; 746e
 	ld bc, PKMN_NAME_LENGTH
 	jp CopyBytes

-Predef1: ; 747a
-; not used
+DummyPredef1: ; 747a
 	ret
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -108,13 +108,13 @@ PokecenterNurseScript:

 	farwritetext NurseTakePokemonText
 	pause 20
-	special TrainerRankings_Healings
+	special Special_StubbedTrainerRankings_Healings
 	spriteface LAST_TALKED, LEFT
 	pause 10
 	special HealParty
 	playmusic MUSIC_NONE
 	writebyte HEALMACHINE_POKECENTER
-	special HealMachineAnim
+	special Special_HealMachineAnim
 	pause 30
 	special RestartMapMusic
 	spriteface LAST_TALKED, DOWN
@@ -124,7 +124,7 @@ PokecenterNurseScript:
 	iftrue .no
 	checkflag ENGINE_POKERUS ; nurse already talked about pokerus
 	iftrue .no
-	special SpecialCheckPokerus
+	special Special_CheckPokerus
 	iftrue .pokerus
 .no

@@ -204,7 +204,7 @@ HomepageScript:
 Radio1Script:
 	opentext
 	writebyte MAPRADIO_POKEMON_CHANNEL
-	special MapRadio
+	special Special_MapRadio
 	closetext
 	end

@@ -212,7 +212,7 @@ Radio2Script:
 ; Lucky Channel
 	opentext
 	writebyte MAPRADIO_LUCKY_CHANNEL
-	special MapRadio
+	special Special_MapRadio
 	closetext
 	end

@@ -221,7 +221,7 @@ TrashCanScript: ; 0xbc1a5

 PCScript:
 	opentext
-	special PokemonCenterPC
+	special Special_PokemonCenterPC
 	closetext
 	end

@@ -320,7 +320,7 @@ BugContestResultsScript:
 	opentext
 	farwritetext ContestResults_ReadyToJudgeText
 	waitbutton
-	special BugContestJudging
+	special Special_BugContestJudging
 	vartomem MEM_BUFFER_0
 	if_equal 1, BugContestResults_FirstPlace
 	if_equal 2, BugContestResults_SecondPlace
@@ -346,9 +346,9 @@ BugContestResults_FinishUp
 	iffalse BugContestResults_DidNotLeaveMons
 	farwritetext ContestResults_ReturnPartyText
 	waitbutton
-	special ContestReturnMons
+	special Special_ContestReturnMons
 BugContestResults_DidNotLeaveMons
-	special CheckPartyFullAfterContest
+	special Special_CheckPartyFullAfterContest
 	if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
 	if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
 	; BUGCONTEST_BOXED_MON
@@ -622,7 +622,7 @@ InitializeEventsScript:
 	return

 AskNumber1MScript:
-	special RandomPhoneMon
+	special Special_RandomPhoneMon
 	checkcode VAR_CALLERID
 	if_equal PHONE_SCHOOLBOY_JACK, .Jack
 	if_equal PHONE_SAILOR_HUEY, .Huey
@@ -707,7 +707,7 @@ AskNumber1MScript:
 	end

 AskNumber2MScript:
-	special RandomPhoneMon
+	special Special_RandomPhoneMon
 	checkcode VAR_CALLERID
 	if_equal PHONE_SCHOOLBOY_JACK, .Jack
 	if_equal PHONE_SAILOR_HUEY, .Huey
@@ -1887,7 +1887,7 @@ CoinVendor_IntroScript: ; 0xbcde0
 HappinessCheckScript:
 	faceplayer
 	opentext
-	special GetFirstPokemonHappiness
+	special Special_GetFirstPokemonHappiness
 	if_less_than 50, .Unhappy
 	if_less_than 150, .KindaHappy
 	farwritetext HappinessText3
--- a/engine/events/treemons.asm
+++ b/engine/events/treemons.asm
@@ -1,5 +1,5 @@
 TreeMonEncounter: ; b81ea
-	farcall TrainerRankings_TreeEncounters
+	farcall StubbedTrainerRankings_TreeEncounters

 	xor a
 	ld [TempWildMonSpecies], a
--- a/engine/events/unown_walls.asm
+++ b/engine/events/unown_walls.asm
@@ -1,4 +1,4 @@
-SpecialHoOhChamber: ; 0x8addb
+Special_HoOhChamber: ; 0x8addb
 	ld hl, PartySpecies
 	ld a, [hl]
 	cp HO_OH ; is Ho-oh the first Pokémon in the party?
@@ -11,7 +11,7 @@ SpecialHoOhChamber: ; 0x8addb
 	ret
 ; 0x8adef

-SpecialOmanyteChamber: ; 8adef
+Special_OmanyteChamber: ; 8adef
 	call GetSecondaryMapHeaderPointer
 	ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	ld b, CHECK_FLAG
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -10,7 +10,7 @@ Script_OverworldWhiteout:: ; 0x124c8
 Script_Whiteout: ; 0x124ce
 	writetext .WhitedOutText
 	waitbutton
-	special FadeOutPalettes
+	special Special_FadeOutPalettes
 	pause 40
 	special HealParty
 	checkflag ENGINE_BUG_CONTEST_TIMER
@@ -18,7 +18,7 @@ Script_Whiteout: ; 0x124ce
 	callasm HalveMoney
 	callasm GetWhiteoutSpawn
 	farscall Script_AbortBugContest
-	special WarpToSpawnPoint
+	special Special_WarpToSpawnPoint
 	newloadmap MAPSETUP_WARP
 	end_all

@@ -49,7 +49,7 @@ BattleBGMap: ; 1250a
 ; 12513

 HalveMoney: ; 12513
-	farcall TrainerRankings_WhiteOuts
+	farcall StubbedTrainerRankings_WhiteOuts

 ; Halve the player's money.
 	ld hl, Money