shithub: pokered

Download patch

ref: 35f2bb90d4a8f8e4dcac3fbab7d89cbc590285e8
parent: 38ac74f22285974bda6a0ed537958def8415076e
author: yenatch <yenatch@gmail.com>
date: Mon Jun 16 09:03:05 EDT 2014

Rename predef functions so they aren't excessive in length.

This is mostly because of an rgbasm bug that prevents macro arguments
from exceeding 16 characters, but the names were bad anyway.

--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -1,4 +1,4 @@
-HallOfFameComputer: ; 7405c (1d:405c)
+HallOfFamePC: ; 7405c (1d:405c)
 	callba AnimateHallOfFame
 	call ClearScreen
 	ld c, $64
--- a/engine/battle/1c.asm
+++ b/engine/battle/1c.asm
@@ -430,6 +430,7 @@
 	ld [wd09f], a
 	jr .done2_
 
+FlashScreen:
 BattleTransition_FlashScreen_: ; 70b5d (1c:4b5d)
 	ld hl, BattleTransition_FlashScreenPalettes
 .loop
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -241,7 +241,7 @@
 	call DelayFrames
 	call SaveScreenTilesToBuffer1
 .asm_3c14f
-	call AnyPlayerPokemonAliveCheck
+	call AnyPartyAlive
 	ld a, d
 	and a
 	jp z, HandlePlayerBlackOut
@@ -774,7 +774,7 @@
 	xor a
 	ld [wccf0], a
 	call FaintEnemyPokemon
-	call AnyPlayerPokemonAliveCheck
+	call AnyPartyAlive
 	ld a, d
 	and a
 	jp z, HandlePlayerBlackOut
@@ -870,7 +870,7 @@
 	jr nz, .playermonnotfaint
 	call Func_3c741
 .playermonnotfaint
-	call AnyPlayerPokemonAliveCheck
+	call AnyPartyAlive
 	ld a, d
 	and a
 	ret z
@@ -1021,7 +1021,7 @@
 	ld a, $1
 	ld [wccf0], a
 	call Func_3c741
-	call AnyPlayerPokemonAliveCheck     ; test if any more mons are alive
+	call AnyPartyAlive     ; test if any more mons are alive
 	ld a, d
 	and a
 	jp z, HandlePlayerBlackOut
@@ -1492,7 +1492,7 @@
 
 ; tests if the player has any pokemon that are not fainted
 ; sets d = 0 if all fainted, d != 0 if some mons are still alive
-AnyPlayerPokemonAliveCheck: ; 3ca83 (f:4a83)
+AnyPartyAlive: ; 3ca83 (f:4a83)
 	ld a, [wPartyCount] ; wPartyCount
 	ld e, a
 	xor a
@@ -6930,7 +6930,7 @@
 	jr nz, .asm_3f0f4
 	ret
 
-LoadMonBackSprite:
+LoadMonBackPic:
 ; Assumes the monster's attributes have
 ; been loaded with GetMonHeader.
 	ld a, [wBattleMonSpecies2]
--- a/engine/battle/e.asm
+++ b/engine/battle/e.asm
@@ -758,7 +758,7 @@
 	ld a,1
 	ld [wcc49],a
 	push hl
-	call AddPokemonToParty
+	call AddPartyMon
 	pop hl
 	jr .LoopTrainerData
 .SpecialTrainer
@@ -775,7 +775,7 @@
 	ld a,1
 	ld [wcc49],a
 	push hl
-	call AddPokemonToParty
+	call AddPartyMon
 	pop hl
 	jr .SpecialTrainer
 .AddLoneMove
--- a/engine/give_pokemon.asm
+++ b/engine/give_pokemon.asm
@@ -41,7 +41,7 @@
 	ret
 .asm_4fe01
 	call SetPokedexOwnedFlag
-	call AddPokemonToParty
+	call AddPartyMon
 	ld a, $1
 	ld [wcc3c], a
 	ld [wccd3], a
--- a/engine/hp_bar.asm
+++ b/engine/hp_bar.asm
@@ -1,9 +1,9 @@
-UpdateHPBar_LoadRegisters: ; f9dc (3:79dc)
+HPBarLength: ; f9dc (3:79dc)
 	call GetPredefRegisters
 
 ; calculates bc * 48 / de, the number of pixels the HP bar has
 ; the result is always at least 1
-UpdateHPBar_CalcNumberOfHPBarPixels: ; f9df (3:79df)
+GetHPBarLength: ; f9df (3:79df)
 	push hl
 	xor a
 	ld hl, H_MULTIPLICAND
@@ -254,12 +254,12 @@
 	ld l, a
 	push hl
 	push de
-	call UpdateHPBar_CalcNumberOfHPBarPixels ; calc num pixels for old HP
+	call GetHPBarLength ; calc num pixels for old HP
 	ld a, e
 	pop de
 	pop bc
 	push af
-	call UpdateHPBar_CalcNumberOfHPBarPixels ; calc num pixels for new HP
+	call GetHPBarLength ; calc num pixels for new HP
 	pop af
 	ld d, e
 	ld e, a
--- a/engine/in_game_trades.asm
+++ b/engine/in_game_trades.asm
@@ -136,7 +136,7 @@
 	call RemovePokemon
 	ld a,$80
 	ld [wcc49],a
-	call AddPokemonToParty
+	call AddPartyMon
 	call Func_71d19
 	callab EvolveTradeMon
 	call ClearScreen
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -431,7 +431,7 @@
 	xor a
 	ld [wcc49],a
 	call ClearSprites
-	call AddPokemonToParty	;add mon to Party
+	call AddPartyMon	;add mon to Party
 	jr .End
 .sendToBox	;$5907
 	call ClearSprites
--- a/engine/items/tms.asm
+++ b/engine/items/tms.asm
@@ -1,5 +1,5 @@
 ; tests if mon [wcf91] can learn move [wd0e0]
-TestMonMoveCompatibility: ; 1373e (4:773e)
+CanLearnTM: ; 1373e (4:773e)
 	ld a, [wcf91]
 	ld [wd0b5], a
 	call GetMonHeader
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -1,4 +1,4 @@
-AskForMonNickname: ; 64eb (1:64eb)
+AskName: ; 64eb (1:64eb)
 	call SaveScreenTilesToBuffer1
 	call GetPredefRegisters
 	push hl
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -1,4 +1,4 @@
-DisplayPokedexMenu_: ; 40000 (10:4000)
+ShowPokedexMenu: ; 40000 (10:4000)
 	call GBPalWhiteOut
 	call ClearScreen
 	call UpdateSprites ; move sprites
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -71,7 +71,7 @@
 	ld hl, $ffde
 	ld de, wPlayerMoney + 2 ; wd349
 	ld c, $3
-	ld a, $c ; SubtractBCDPredef
+	ld a, $c ; SubBCDPredef
 	call Predef
 	ld a, $13
 	ld [wd125], a
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -1,4 +1,4 @@
-PrintEmotionBubble: ; 17c47 (5:7c47)
+EmotionBubble: ; 17c47 (5:7c47)
 	ld a, [wcd50]
 	ld c, a
 	ld b, $0
--- a/engine/overworld/item.asm
+++ b/engine/overworld/item.asm
@@ -32,7 +32,7 @@
 
 	ld a, [$ffdb]
 	ld [wcc4d], a
-	ld a, $11 ; RemoveMissableObject
+	ld a, $11 ; HideObject
 	call Predef
 	ld a, 1
 	ld [wcc3c], a
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -89,7 +89,7 @@
 	ld [hl], a
 	jp Func_70755
 
-_DoFlyOrTeleportAwayGraphics: ; 705ba (1c:45ba)
+_LeaveMapAnim: ; 705ba (1c:45ba)
 	call Func_706ef
 	call Func_70787
 	ld a, b
--- a/engine/overworld/trainers.asm
+++ b/engine/overworld/trainers.asm
@@ -159,7 +159,7 @@
 	ret
 
 ; tests if this trainer is in the right position to engage the player and do so if she is.
-CheckEngagePlayer: ; 5690f (15:690f)
+TrainerEngage: ; 5690f (15:690f)
 	push hl
 	push de
 	ld a, [wTrainerSpriteOffset] ; wWhichTrade
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -379,7 +379,7 @@
 ; else send 16 more bytes
 	jr .loop2
 
-LoadSGBBorderAndPalettes: ; 7202b (1c:602b)
+LoadSGB: ; 7202b (1c:602b)
 	xor a
 	ld [wcf1b], a
 	call Func_7209b
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -56,8 +56,7 @@
 	dbw BANK(Func_3f0c6),Func_3f0c6
 	dbw BANK(Func_3f073),Func_3f073
 	dbw BANK(ScaleSpriteByTwo), ScaleSpriteByTwo
-	db BANK(LoadMonBackSprite) ; dbw macro gives an error for some reason
-	dw LoadMonBackSprite
+	dbw BANK(LoadMonBackPic), LoadMonBackPic
 	dbw BANK(Func_79aba),Func_79aba
 	dbw BANK(Func_f132),Func_f132
 HealPartyPredef: ; 4fe8e (13:7e8e)
@@ -66,32 +65,24 @@
 	dbw BANK(MoveAnimation),MoveAnimation; 08 play move animation
 	dbw BANK(DivideBCDPredef),DivideBCDPredef
 	dbw BANK(DivideBCDPredef),DivideBCDPredef
-	dbw BANK(AddBCDPredef),AddBCDPredef
-	db BANK(SubtractBCDPredef)
-	dw SubtractBCDPredef
+	dbw BANK(AddBCDPredef), AddBCDPredef
+	dbw BANK(SubBCDPredef), SubBCDPredef
 	dbw BANK(DivideBCDPredef),DivideBCDPredef
 	dbw BANK(DivideBCDPredef),DivideBCDPredef
-	db BANK(InitializePlayerData)
-	dw InitializePlayerData
+	dbw BANK(InitPlayerData), InitPlayerData
 	dbw BANK(FlagActionPredef),FlagActionPredef
-	db BANK(RemoveMissableObject)
-	dw RemoveMissableObject
-	db BANK(IsMissableObjectHidden)
-	dw IsMissableObjectHidden
+	dbw BANK(HideObject), HideObject
+	dbw BANK(IsObjectHidden), IsObjectHidden
 	dbw BANK(Func_c69c),Func_c69c
-	db BANK(AnyPlayerPokemonAliveCheck)
-	dw AnyPlayerPokemonAliveCheck
-	db BANK(AddMissableObject)
-	dw AddMissableObject
-	db BANK(AddMissableObject)
-	dw AddMissableObject
+	dbw BANK(AnyPartyAlive), AnyPartyAlive
+	dbw BANK(ShowObject), ShowObject
+	dbw BANK(ShowObject), ShowObject
 	dbw BANK(Func_ee9e),Func_ee9e
-	db BANK(InitializePlayerData)
-	dw InitializePlayerData
+	dbw BANK(InitPlayerData), InitPlayerData
 	dbw BANK(Func_c754),Func_c754
 	dbw BANK(Func_3af5b),Func_3af5b
 	dbw BANK(LearnMove),LearnMove
-	dbw BANK(IsItemInBag_),IsItemInBag_; 1C, used in Pokémon Tower
+	dbw BANK(IsItemInBag_),IsItemInBag_ ; 1C, used in Pokémon Tower
 	dbw $03,Func_3eb5 ; for these two, the bank number is actually 0
 	dbw $03,GiveItem
 	dbw BANK(Func_480eb),Func_480eb
@@ -101,12 +92,10 @@
 	dbw BANK(Func_f9a0),Func_f9a0
 	dbw BANK(Func_48125),Func_48125
 	dbw BANK(UpdateHPBar),UpdateHPBar
-	db BANK(UpdateHPBar_LoadRegisters)
-	dw UpdateHPBar_LoadRegisters
+	dbw BANK(HPBarLength), HPBarLength
 	dbw BANK(Func_5ab0),Func_5ab0
 	dbw BANK(Func_3ed02),Func_3ed02
-	db BANK(DisplayPokedexMenu_)
-	dw DisplayPokedexMenu_
+	dbw BANK(ShowPokedexMenu), ShowPokedexMenu
 	dbw BANK(Func_3ad1c),Func_3ad1c
 	dbw BANK(SaveSAVtoSRAM0),SaveSAVtoSRAM0
 	dbw BANK(InitOpponent),InitOpponent
@@ -117,14 +106,12 @@
 	dbw BANK(Func_79dda),Func_79dda
 	dbw BANK(PlayIntro),PlayIntro
 	dbw BANK(Func_79869),Func_79869
-	db BANK(BattleTransition_FlashScreen_)
-	dw BattleTransition_FlashScreen_
+	dbw BANK(FlashScreen), FlashScreen
 	dbw BANK(Func_c586),Func_c586
 	dbw BANK(StatusScreen),StatusScreen ; 37 0x12953
 	dbw BANK(StatusScreen2),StatusScreen2 ; 38
 	dbw BANK(Func_410e2),Func_410e2
-	db BANK(CheckEngagePlayer)
-	dw CheckEngagePlayer
+	dbw BANK(TrainerEngage), TrainerEngage
 	dbw BANK(IndexToPokedex),IndexToPokedex
 	dbw BANK(Predef3B),Predef3B; 3B display pic?
 	dbw BANK(UsedCut),UsedCut
@@ -131,27 +118,21 @@
 	dbw BANK(ShowPokedexData),ShowPokedexData
 	dbw BANK(WriteMonMoves),WriteMonMoves
 	dbw BANK(SaveSAV),SaveSAV
-	db BANK(LoadSGBBorderAndPalettes)
-	dw LoadSGBBorderAndPalettes
+	dbw BANK(LoadSGB), LoadSGB
 	dbw BANK(Func_f113),Func_f113
 	dbw BANK(SetPartyMonTypes),SetPartyMonTypes
-	db BANK(TestMonMoveCompatibility)
-	dw TestMonMoveCompatibility
+	dbw BANK(CanLearnTM), CanLearnTM
 	dbw BANK(TMToMove),TMToMove
 	dbw BANK(Func_71ddf),Func_71ddf
-	db BANK(DisplayStarterMonDex)
-	dw DisplayStarterMonDex; 46 load dex screen
-	db BANK(_AddPokemonToParty)
-	dw _AddPokemonToParty
+	dbw BANK(StarterDex), StarterDex ; 46
+	dbw BANK(_AddPartyMon), _AddPartyMon
 	dbw BANK(UpdateHPBar),UpdateHPBar
 	dbw BANK(Func_3cdec),Func_3cdec
 	dbw BANK(LoadTownMap_Nest),LoadTownMap_Nest
 	dbw BANK(Func_27d6b),Func_27d6b
-	db BANK(PrintEmotionBubble)
-	dw PrintEmotionBubble; 4C player exclamation
+	dbw BANK(EmotionBubble), EmotionBubble; 4C player exclamation
 	dbw BANK(Func_5aaf),Func_5aaf; return immediately
-	db BANK(AskForMonNickname)
-	dw AskForMonNickname
+	dbw BANK(AskName), AskName
 	dbw BANK(PewterGuys),PewterGuys
 	dbw BANK(SaveSAVtoSRAM2),SaveSAVtoSRAM2
 	dbw BANK(LoadSAVCheckSum2),LoadSAVCheckSum2
@@ -158,17 +139,13 @@
 	dbw BANK(LoadSAV),LoadSAV
 	dbw BANK(SaveSAVtoSRAM1),SaveSAVtoSRAM1
 	dbw BANK(Predef54),Predef54 ; 54 initiate trade
-	db BANK(HallOfFameComputer)
-	dw HallOfFameComputer
+	dbw BANK(HallOfFamePC), HallOfFamePC
 	dbw BANK(DisplayDexRating),DisplayDexRating
-	db $1E ; uses wrong bank number
-	dw _DoFlyOrTeleportAwayGraphics
-	db $1E ; uses wrong bank number
-	dw Func_70510
+	dbw $1E, _LeaveMapAnim ; wrong bank
+	dbw $1E, Func_70510 ; wrong bank
 	dbw BANK(Func_c5be),Func_c5be
 	dbw BANK(Func_c60b),Func_c60b
-	db BANK(PrintUsedStrengthText)
-	dw PrintUsedStrengthText
+	dbw BANK(PrintStrengthTxt), PrintStrengthTxt
 	dbw BANK(PickupItem),PickupItem
 	dbw BANK(Func_27d98),Func_27d98
 	dbw BANK(LoadMovePPs),LoadMovePPs
--- a/engine/predefs17.asm
+++ b/engine/predefs17.asm
@@ -1,6 +1,6 @@
 ; this function temporarily makes the starters (and Ivysaur) seen
 ; so that the full Pokedex information gets displayed in Oak's lab
-DisplayStarterMonDex: ; 5c0dc (17:40dc)
+StarterDex: ; 5c0dc (17:40dc)
 	ld a, %01001011 ; set starter flags
 	ld [wPokedexOwned], a ; wPokedexOwned
 	ld a, $3d
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -618,7 +618,7 @@
 	ld [hli], a
 	ld de, wPlayerCoins + 1
 	ld c, $2
-	ld a, $c ; SubtractBCDPredef
+	ld a, $c ; SubBCDPredef
 	call Predef
 
 SlotMachine_37754: ; 37754 (d:7754)
--- a/home.asm
+++ b/home.asm
@@ -4146,11 +4146,11 @@
 	ld b, BANK(_RemovePokemon)
 	jp Bankswitch
 
-AddPokemonToParty:: ; 3927 (0:3927)
+AddPartyMon:: ; 3927 (0:3927)
 	push hl
 	push de
 	push bc
-	callba _AddPokemonToParty
+	callba _AddPartyMon
 	pop bc
 	pop de
 	pop hl
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -332,7 +332,7 @@
 	ld a,[W_CURMAP]
 	cp a,OAKS_LAB
 	jp z,.noFaintCheck
-	callab AnyPlayerPokemonAliveCheck ; check if all the player's pokemon fainted
+	callab AnyPartyAlive ; check if all the player's pokemon fainted
 	ld a,d
 	and a
 	jr z,.allPokemonFainted
@@ -507,7 +507,7 @@
 ; if it's a Silph Co. teleporter
 	ld hl,wd732
 	set 3,[hl]
-	call DoFlyOrTeleportAwayGraphics
+	call LeaveMapAnim
 	jr .skipMapChangeSound
 .notTeleporter
 	call PlayMapChangeSound
@@ -778,7 +778,7 @@
 	ld hl, wd732
 	set 2, [hl]
 	res 5, [hl]
-	call DoFlyOrTeleportAwayGraphics
+	call LeaveMapAnim
 	ld a, Bank(Func_62ce)
 	ld [H_LOADEDROMBANK], a
 	ld [$2000], a
@@ -785,9 +785,9 @@
 	call Func_62ce
 	jp Func_5d5f
 
-DoFlyOrTeleportAwayGraphics::
-	ld b, BANK(_DoFlyOrTeleportAwayGraphics)
-	ld hl, _DoFlyOrTeleportAwayGraphics
+LeaveMapAnim::
+	ld b, BANK(_LeaveMapAnim)
+	ld hl, _LeaveMapAnim
 	jp Bankswitch
 
 LoadPlayerSpriteGraphics::
--- a/main.asm
+++ b/main.asm
@@ -487,7 +487,7 @@
 	xor a
 	ld [wcc49], a
 	ld [W_CURMAP], a
-	call AddPokemonToParty
+	call AddPartyMon
 
 	; Fight against a
 	; level 20 Rhydon.
@@ -686,7 +686,7 @@
 	ld a, [de]
 	ld [W_CURENEMYLVL], a
 	inc de
-	call AddPokemonToParty
+	call AddPartyMon
 	jr .loop
 
 IshiharaTeam: ; 64df (1:64df)
@@ -2638,7 +2638,7 @@
 
 INCLUDE "data/hide_show_data.asm"
 
-PrintUsedStrengthText: ; cd99 (3:4d99)
+PrintStrengthTxt: ; cd99 (3:4d99)
 	ld hl, wd728
 	set 0, [hl]
 	ld hl, UsedStrengthText
@@ -3231,7 +3231,7 @@
 	jr .missableObjectsLoop
 
 ; tests if current sprite is a missable object that is hidden/has been removed
-IsMissableObjectHidden: ; f1a6 (3:71a6)
+IsObjectHidden: ; f1a6 (3:71a6)
 	ld a, [H_CURRENTSPRITEOFFSET]
 	swap a
 	ld b, a
@@ -3258,7 +3258,7 @@
 
 ; adds missable object (items, leg. pokemon, etc.) to the map
 ; [wcc4d]: index of the missable object to be added (global index)
-AddMissableObject: ; f1c8 (3:71c8)
+ShowObject: ; f1c8 (3:71c8)
 	ld hl, W_MISSABLEOBJECTFLAGS
 	ld a, [wcc4d]
 	ld c, a
@@ -3268,7 +3268,7 @@
 
 ; removes missable object (items, leg. pokemon, etc.) from the map
 ; [wcc4d]: index of the missable object to be removed (global index)
-RemoveMissableObject: ; f1d7 (3:71d7)
+HideObject: ; f1d7 (3:71d7)
 	ld hl, W_MISSABLEOBJECTFLAGS
 	ld a, [wcc4d]
 	ld c, a
@@ -3452,7 +3452,7 @@
 	res 6, [hl]
 	ret
 
-_AddPokemonToParty: ; f2e5 (3:72e5)
+_AddPartyMon: ; f2e5 (3:72e5)
 	ld de, wPartyCount ; wPartyCount
 	ld a, [wcc49]
 	and $f
@@ -3668,7 +3668,7 @@
 	inc de
 	inc de
 	pop hl
-	call AddPokemonToParty_WriteMovePP
+	call AddPartyMon_WriteMovePP
 	inc de
 	ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
 	ld [de], a
@@ -3694,7 +3694,7 @@
 LoadMovePPs: ; f473 (3:7473)
 	call GetPredefRegisters
 	; fallthrough
-AddPokemonToParty_WriteMovePP: ; f476 (3:7476)
+AddPartyMon_WriteMovePP: ; f476 (3:7476)
 	ld b, $4
 .pploop
 	ld a, [hli]     ; read move ID
@@ -4286,7 +4286,7 @@
 	ld de, $ffa1
 	ld hl, $ffa4
 	push bc
-	call SubtractBCD
+	call SubBCD
 	pop bc
 	jr .asm_f803
 
@@ -4318,10 +4318,10 @@
 	ret
 
 
-SubtractBCDPredef::
+SubBCDPredef::
 	call GetPredefRegisters
 
-SubtractBCD::
+SubBCD::
 	and a
 	ld b, c
 .sub
@@ -4346,7 +4346,7 @@
 	ret
 
 
-InitializePlayerData:
+InitPlayerData:
 
 	call Random
 	ld a, [hRandomSub]
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -157,7 +157,7 @@
 	ld hl, $ffa1
 	ld de, wPlayerMoney + 2
 	ld c, $3
-	ld a, $c ; SubtractBCDPredef
+	ld a, $c ; SubBCDPredef
 	call Predef
 	xor a
 	ldh [$9f], a
--- a/scripts/daycarem.asm
+++ b/scripts/daycarem.asm
@@ -156,7 +156,7 @@
 	inc hl
 	ld de, wPlayerMoney + 2
 	ld c, $3
-	ld a, $c ; SubtractBCDPredef
+	ld a, $c ; SubBCDPredef
 	call Predef
 	ld a, (SFX_02_5a - SFX_Headers_02) / 3
 	call PlaySoundWaitForCurrent
--- a/scripts/mtmoonpokecenter.asm
+++ b/scripts/mtmoonpokecenter.asm
@@ -55,7 +55,7 @@
 	ld hl, wTrainerFacingDirection
 	ld de, wPlayerMoney + 2
 	ld c, $3
-	ld a, $c ; SubtractBCDPredef
+	ld a, $c ; SubBCDPredef
 	call Predef
 	ld a, $13
 	ld [wd125], a
--- a/scripts/museum1f.asm
+++ b/scripts/museum1f.asm
@@ -103,7 +103,7 @@
 	ld hl, wTrainerFacingDirection
 	ld de, wPlayerMoney + 2
 	ld c, $3
-	ld a, $c ; SubtractBCDPredef
+	ld a, $c ; SubBCDPredef
 	call Predef
 	ld a, $13
 	ld [wd125], a
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -847,7 +847,7 @@
 	ld hl, wd730
 	set 6, [hl]
 	ld a, $46
-	call Predef ; DisplayStarterMonDex
+	call Predef ; StarterDex
 	ld hl, wd730
 	res 6, [hl]
 	call ReloadMapData
@@ -921,7 +921,7 @@
 	ld [W_CURENEMYLVL], a
 	ld a, [wcf91]
 	ld [wd11e], a
-	call AddPokemonToParty
+	call AddPartyMon
 	ld hl, wd72e
 	set 3, [hl]
 	ld a, $fc
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/safarizoneentrance.asm
@@ -176,7 +176,7 @@
 	ld hl, wTrainerFacingDirection
 	ld de, wPlayerMoney + 2
 	ld c, $3
-	ld a, $c ; SubtractBCDPredef
+	ld a, $c ; SubBCDPredef
 	call Predef
 	ld a, $13
 	ld [wd125], a