Merge https://github.com/libjet/pokegold

1 files changed, 30 insertions, 30 deletions

diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index 28cda6ef..bbfea25e 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -126,7 +126,7 @@ GeneratePartyMonStats:
 	push de
 	ld a, [wCurPartyLevel]
 	ld d, a
-	callab CalcExpAtLevel ; 14:5550
+	callfar CalcExpAtLevel ; 14:5550
 	pop de
 	ld a, [hPrintNum2]
 	ld [de], a
@@ -150,7 +150,7 @@ GeneratePartyMonStats:
 	and $f
 	jr z, .asm_d998
 	push hl
-	callba GetTrainerDVs ; 9:7271
+	farcall GetTrainerDVs ; 9:7271
 	pop hl
 	jr .asm_d9bb
 
@@ -214,7 +214,7 @@ GeneratePartyMonStats:
 	ld a, $1
 	ld c, a
 	ld b, $0
-	call CalcPkmnStatC
+	call CalcMonStatC
 	ld a, [hStringCmpString2]
 	ld [de], a
 	inc de
@@ -281,7 +281,7 @@ GeneratePartyMonStats:
 	ld bc, $a
 	add hl, bc
 	ld b, $0
-	call CalcPkmnStats
+	call CalcMonStats
 .asm_da4b
 	ld a, [wMonType]
 	and $f
@@ -295,7 +295,7 @@ GeneratePartyMonStats:
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	predef GetUnownLetter
-	callab UpdateUnownDex
+	callfar UpdateUnownDex
 .asm_da71
 	scf
 	ret
@@ -396,7 +396,7 @@ AddTempmonToParty: ; da9c (3:5a9c)
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	predef GetUnownLetter
-	callab UpdateUnownDex
+	callfar UpdateUnownDex
 	ld a, [wFirstUnownSeen]
 	and a
 	jr nz, .asm_db43
@@ -406,7 +406,7 @@ AddTempmonToParty: ; da9c (3:5a9c)
 	and a
 	ret
 
-SentGetPkmnIntoFromBox: ; db45 (3:5b45)
+SendGetMonIntoFromBox: ; db45 (3:5b45)
 	ld a, $1
 	call OpenSRAM
 	ld a, [wPokemonWithdrawDepositParameter]
@@ -544,8 +544,8 @@ SentGetPkmnIntoFromBox: ; db45 (3:5b45)
 	srl a
 	add $2
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
-	callab CalcLevel
+	predef CopyMonToTempMon
+	callfar CalcLevel
 	ld a, d
 	ld [wCurPartyLevel], a
 	pop hl
@@ -562,7 +562,7 @@ SentGetPkmnIntoFromBox: ; db45 (3:5b45)
 	add hl, bc
 	push bc
 	ld b, $1
-	call CalcPkmnStats
+	call CalcMonStats
 	pop bc
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
@@ -649,7 +649,7 @@ Functiondcbc: ; dcbc (3:5cbc)
 	push bc
 	push hl
 	push de
-	callba GetMaxPPOfMove ; same bank
+	farcall GetMaxPPOfMove ; same bank
 	pop de
 	pop hl
 	ld a, [wd151]
@@ -766,7 +766,7 @@ Functiondd6a: ; dd6a (3:5d6a)
 	add hl, bc
 	push bc
 	ld b, $1
-	call CalcPkmnStats
+	call CalcMonStats
 	ld hl, wPartyMon1Moves
 	ld a, [wPokemonData]
 	dec a
@@ -780,10 +780,10 @@ Functiondd6a: ; dd6a (3:5d6a)
 	ld a, [wPartyCount]
 	dec a
 	ld [wCurPartyMon], a
-	callba Functionc6bc ; same bank
+	farcall Functionc6bc ; same bank
 	ld a, [wCurPartyLevel]
 	ld d, a
-	callab CalcExpAtLevel
+	callfar CalcExpAtLevel
 	pop bc
 	ld hl, $8
 	add hl, bc
@@ -836,7 +836,7 @@ Functionde4a: ; de4a (3:5e4a)
 	ld bc, BOXMON_STRUCT_LENGTH
 	jp CopyBytes
 
-SentPkmnIntoBox: ; de74 (3:5e74)
+SendMonIntoBox: ; de74 (3:5e74)
 	ld a, $1
 	call OpenSRAM
 	ld de, sBoxCount
@@ -884,7 +884,7 @@ SentPkmnIntoBox: ; de74 (3:5e74)
 	push de
 	ld a, [wCurPartyLevel]
 	ld d, a
-	callab CalcExpAtLevel
+	callfar CalcExpAtLevel
 	pop de
 	ld a, [hQuotient]
 	ld [de], a
@@ -930,7 +930,7 @@ SentPkmnIntoBox: ; de74 (3:5e74)
 	jr nz, .asm_df26
 	ld hl, sBoxMon1DVs
 	predef GetUnownLetter
-	callab UpdateUnownDex
+	callfar UpdateUnownDex
 .asm_df26
 	ld hl, sBoxMon1Moves
 	ld de, wTempMonMoves
@@ -995,8 +995,8 @@ Functiondf65: ; df65 (3:5f65)
 GiveEgg: ; df92 (3:5f92)
 	ld a, [wCurPartySpecies]
 	push af
-	callab GetPreEvolution
-	callab GetPreEvolution
+	callfar GetPreEvolution
+	callfar GetPreEvolution
 	ld a, [wCurPartySpecies]
 	dec a
 	push af
@@ -1016,7 +1016,7 @@ GiveEgg: ; df92 (3:5f92)
 	ld d, $0
 	ld hl, wPokedexCaught
 	ld b, RESET_FLAG
-	predef FlagPredef
+	predef SmallFarFlagAction
 .asm_dfc9
 	pop bc
 	ld a, c
@@ -1028,7 +1028,7 @@ GiveEgg: ; df92 (3:5f92)
 	ld d, $0
 	ld hl, wPokedexSeen
 	ld b, RESET_FLAG
-	predef FlagPredef
+	predef SmallFarFlagAction
 .asm_dfdf
 	pop af
 	ld [wCurPartySpecies], a
@@ -1234,7 +1234,7 @@ ComputeNPCTrademonStats:
 	ld a, MON_STAT_EXP - 1
 	call GetPartyParamLocation
 	ld b, $1
-	call CalcPkmnStats
+	call CalcMonStats
 	pop de
 	ld a, MON_HP
 	call GetPartyParamLocation
@@ -1245,7 +1245,7 @@ ComputeNPCTrademonStats:
 	ld [hl], a
 	ret
 
-CalcPkmnStats: ; e16d
+CalcMonStats: ; e16d
 ; Calculates all 6 Stats of a Pkmn
 ; b: Take into account stat EXP if TRUE
 ; 'c' counts from 1-6 and points with 'BaseStats' to the base value
@@ -1255,7 +1255,7 @@ CalcPkmnStats: ; e16d
 	ld c, $0
 .loop
 	inc c
-	call CalcPkmnStatC
+	call CalcMonStatC
 	ld a, [hMultiplicand + 1]
 	ld [de], a
 	inc de
@@ -1268,7 +1268,7 @@ CalcPkmnStats: ; e16d
 	ret
 ; e17b
 
-CalcPkmnStatC: ; e181
+CalcMonStatC: ; e181
 ; 'c' is 1-6 and points to the BaseStat
 ; 1: HP
 ; 2: Attack
@@ -1510,8 +1510,8 @@ GivePoke: ; Give a Pokemon from script
 .asm_e2c9
 	ld a, [wCurPartySpecies]
 	ld [wTempEnemyMonSpecies], a
-	callab LoadEnemyMon
-	call SentPkmnIntoBox
+	callfar LoadEnemyMon
+	call SendMonIntoBox
 	jp nc, Functione3af
 	ld a, BOXMON
 	ld [wMonType], a
@@ -1596,7 +1596,7 @@ GivePoke: ; Give a Pokemon from script
 	jr .asm_e38d
 
 .asm_e381
-	callab Functionc7cd0
+	callfar Functionc7cd0
 	pop de
 	jr c, .asm_e38d
 	call InitNickname
@@ -1625,7 +1625,7 @@ Functione3af: ; e3af (3:63af)
 	ret
 
 TextJump_WasSentToBillsPC:
-	text_jump Text_WasSentToBillsPC
+	text_far Text_WasSentToBillsPC
 	db "@"
 
 InitNickname: ; e3b9 (3:63b9)
@@ -1635,7 +1635,7 @@ InitNickname: ; e3b9 (3:63b9)
 	pop de
 	push de
 	ld b, $0
-	callba NamingScreen
+	farcall NamingScreen
 	pop hl
 	ld de, wStringBuffer1
 	call InitName