pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pkmn -> Mon

Browse Source 
Since we're aiming for consistency across the codebase, I believe it
includes a uniform way to refer to the creatures this game consists of
in the labels of the code.
The only exceptions to this rule are labels referring to things named
through the use of the <PK><MN> or <PKMN> characters, in which case PKMN
is used.

Most of this was already consistent enough™, I just picked the
convention with the most occurences and fixed the outliers.
This commit is contained in:
mid-kid 2018-02-22 17:13:29 +01:00
parent c3abe8f88b
commit e8bc86d1fe
41 changed files with 333 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/battle_tower_constants.asm
View File

@ -1,7 +1,7 @@
BATTLETOWER_PARTY_LENGTH EQU 3 BATTLETOWER_PARTY_LENGTH EQU 3
BATTLETOWER_STREAK_LENGTH EQU 7 BATTLETOWER_STREAK_LENGTH EQU 7
BATTLETOWER_NUM_UNIQUE_PKMN EQU 21 BATTLETOWER_NUM_UNIQUE_MON EQU 21
BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70
BATTLETOWER_TRAINERDATALENGTH EQU $24 BATTLETOWER_TRAINERDATALENGTH EQU $24

6
constants/radio_constants.asm
View File

@ -97,7 +97,7 @@
; PlayRadio.StationPointers indexes (see engine/pokegear.asm) ; PlayRadio.StationPointers indexes (see engine/pokegear.asm)
const_def const_def
const MAPRADIO_POKEMON_CHANNEL const MAPRADIO_POKEMON_CHANNEL
const MAPRADIO_OAKS_MON_TALK const MAPRADIO_OAKS_POKEMON_TALK
const MAPRADIO_POKEDEX_SHOW const MAPRADIO_POKEDEX_SHOW
const MAPRADIO_POKEMON_MUSIC const MAPRADIO_POKEMON_MUSIC
const MAPRADIO_LUCKY_CHANNEL const MAPRADIO_LUCKY_CHANNEL
@ -108,8 +108,8 @@
; These tables in engine/radio.asm are all sized to a power of 2 ; These tables in engine/radio.asm are all sized to a power of 2
; so there's no need for a rejection sampling loop ; so there's no need for a rejection sampling loop
NUM_OAKS_MON_TALK_ADVERBS EQU 16 ; OaksPkmnTalk8.Adverbs NUM_OAKS_POKEMON_TALK_ADVERBS EQU 16 ; OaksPKMNTalk8.Adverbs
NUM_OAKS_MON_TALK_ADJECTIVES EQU 16 ; OaksPkmnTalk9.Adjectives NUM_OAKS_POKEMON_TALK_ADJECTIVES EQU 16 ; OaksPKMNTalk9.Adjectives
NUM_PNP_PEOPLE_ADJECTIVES EQU 16 ; PeoplePlaces5.Adjectives NUM_PNP_PEOPLE_ADJECTIVES EQU 16 ; PeoplePlaces5.Adjectives
NUM_PNP_PLACES_ADJECTIVES EQU 16 ; PeoplePlaces7.Adjectives NUM_PNP_PLACES_ADJECTIVES EQU 16 ; PeoplePlaces7.Adjectives

20
data/battle/battle_text.asm
View File

@ -137,14 +137,14 @@ BattleText_SafeguardFaded: ; 0x808d2
prompt prompt
; 0x808e7 ; 0x808e7
BattleText_PkmnLightScreenFell: ; 0x808e7 BattleText_MonsLightScreenFell: ; 0x808e7
text_from_ram wStringBuffer1 text_from_ram wStringBuffer1
text " #MON's" text " #MON's"
line "LIGHT SCREEN fell!" line "LIGHT SCREEN fell!"
prompt prompt
; 0x80905 ; 0x80905
BattleText_PkmnReflectFaded: ; 0x80905 BattleText_MonsReflectFaded: ; 0x80905
text_from_ram wStringBuffer1 text_from_ram wStringBuffer1
text " #MON's" text " #MON's"
line "REFLECT faded!" line "REFLECT faded!"
@ -186,7 +186,7 @@ BattleText_TheSandstormSubsided: ; 0x8098f
prompt prompt
; 0x809a8 ; 0x809a8
BattleText_EnemyPkmnFainted: ; 0x809a8 BattleText_EnemyMonFainted: ; 0x809a8
text "Enemy @" text "Enemy @"
text_from_ram wEnemyMonNick text_from_ram wEnemyMonNick
text_start text_start
@ -236,7 +236,7 @@ BattleText_0x80a4f: ; 0x80a4f
prompt prompt
; 0x80a75 ; 0x80a75
BattleText_PkmnFainted: ; 0x80a75 BattleText_MonFainted: ; 0x80a75
text_from_ram wBattleMonNick text_from_ram wBattleMonNick
text_start text_start
line "fainted!" line "fainted!"
@ -261,7 +261,7 @@ LostAgainstText: ; 0x80ab9
prompt prompt
; 0x80aca ; 0x80aca
BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca BattleText_EnemyIsAboutToUseWillPlayerChangeMon: ; 0x80aca
text "<ENEMY>" text "<ENEMY>"
line "is about to use" line "is about to use"
cont "@" cont "@"
@ -353,14 +353,14 @@ BattleText_ItemsCantBeUsedHere: ; 0x80bf3
prompt prompt
; 0x80c0d ; 0x80c0d
BattleText_PkmnIsAlreadyOut: ; 0x80c0d BattleText_MonIsAlreadyOut: ; 0x80c0d
text_from_ram wBattleMonNick text_from_ram wBattleMonNick
text_start text_start
line "is already out." line "is already out."
prompt prompt
; 0x80c22 ; 0x80c22
BattleText_PkmnCantBeRecalled: ; 0x80c22 BattleText_MonCantBeRecalled: ; 0x80c22
text_from_ram wBattleMonNick text_from_ram wBattleMonNick
text_start text_start
line "can't be recalled!" line "can't be recalled!"
@ -379,7 +379,7 @@ BattleText_TheMoveIsDisabled: ; 0x80c5b
prompt prompt
; 0x80c72 ; 0x80c72
BattleText_PkmnHasNoMovesLeft: ; 0x80c72 BattleText_MonHasNoMovesLeft: ; 0x80c72
text_from_ram wBattleMonNick text_from_ram wBattleMonNick
text_start text_start
line "has no moves left!" line "has no moves left!"
@ -402,7 +402,7 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
db "@@" db "@@"
; 0x80cb9 ; 0x80cb9
BattleText_WildPkmnIsEating: ; 0x80cba BattleText_WildMonIsEating: ; 0x80cba
text "Wild @" text "Wild @"
text_from_ram wEnemyMonNick text_from_ram wEnemyMonNick
text_start text_start
@ -410,7 +410,7 @@ BattleText_WildPkmnIsEating: ; 0x80cba
prompt prompt
; 0x80cd1 ; 0x80cd1
BattleText_WildPkmnIsAngry: ; 0x80cd1 BattleText_WildMonIsAngry: ; 0x80cd1
text "Wild @" text "Wild @"
text_from_ram wEnemyMonNick text_from_ram wEnemyMonNick
text_start text_start

2
data/common_text/common_text_1.asm
View File

@ -1121,7 +1121,7 @@ Text_RemainingTime::
text "Remaining Time" text "Remaining Time"
done done
Text_YourPkmnsHPWasHealed:: Text_YourMonsHPWasHealed::
text "Your #MON's HP" text "Your #MON's HP"
line "was healed." line "was healed."
prompt prompt

10
data/common_text/common_text_2.asm
View File

@ -113,17 +113,17 @@ Text_StringBuffer2ExpPoints::
text " EXP. Points!" text " EXP. Points!"
prompt prompt
Text_GoPkmn:: Text_GoMon::
text "Go! @@" text "Go! @@"
Text_DoItPkmn:: Text_DoItMon::
text "Do it! @@" text "Do it! @@"
Text_GoForItPkmn:: Text_GoForItMon::
text "Go for it," text "Go for it,"
line "@@" line "@@"
Text_YourFoesWeakGetmPkmn:: Text_YourFoesWeakGetmMon::
text "Your foe's weak!" text "Your foe's weak!"
line "Get'm, @@" line "Get'm, @@"
@ -618,7 +618,7 @@ UnknownText_0x1c0bee::
cont "time to use that!" cont "time to use that!"
prompt prompt
Text_YouDontHaveAPkmn:: Text_YouDontHaveAMon::
text "You don't have a" text "You don't have a"
line "#MON!" line "#MON!"
prompt prompt

6
data/common_text/common_text_3.asm
View File

@ -1139,14 +1139,14 @@ UnknownText_0x1c59a3::
para "" para ""
done done
Text_OnlyThreePkmnMayBeEntered:: Text_OnlyThreeMonMayBeEntered::
text "Only three #MON" text "Only three #MON"
line "may be entered." line "may be entered."
para "" para ""
done done
Text_ThePkmnMustAllBeDifferentKinds:: Text_TheMonMustAllBeDifferentKinds::
text "The @" text "The @"
text_from_ram wStringBuffer2 text_from_ram wStringBuffer2
text " #MON" text " #MON"
@ -1156,7 +1156,7 @@ Text_ThePkmnMustAllBeDifferentKinds::
para "" para ""
done done
Text_ThePkmnMustNotHoldTheSameItems:: Text_TheMonMustNotHoldTheSameItems::
text "The @" text "The @"
text_from_ram wStringBuffer2 text_from_ram wStringBuffer2
text " #MON" text " #MON"

12
data/predef_pointers.asm
View File

@ -15,19 +15,19 @@ PredefPointers:: ; 856b
add_predef FillPP add_predef FillPP
add_predef TryAddMonToParty add_predef TryAddMonToParty
add_predef AddTempmonToParty add_predef AddTempmonToParty
add_predef SendGetPkmnIntoFromBox add_predef SendGetMonIntoFromBox
add_predef SendPkmnIntoBox add_predef SendMonIntoBox
add_predef GiveEgg add_predef GiveEgg
add_predef AnimateHPBar add_predef AnimateHPBar
add_predef CalcPkmnStats add_predef CalcMonStats
add_predef CalcPkmnStatC add_predef CalcMonStatC
add_predef CanLearnTMHMMove add_predef CanLearnTMHMMove
add_predef GetTMHMMove add_predef GetTMHMMove
add_predef LinkTextboxAtHL ; $ 10 add_predef LinkTextboxAtHL ; $ 10
add_predef PrintMoveDesc add_predef PrintMoveDesc
add_predef UpdatePlayerHUD add_predef UpdatePlayerHUD
add_predef PlaceGraphic add_predef PlaceGraphic
add_predef CheckPlayerPartyForFitPkmn add_predef CheckPlayerPartyForFitMon
add_predef UpdateEnemyHUD add_predef UpdateEnemyHUD
add_predef StartBattle add_predef StartBattle
add_predef FillInExpBar add_predef FillInExpBar
@ -38,7 +38,7 @@ PredefPointers:: ; 856b
add_predef EvolveAfterBattle add_predef EvolveAfterBattle
add_predef TradeAnimationPlayer2 add_predef TradeAnimationPlayer2
add_predef TradeAnimation add_predef TradeAnimation
add_predef CopyPkmnToTempMon add_predef CopyMonToTempMon
add_predef ListMoves ; $20 add_predef ListMoves ; $20
add_predef PlaceNonFaintStatus add_predef PlaceNonFaintStatus
add_predef Unused_PlaceEnemyHPLevel add_predef Unused_PlaceEnemyHPLevel

4
data/radio/oaks_pkmn_talk_routes.asm
View File

@ -1,6 +1,6 @@
; Oak's Pokémon Talk will list wild Pokémon on these maps. ; Oak's Pokémon Talk will list wild Pokémon on these maps.
OaksPkmnTalkRoutes: OaksPKMNTalkRoutes:
map ROUTE_29 map ROUTE_29
map ROUTE_46 map ROUTE_46
map ROUTE_30 map ROUTE_30
@ -16,4 +16,4 @@ OaksPkmnTalkRoutes:
map ROUTE_45 map ROUTE_45
map ROUTE_36 map ROUTE_36
map ROUTE_31 map ROUTE_31
OaksPkmnTalkRoutesEnd OaksPKMNTalkRoutesEnd

2
docs/bugs_and_glitches.md
View File

@ -261,7 +261,7 @@ This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engi
ret nz ret nz
.force_struggle .force_struggle
ld hl, BattleText_PkmnHasNoMovesLeft ld hl, BattleText_MonHasNoMovesLeft
call StdBattleTextBox call StdBattleTextBox
ld c, 60 ld c, 60
call DelayFrames call DelayFrames

2
engine/battle/ai/items.asm
View File

@ -74,7 +74,7 @@ SwitchOften: ; 38045
ld a, [wEnemySwitchMonParam] ld a, [wEnemySwitchMonParam]
and $f and $f
inc a inc a
; In register 'a' is the number (1-6) of the Pkmn to switch to ; In register 'a' is the number (1-6) of the mon to switch to
ld [wEnemySwitchMonIndex], a ld [wEnemySwitchMonIndex], a
jp AI_TrySwitch jp AI_TrySwitch
; 38083 ; 38083

142
engine/battle/core.asm
View File

@ -47,7 +47,7 @@ DoBattle: ; 3c000
.player_2 .player_2
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
call CheckPlayerPartyForFitPkmn call CheckPlayerPartyForFitMon
ld a, d ld a, d
and a and a
jp z, LostBattle jp z, LostBattle
@ -86,7 +86,7 @@ DoBattle: ; 3c000
call ResetBattleParticipants call ResetBattleParticipants
call InitBattleMon call InitBattleMon
call ResetPlayerStatLevels call ResetPlayerStatLevels
call SendOutPkmnText call SendOutMonText
call NewBattleMonStatus call NewBattleMonStatus
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
@ -1697,7 +1697,7 @@ HandleScreens: ; 3cb36
res SCREENS_LIGHT_SCREEN, [hl] res SCREENS_LIGHT_SCREEN, [hl]
push hl push hl
push de push de
ld hl, BattleText_PkmnLightScreenFell ld hl, BattleText_MonsLightScreenFell
call StdBattleTextBox call StdBattleTextBox
pop de pop de
pop hl pop hl
@ -1711,7 +1711,7 @@ HandleScreens: ; 3cb36
ld [de], a ld [de], a
ret nz ret nz
res SCREENS_REFLECT, [hl] res SCREENS_REFLECT, [hl]
ld hl, BattleText_PkmnReflectFaded ld hl, BattleText_MonsReflectFaded
jp StdBattleTextBox jp StdBattleTextBox
; 3cb9e ; 3cb9e
@ -1822,7 +1822,7 @@ SubtractHPFromTarget: ; 3cc39
; 3cc3f ; 3cc3f
SubtractHPFromUser: ; 3cc3f SubtractHPFromUser: ; 3cc3f
; Subtract HP from Pkmn ; Subtract HP from mon
call SubtractHP call SubtractHP
jp UpdateHPBarBattleHuds jp UpdateHPBarBattleHuds
; 3cc45 ; 3cc45
@ -2054,7 +2054,7 @@ HandleEnemyMonFaint: ; 3cd55
xor a xor a
ld [wWhichMonFaintedFirst], a ld [wWhichMonFaintedFirst], a
call UpdateBattleStateAndExperienceAfterEnemyFaint call UpdateBattleStateAndExperienceAfterEnemyFaint
call CheckPlayerPartyForFitPkmn call CheckPlayerPartyForFitMon
ld a, d ld a, d
and a and a
jp z, LostBattle jp z, LostBattle
@ -2186,7 +2186,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01
call PlayerMonFaintHappinessMod call PlayerMonFaintHappinessMod
.player_mon_did_not_faint .player_mon_did_not_faint
call CheckPlayerPartyForFitPkmn call CheckPlayerPartyForFitMon
ld a, d ld a, d
and a and a
ret z ret z
@ -2308,7 +2308,7 @@ FaintYourPokemon: ; 3cef1
hlcoord 9, 7 hlcoord 9, 7
lb bc, 5, 11 lb bc, 5, 11
call ClearBox call ClearBox
ld hl, BattleText_PkmnFainted ld hl, BattleText_MonFainted
jp StdBattleTextBox jp StdBattleTextBox
; 3cf14 ; 3cf14
@ -2322,7 +2322,7 @@ FaintEnemyPokemon: ; 3cf14
hlcoord 1, 0 hlcoord 1, 0
lb bc, 4, 10 lb bc, 4, 10
call ClearBox call ClearBox
ld hl, BattleText_EnemyPkmnFainted ld hl, BattleText_EnemyMonFainted
jp StdBattleTextBox jp StdBattleTextBox
; 3cf35 ; 3cf35
@ -2670,7 +2670,7 @@ HandlePlayerMonFaint: ; 3d14e
ld a, $1 ld a, $1
ld [wWhichMonFaintedFirst], a ld [wWhichMonFaintedFirst], a
call PlayerMonFaintHappinessMod call PlayerMonFaintHappinessMod
call CheckPlayerPartyForFitPkmn call CheckPlayerPartyForFitMon
ld a, d ld a, d
and a and a
jp z, LostBattle jp z, LostBattle
@ -2829,7 +2829,7 @@ ForcePlayerMonChoice: ; 3d227
call CloseWindow call CloseWindow
call GetMemSGBLayout call GetMemSGBLayout
call SetPalettes call SetPalettes
call SendOutPkmnText call SendOutMonText
call NewBattleMonStatus call NewBattleMonStatus
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
@ -2851,7 +2851,7 @@ PlayerPartyMonEntrance: ; 3d2b3
call AddBattleParticipant call AddBattleParticipant
call InitBattleMon call InitBattleMon
call ResetPlayerStatLevels call ResetPlayerStatLevels
call SendOutPkmnText call SendOutMonText
call NewBattleMonStatus call NewBattleMonStatus
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
@ -2934,7 +2934,7 @@ SwitchMonAlreadyOut: ; 3d34f
cp [hl] cp [hl]
jr nz, .notout jr nz, .notout
ld hl, BattleText_PkmnIsAlreadyOut ld hl, BattleText_MonIsAlreadyOut
call StdBattleTextBox call StdBattleTextBox
scf scf
ret ret
@ -3197,11 +3197,11 @@ ForceEnemySwitch: ; 3d4c3
ld a, [wEnemySwitchMonIndex] ld a, [wEnemySwitchMonIndex]
dec a dec a
ld b, a ld b, a
call LoadEnemyPkmnToSwitchTo call LoadEnemyMonToSwitchTo
call ClearEnemyMonBox call ClearEnemyMonBox
call NewEnemyMonStatus call NewEnemyMonStatus
call ResetEnemyStatLevels call ResetEnemyStatLevels
call Function_SetEnemyPkmnAndSendOutAnimation call Function_SetEnemyMonAndSendOutAnimation
call BreakAttraction call BreakAttraction
call ResetBattleParticipants call ResetBattleParticipants
ret ret
@ -3214,15 +3214,15 @@ EnemySwitch: ; 3d4e1
call ResetEnemyBattleVars call ResetEnemyBattleVars
call CheckWhetherSwitchmonIsPredetermined call CheckWhetherSwitchmonIsPredetermined
jr c, .skip jr c, .skip
call FindPkmnInOTPartyToSwitchIntoBattle call FindMonInOTPartyToSwitchIntoBattle
.skip .skip
; 'b' contains the PartyNr of the Pkmn the AI will switch to ; 'b' contains the PartyNr of the mon the AI will switch to
call LoadEnemyPkmnToSwitchTo call LoadEnemyMonToSwitchTo
call OfferSwitch call OfferSwitch
push af push af
call ClearEnemyMonBox call ClearEnemyMonBox
call Function_BattleTextEnemySentOut call Function_BattleTextEnemySentOut
call Function_SetEnemyPkmnAndSendOutAnimation call Function_SetEnemyMonAndSendOutAnimation
pop af pop af
ret c ret c
; If we're here, then we're switching too ; If we're here, then we're switching too
@ -3240,15 +3240,15 @@ EnemySwitch_SetMode: ; 3d517
call ResetEnemyBattleVars call ResetEnemyBattleVars
call CheckWhetherSwitchmonIsPredetermined call CheckWhetherSwitchmonIsPredetermined
jr c, .skip jr c, .skip
call FindPkmnInOTPartyToSwitchIntoBattle call FindMonInOTPartyToSwitchIntoBattle
.skip .skip
; 'b' contains the PartyNr of the Pkmn the AI will switch to ; 'b' contains the PartyNr of the mon the AI will switch to
call LoadEnemyPkmnToSwitchTo call LoadEnemyMonToSwitchTo
ld a, 1 ld a, 1
ld [wEnemyIsSwitching], a ld [wEnemyIsSwitching], a
call ClearEnemyMonBox call ClearEnemyMonBox
call Function_BattleTextEnemySentOut call Function_BattleTextEnemySentOut
jp Function_SetEnemyPkmnAndSendOutAnimation jp Function_SetEnemyMonAndSendOutAnimation
; 3d533 ; 3d533
CheckWhetherSwitchmonIsPredetermined: ; 3d533 CheckWhetherSwitchmonIsPredetermined: ; 3d533
@ -3319,7 +3319,7 @@ AddBattleParticipant: ; 3d581
predef_jump SmallFarFlagAction predef_jump SmallFarFlagAction
; 3d599 ; 3d599
FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599 FindMonInOTPartyToSwitchIntoBattle: ; 3d599
ld b, $ff ld b, $ff
ld a, $1 ld a, $1
ld [wBuffer1], a ld [wBuffer1], a
@ -3347,7 +3347,7 @@ FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599
pop bc pop bc
jr z, .discourage jr z, .discourage
call LookUpTheEffectivenessOfEveryMove call LookUpTheEffectivenessOfEveryMove
call IsThePlayerPkmnTypesEffectiveAgainstOTPkmn call IsThePlayerMonTypesEffectiveAgainstOTMon
jr .loop jr .loop
.discourage .discourage
@ -3394,9 +3394,9 @@ LookUpTheEffectivenessOfEveryMove: ; 3d5d7
ret ret
; 3d618 ; 3d618
IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618 IsThePlayerMonTypesEffectiveAgainstOTMon: ; 3d618
; Calculates the effectiveness of the types of the PlayerPkmn ; Calculates the effectiveness of the types of the PlayerMon
; against the OTPkmn ; against the OTMon
push bc push bc
ld hl, wOTPartyCount ld hl, wOTPartyCount
ld a, b ld a, b
@ -3508,8 +3508,8 @@ ScoreMonTypeMatchups: ; 3d672
ret ret
; 3d6ca ; 3d6ca
LoadEnemyPkmnToSwitchTo: ; 3d6ca LoadEnemyMonToSwitchTo: ; 3d6ca
; 'b' contains the PartyNr of the Pkmn the AI will switch to ; 'b' contains the PartyNr of the mon the AI will switch to
ld a, b ld a, b
ld [wCurPartyMon], a ld [wCurPartyMon], a
ld hl, wOTPartyMon1Level ld hl, wOTPartyMon1Level
@ -3581,7 +3581,7 @@ OfferSwitch: ; 3d74b
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
push af push af
callfar Battle_GetTrainerName callfar Battle_GetTrainerName
ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangePkmn ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon
call StdBattleTextBox call StdBattleTextBox
lb bc, 1, 7 lb bc, 1, 7
call PlaceYesNoBox call PlaceYesNoBox
@ -3637,14 +3637,14 @@ Function_BattleTextEnemySentOut: ; 3d7b8
jp WaitBGMap jp WaitBGMap
; 3d7c7 ; 3d7c7
Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 Function_SetEnemyMonAndSendOutAnimation: ; 3d7c7
ld a, [wTempEnemyMonSpecies] ld a, [wTempEnemyMonSpecies]
ld [wCurPartySpecies], a ld [wCurPartySpecies], a
ld [wCurSpecies], a ld [wCurSpecies], a
call GetBaseData call GetBaseData
ld a, OTPARTYMON ld a, OTPARTYMON
ld [wMonType], a ld [wMonType], a
predef CopyPkmnToTempMon predef CopyMonToTempMon
call GetEnemyMonFrontpic call GetEnemyMonFrontpic
xor a xor a
@ -3721,8 +3721,8 @@ ResetEnemyStatLevels: ; 3d867
ret ret
; 3d873 ; 3d873
CheckPlayerPartyForFitPkmn: ; 3d873 CheckPlayerPartyForFitMon: ; 3d873
; Has the player any Pkmn in his Party that can fight? ; Has the player any mon in his Party that can fight?
ld a, [wPartyCount] ld a, [wPartyCount]
ld e, a ld e, a
xor a xor a
@ -4308,7 +4308,7 @@ PursuitSwitch: ; 3dc5b
ld b, RESET_FLAG ld b, RESET_FLAG
predef SmallFarFlagAction predef SmallFarFlagAction
call PlayerMonFaintedAnimation call PlayerMonFaintedAnimation
ld hl, BattleText_PkmnFainted ld hl, BattleText_MonFainted
jr .done_fainted jr .done_fainted
.check_enemy_fainted .check_enemy_fainted
@ -4324,7 +4324,7 @@ PursuitSwitch: ; 3dc5b
call PlaySFX call PlaySFX
call WaitSFX call WaitSFX
call EnemyMonFaintedAnimation call EnemyMonFaintedAnimation
ld hl, BattleText_EnemyPkmnFainted ld hl, BattleText_EnemyMonFainted
.done_fainted .done_fainted
call StdBattleTextBox call StdBattleTextBox
@ -5306,7 +5306,7 @@ TryPlayerSwitch: ; 3e358
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
cp d cp d
jr nz, .check_trapped jr nz, .check_trapped
ld hl, BattleText_PkmnIsAlreadyOut ld hl, BattleText_MonIsAlreadyOut
call StdBattleTextBox call StdBattleTextBox
jp BattleMenuPKMN_Loop jp BattleMenuPKMN_Loop
@ -5319,7 +5319,7 @@ TryPlayerSwitch: ; 3e358
jr z, .try_switch jr z, .try_switch
.trapped .trapped
ld hl, BattleText_PkmnCantBeRecalled ld hl, BattleText_MonCantBeRecalled
call StdBattleTextBox call StdBattleTextBox
jp BattleMenuPKMN_Loop jp BattleMenuPKMN_Loop
@ -5396,7 +5396,7 @@ EnemyMonEntrance: ; 3e3ff
; 3e40b ; 3e40b
BattleMonEntrance: ; 3e40b BattleMonEntrance: ; 3e40b
call WithdrawPkmnText call WithdrawMonText
ld c, 50 ld c, 50
call DelayFrames call DelayFrames
@ -5419,7 +5419,7 @@ BattleMonEntrance: ; 3e40b
call AddBattleParticipant call AddBattleParticipant
call InitBattleMon call InitBattleMon
call ResetPlayerStatLevels call ResetPlayerStatLevels
call SendOutPkmnText call SendOutMonText
call NewBattleMonStatus call NewBattleMonStatus
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
@ -5938,7 +5938,7 @@ CheckPlayerHasUsableMoves: ; 3e786
ret nz ret nz
.force_struggle .force_struggle
ld hl, BattleText_PkmnHasNoMovesLeft ld hl, BattleText_MonHasNoMovesLeft
call StdBattleTextBox call StdBattleTextBox
ld c, 60 ld c, 60
call DelayFrames call DelayFrames
@ -6408,7 +6408,7 @@ LoadEnemyMon: ; 3e8eb
ld de, wEnemyMonMaxHP ld de, wEnemyMonMaxHP
ld b, FALSE ld b, FALSE
ld hl, wEnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1) ; wLinkBattleRNs + 7 ; ? ld hl, wEnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1) ; wLinkBattleRNs + 7 ; ?
predef CalcPkmnStats predef CalcMonStats
; If we're in a trainer battle, ; If we're in a trainer battle,
; get the rest of the parameters from the party struct ; get the rest of the parameters from the party struct
@ -7350,7 +7350,7 @@ GiveExperiencePoints: ; 3ee3b
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNick
ld hl, Text_PkmnGainedExpPoint ld hl, Text_MonGainedExpPoint
call BattleTextBox call BattleTextBox
ld a, [wStringBuffer2 + 1] ld a, [wStringBuffer2 + 1]
ld [hQuotient + 2], a ld [hQuotient + 2], a
@ -7419,7 +7419,7 @@ GiveExperiencePoints: ; 3ee3b
.not_max_exp .not_max_exp
xor a ; PARTYMON xor a ; PARTYMON
ld [wMonType], a ld [wMonType], a
predef CopyPkmnToTempMon predef CopyMonToTempMon
callfar CalcLevel callfar CalcLevel
pop bc pop bc
ld hl, MON_LEVEL ld hl, MON_LEVEL
@ -7456,7 +7456,7 @@ GiveExperiencePoints: ; 3ee3b
add hl, bc add hl, bc
push bc push bc
ld b, TRUE ld b, TRUE
predef CalcPkmnStats predef CalcMonStats
pop bc pop bc
pop de pop de
ld hl, MON_MAXHP + 1 ld hl, MON_MAXHP + 1
@ -7532,7 +7532,7 @@ GiveExperiencePoints: ; 3ee3b
.skip_animation2 .skip_animation2
xor a ; PARTYMON xor a ; PARTYMON
ld [wMonType], a ld [wMonType], a
predef CopyPkmnToTempMon predef CopyMonToTempMon
hlcoord 9, 0 hlcoord 9, 0
ld b, $a ld b, $a
ld c, $9 ld c, $9
@ -7648,7 +7648,7 @@ BoostExp: ; 3f106
ret ret
; 3f11b ; 3f11b
Text_PkmnGainedExpPoint: ; 3f11b Text_MonGainedExpPoint: ; 3f11b
text_jump Text_Gained text_jump Text_Gained
start_asm start_asm
ld hl, TextJump_StringBuffer2ExpPoints ld hl, TextJump_StringBuffer2ExpPoints
@ -7692,7 +7692,7 @@ AnimateExpBar: ; 3f136
ld [wd002], a ld [wd002], a
xor a ; PARTYMON xor a ; PARTYMON
ld [wMonType], a ld [wMonType], a
predef CopyPkmnToTempMon predef CopyMonToTempMon
ld a, [wTempMonLevel] ld a, [wTempMonLevel]
ld b, a ld b, a
ld e, a ld e, a
@ -7856,23 +7856,23 @@ AnimateExpBar: ; 3f136
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
SendOutPkmnText: ; 3f26d SendOutMonText: ; 3f26d
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
jr z, .not_linked jr z, .not_linked
ld hl, JumpText_GoPkmn ; If we're in a LinkBattle print just "Go <PlayerMon>" ld hl, JumpText_GoMon ; If we're in a LinkBattle print just "Go <PlayerMon>"
ld a, [wBattleHasJustStarted] ; unless this (unidentified) variable is set ld a, [wBattleHasJustStarted] ; unless this (unidentified) variable is set
and a and a
jr nz, .skip_to_textbox jr nz, .skip_to_textbox
.not_linked .not_linked
; Depending on the HP of the enemy Pkmn, the game prints a different text ; Depending on the HP of the enemy mon, the game prints a different text
ld hl, wEnemyMonHP ld hl, wEnemyMonHP
ld a, [hli] ld a, [hli]
or [hl] or [hl]
ld hl, JumpText_GoPkmn ld hl, JumpText_GoMon
jr z, .skip_to_textbox jr z, .skip_to_textbox
; compute enemy helth remaining as a percentage ; compute enemy helth remaining as a percentage
@ -7901,43 +7901,43 @@ SendOutPkmnText: ; 3f26d
call Divide call Divide
ld a, [hQuotient + 2] ld a, [hQuotient + 2]
ld hl, JumpText_GoPkmn ld hl, JumpText_GoMon
cp 70 cp 70
jr nc, .skip_to_textbox jr nc, .skip_to_textbox
ld hl, JumpText_DoItPkmn ld hl, JumpText_DoItMon
cp 40 cp 40
jr nc, .skip_to_textbox jr nc, .skip_to_textbox
ld hl, JumpText_GoForItPkmn ld hl, JumpText_GoForItMon
cp 10 cp 10
jr nc, .skip_to_textbox jr nc, .skip_to_textbox
ld hl, JumpText_YourFoesWeakGetmPkmn ld hl, JumpText_YourFoesWeakGetmMon
.skip_to_textbox .skip_to_textbox
jp BattleTextBox jp BattleTextBox
; 3f2d1 ; 3f2d1
JumpText_GoPkmn: ; 3f2d1 JumpText_GoMon: ; 3f2d1
text_jump Text_GoPkmn text_jump Text_GoMon
start_asm start_asm
jr Function_TextJump_BattleMonNick01 jr Function_TextJump_BattleMonNick01
; 3f2d6 ; 3f2d6
JumpText_DoItPkmn: ; 3f2d8 JumpText_DoItMon: ; 3f2d8
text_jump Text_DoItPkmn text_jump Text_DoItMon
start_asm start_asm
jr Function_TextJump_BattleMonNick01 jr Function_TextJump_BattleMonNick01
; 3f2dd ; 3f2dd
JumpText_GoForItPkmn: ; 3f2df JumpText_GoForItMon: ; 3f2df
text_jump Text_GoForItPkmn text_jump Text_GoForItMon
start_asm start_asm
jr Function_TextJump_BattleMonNick01 jr Function_TextJump_BattleMonNick01
; 3f2e4 ; 3f2e4
JumpText_YourFoesWeakGetmPkmn: ; 3f2e6 JumpText_YourFoesWeakGetmMon: ; 3f2e6
text_jump Text_YourFoesWeakGetmPkmn text_jump Text_YourFoesWeakGetmMon
start_asm start_asm
Function_TextJump_BattleMonNick01: ; 3f2eb Function_TextJump_BattleMonNick01: ; 3f2eb
ld hl, TextJump_BattleMonNick01 ld hl, TextJump_BattleMonNick01
@ -7949,14 +7949,14 @@ TextJump_BattleMonNick01: ; 3f2ef
db "@" db "@"
; 3f2f4 ; 3f2f4
WithdrawPkmnText: ; 3f2f4 WithdrawMonText: ; 3f2f4
ld hl, .WithdrawPkmnText ld hl, .WithdrawMonText
jp BattleTextBox jp BattleTextBox
.WithdrawPkmnText: .WithdrawMonText:
text_jump Text_BattleMonNickComma text_jump Text_BattleMonNickComma
start_asm start_asm
; Print text to withdraw Pkmn ; Print text to withdraw mon
; depending on HP the message is different ; depending on HP the message is different
push de push de
push bc push bc
@ -8037,7 +8037,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
and a and a
jr z, .angry jr z, .angry
dec [hl] dec [hl]
ld hl, BattleText_WildPkmnIsEating ld hl, BattleText_WildMonIsEating
jr .finish jr .finish
.angry .angry
@ -8046,7 +8046,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
and a and a
ret z ret z
dec [hl] dec [hl]
ld hl, BattleText_WildPkmnIsAngry ld hl, BattleText_WildMonIsAngry
jr nz, .finish jr nz, .finish
push hl push hl
ld a, [wEnemyMonSpecies] ld a, [wEnemyMonSpecies]

18
engine/billspc.asm
View File

@ -591,7 +591,7 @@ _MovePKMNWithoutMail: ; e2759
ld a, [hl] ld a, [hl]
and A_BUTTON and A_BUTTON
jr nz, .a_button jr nz, .a_button
call MovePkmnWithoutMail_DPad call MoveMonWithoutMail_DPad
jr c, .d_pad jr c, .d_pad
and a and a
ret z ret z
@ -750,7 +750,7 @@ _MovePKMNWithoutMail: ; e2759
ld a, [hl] ld a, [hl]
and A_BUTTON and A_BUTTON
jr nz, .a_button_2 jr nz, .a_button_2
call MovePkmnWithoutMail_DPad_2 call MoveMonWithoutMail_DPad_2
jr c, .dpad_2 jr c, .dpad_2
and a and a
ret z ret z
@ -862,7 +862,7 @@ Withdraw_UpDown: ; e29b5 (38:69b5)
jp BillsPC_JoypadDidNothing jp BillsPC_JoypadDidNothing
; e29d0 (38:69d0) ; e29d0 (38:69d0)
MovePkmnWithoutMail_DPad: ; e29d0 MoveMonWithoutMail_DPad: ; e29d0
ld hl, hJoyLast ld hl, hJoyLast
ld a, [wBillsPC_NumMonsOnScreen] ld a, [wBillsPC_NumMonsOnScreen]
ld d, a ld d, a
@ -886,7 +886,7 @@ MovePkmnWithoutMail_DPad: ; e29d0
jr nz, BillsPC_PressRight jr nz, BillsPC_PressRight
jr BillsPC_JoypadDidNothing jr BillsPC_JoypadDidNothing
MovePkmnWithoutMail_DPad_2: ; e29f4 MoveMonWithoutMail_DPad_2: ; e29f4
ld hl, hJoyLast ld hl, hJoyLast
ld a, [wBillsPC_NumMonsOnScreen] ld a, [wBillsPC_NumMonsOnScreen]
ld d, a ld d, a
@ -1819,7 +1819,7 @@ DepositPokemon: ; e307c (38:707c)
call GetNick call GetNick
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
predef SendGetPkmnIntoFromBox predef SendGetMonIntoFromBox
jr c, .asm_boxisfull jr c, .asm_boxisfull
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
@ -1874,7 +1874,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
call CloseSRAM call CloseSRAM
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
predef SendGetPkmnIntoFromBox predef SendGetMonIntoFromBox
jr c, .PartyFull jr c, .PartyFull
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
@ -2010,7 +2010,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
.dw_return ; e322a .dw_return ; e322a
pop af pop af
ld e, a ld e, a
farcall MovePkmnWOMail_InsertMon_SaveGame farcall MoveMonWOMail_InsertMon_SaveGame
ret ret
; e3233 ; e3233
@ -2095,7 +2095,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld a, [wBillsPC_BackupLoadedBox] ld a, [wBillsPC_BackupLoadedBox]
dec a dec a
ld e, a ld e, a
farcall MovePkmnWOMail_SaveGame farcall MoveMonWOMail_SaveGame
ld a, [wBillsPC_BackupCursorPosition] ld a, [wBillsPC_BackupCursorPosition]
ld hl, wBillsPC_BackupScrollPosition ld hl, wBillsPC_BackupScrollPosition
add [hl] add [hl]
@ -2123,7 +2123,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld a, [wBillsPC_LoadedBox] ld a, [wBillsPC_LoadedBox]
dec a dec a
ld e, a ld e, a
farcall MovePkmnWOMail_SaveGame farcall MoveMonWOMail_SaveGame
ld a, [wBillsPC_CursorPosition] ld a, [wBillsPC_CursorPosition]
ld hl, wBillsPC_ScrollPosition ld hl, wBillsPC_ScrollPosition
add [hl] add [hl]

18
engine/billspctop.asm
View File

@ -117,7 +117,7 @@ BillsPC_MovePKMNMenu: ; e4cd
jr .quit jr .quit
.no_mail .no_mail
farcall StartMovePkmnWOMail_SaveGame farcall StartMoveMonWOMail_SaveGame
jr c, .quit jr c, .quit
farcall _MovePKMNWithoutMail farcall _MovePKMNWithoutMail
call ReturnToMapFromSubmenu call ReturnToMapFromSubmenu
@ -145,30 +145,30 @@ BillsPC_DepositMenu: ; e4fe (3:64fe)
Unreferenced_Functione512: Unreferenced_Functione512:
ld a, [wPartyCount] ld a, [wPartyCount]
and a and a
jr z, .no_pkmn jr z, .no_mon
cp 2 cp 2
jr c, .only_one_pkmn jr c, .only_one_mon
and a and a
ret ret
.no_pkmn .no_mon
ld hl, .Text_NoPKMN ld hl, .Text_NoMon
call MenuTextBoxBackup call MenuTextBoxBackup
scf scf
ret ret
.only_one_pkmn .only_one_mon
ld hl, .Text_ItsYourLastPKMN ld hl, .Text_ItsYourLastMon
call MenuTextBoxBackup call MenuTextBoxBackup
scf scf
ret ret
.Text_NoPKMN: ; 0xe52e .Text_NoMon: ; 0xe52e
; You don't have a single #MON! ; You don't have a single #MON!
text_jump UnknownText_0x1c1062 text_jump UnknownText_0x1c1062
db "@" db "@"
.Text_ItsYourLastPKMN: ; 0xe533 .Text_ItsYourLastMon: ; 0xe533
; You can't deposit your last #MON! ; You can't deposit your last #MON!
text_jump UnknownText_0x1c1080 text_jump UnknownText_0x1c1080
db "@" db "@"

2
engine/breeding.asm
View File

@ -289,7 +289,7 @@ HatchEggs: ; 16f70 (5:6f70)
ld bc, MON_STAT_EXP - 1 ld bc, MON_STAT_EXP - 1
add hl, bc add hl, bc
ld b, $0 ld b, $0
predef CalcPkmnStats predef CalcMonStats
pop bc pop bc
ld hl, MON_MAXHP ld hl, MON_MAXHP
add hl, bc add hl, bc

36
engine/events/battle_tower/battle_tower.asm
View File

@ -95,7 +95,7 @@ Function170139: ; 170139
ld [wMisc], a ld [wMisc], a
ld a, l ld a, l
ld [wMisc + 1], a ld [wMisc + 1], a
ld hl, wBT_OTTempPkmn1DVs ld hl, wBT_OTTempMon1DVs
ld a, [wPlayerID] ld a, [wPlayerID]
ld [hli], a ld [hli], a
ld a, [wPlayerID + 1] ld a, [wPlayerID + 1]
@ -112,7 +112,7 @@ Function170139: ; 170139
ld bc, wPlayerID ld bc, wPlayerID
ld de, wPlayerGender ld de, wPlayerGender
farcall GetMobileOTTrainerClass farcall GetMobileOTTrainerClass
ld de, wBT_OTTempPkmn1CaughtGender ld de, wBT_OTTempMon1CaughtGender
ld a, c ld a, c
ld [de], a ld [de], a
inc de inc de
@ -279,59 +279,59 @@ RunBattleTowerTrainer: ; 17024d
ReadBTTrainerParty: ; 1702b7 ReadBTTrainerParty: ; 1702b7
; Initialise the BattleTower-Trainer and his Pkmn ; Initialise the BattleTower-Trainer and his mon
call CopyBTTrainer_FromBT_OT_TowBT_OTTemp call CopyBTTrainer_FromBT_OT_TowBT_OTTemp
; Check the nicknames for illegal characters, and replace bad nicknames ; Check the nicknames for illegal characters, and replace bad nicknames
; with their species names. ; with their species names.
ld de, wBT_OTTempPkmn1Name ; $c643 ld de, wBT_OTTempMon1Name ; $c643
ld c, MON_NAME_LENGTH ld c, MON_NAME_LENGTH
farcall CheckStringForErrors farcall CheckStringForErrors
jr nc, .skip_mon_1 jr nc, .skip_mon_1
ld a, [wBT_OTTempPkmn1] ld a, [wBT_OTTempMon1]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
ld l, e ld l, e
ld h, d ld h, d
ld de, wBT_OTTempPkmn1Name ; $c643 ld de, wBT_OTTempMon1Name ; $c643
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
.skip_mon_1 .skip_mon_1
ld de, wBT_OTTempPkmn2Name ; $c67e ld de, wBT_OTTempMon2Name ; $c67e
ld c, MON_NAME_LENGTH ld c, MON_NAME_LENGTH
farcall CheckStringForErrors farcall CheckStringForErrors
jr nc, .skip_mon_2 jr nc, .skip_mon_2
ld a, [wBT_OTTempPkmn2] ; [$c64e] ld a, [wBT_OTTempMon2] ; [$c64e]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
ld l, e ld l, e
ld h, d ld h, d
ld de, wBT_OTTempPkmn2Name ; $c67e ld de, wBT_OTTempMon2Name ; $c67e
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
.skip_mon_2 .skip_mon_2
ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9 ld de, wBT_OTTempMon3Name ; $c686 + 51 = $c6b9
ld c, MON_NAME_LENGTH ld c, MON_NAME_LENGTH
farcall CheckStringForErrors farcall CheckStringForErrors
jr nc, .skip_mon_3 jr nc, .skip_mon_3
ld a, [wBT_OTTempPkmn3] ; [$c689] ld a, [wBT_OTTempMon3] ; [$c689]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
ld l, e ld l, e
ld h, d ld h, d
ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9 ld de, wBT_OTTempMon3Name ; $c686 + 51 = $c6b9
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
.skip_mon_3 .skip_mon_3
; Add the terminator character to each of these names ; Add the terminator character to each of these names
ld a, "@" ld a, "@"
ld [wBT_OTTempPkmn1NameEnd - 1], a ; $c64d ld [wBT_OTTempMon1NameEnd - 1], a ; $c64d
ld [wBT_OTTempPkmn2NameEnd - 1], a ; $c688 ld [wBT_OTTempMon2NameEnd - 1], a ; $c688
ld [wBT_OTTempPkmn3NameEnd - 1], a ; $c68a + 57 = $c6c3 ld [wBT_OTTempMon3NameEnd - 1], a ; $c68a + 57 = $c6c3
; Fix errors in the movesets ; Fix errors in the movesets
call CheckBTMonMovesForErrors call CheckBTMonMovesForErrors
; Repair the trainer name if needed, then copy it to wOTPlayerName ; Repair the trainer name if needed, then copy it to wOTPlayerName
@ -360,7 +360,7 @@ ReadBTTrainerParty: ; 1702b7
ld a, HIGH(wOTPartyMonNicknames) ld a, HIGH(wOTPartyMonNicknames)
ld [wBGMapBuffer + 1], a ld [wBGMapBuffer + 1], a
; Copy Pkmn into Memory from the address in hl ; Copy mon into Memory from the address in hl
ld de, wOTPartyMon1Species ld de, wOTPartyMon1Species
ld bc, wOTPartyCount ld bc, wOTPartyCount
ld a, BATTLETOWER_PARTY_LENGTH ld a, BATTLETOWER_PARTY_LENGTH
@ -398,7 +398,7 @@ ReadBTTrainerParty: ; 1702b7
ValidateBTParty: ; 170394 ValidateBTParty: ; 170394
; Check for and fix errors in party data ; Check for and fix errors in party data
ld hl, wBT_OTTempPkmn1Species ld hl, wBT_OTTempMon1Species
ld d, BATTLETOWER_PARTY_LENGTH ld d, BATTLETOWER_PARTY_LENGTH
.pkmn_loop .pkmn_loop
push de push de
@ -484,7 +484,7 @@ endr
ld hl, MON_STAT_EXP - 1 ld hl, MON_STAT_EXP - 1
add hl, bc add hl, bc
ld b, $1 ld b, $1
predef CalcPkmnStats predef CalcMonStats
pop de pop de
pop hl pop hl
dec de dec de

100
engine/events/battle_tower/load_trainer.asm
View File

@ -12,9 +12,9 @@ Function_LoadOpponentTrainerAndPokemons: ; 1f8000
; Write $ff into the Item-Slots ; Write $ff into the Item-Slots
ld a, $ff ld a, $ff
ld [wBT_OTPkmn1Item], a ld [wBT_OTMon1Item], a
ld [wBT_OTPkmn2Item], a ld [wBT_OTMon2Item], a
ld [wBT_OTPkmn3Item], a ld [wBT_OTMon3Item], a
; Set wBT_OTTrainer as start address to write the following data to ; Set wBT_OTTrainer as start address to write the following data to
ld de, wBT_OTTrainer ld de, wBT_OTTrainer
@ -32,8 +32,8 @@ if DEF(_CRYSTAL11)
else else
; Crystal 1.0 used the wrong constant here, so only the first 21 ; Crystal 1.0 used the wrong constant here, so only the first 21
; trainers in BattleTowerTrainers can be sampled. ; trainers in BattleTowerTrainers can be sampled.
maskbits BATTLETOWER_NUM_UNIQUE_PKMN maskbits BATTLETOWER_NUM_UNIQUE_MON
cp BATTLETOWER_NUM_UNIQUE_PKMN cp BATTLETOWER_NUM_UNIQUE_MON
endc endc
jr nc, .resample jr nc, .resample
ld b, a ld b, a
@ -68,7 +68,7 @@ endc
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
call Function_LoadRandomBattleTowerPkmn call Function_LoadRandomBattleTowerMon
pop af pop af
ld hl, BattleTowerTrainerData ld hl, BattleTowerTrainerData
@ -92,15 +92,15 @@ endc
ret ret
Function_LoadRandomBattleTowerPkmn: ; 1f8081 Function_LoadRandomBattleTowerMon: ; 1f8081
ld c, BATTLETOWER_PARTY_LENGTH ld c, BATTLETOWER_PARTY_LENGTH
.loop .loop
push bc push bc
ld a, BANK(sBTPkmnPrevTrainer1) ld a, BANK(sBTMonPrevTrainer1)
call GetSRAMBank call GetSRAMBank
.FindARandomBattleTowerPkmn: .FindARandomBattleTowerMon:
; From Which LevelGroup are the Pkmn loaded ; From Which LevelGroup are the mon loaded
; a = 1..10 ; a = 1..10
ld a, [wBTChoiceOfLvlGroup] ld a, [wBTChoiceOfLvlGroup]
dec a dec a
@ -115,12 +115,12 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
ld a, [hRandomAdd] ld a, [hRandomAdd]
add b add b
ld b, a ld b, a
maskbits BATTLETOWER_NUM_UNIQUE_PKMN maskbits BATTLETOWER_NUM_UNIQUE_MON
cp BATTLETOWER_NUM_UNIQUE_PKMN cp BATTLETOWER_NUM_UNIQUE_MON
jr nc, .resample jr nc, .resample
; in register 'a' is the chosen Pkmn of the LevelGroup ; in register 'a' is the chosen mon of the LevelGroup
; Check if Pkmn was already loaded before ; Check if mon was already loaded before
; Check current and the 2 previous teams ; Check current and the 2 previous teams
; includes check if item is double at the current team ; includes check if item is double at the current team
ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
@ -129,42 +129,42 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
ld b, a ld b, a
ld a, [hld] ld a, [hld]
ld c, a ld c, a
ld a, [wBT_OTPkmn1] ld a, [wBT_OTMon1]
cp b cp b
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [wBT_OTPkmn1Item] ld a, [wBT_OTMon1Item]
cp c cp c
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [wBT_OTPkmn2] ld a, [wBT_OTMon2]
cp b cp b
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [wBT_OTPkmn2Item] ld a, [wBT_OTMon2Item]
cp c cp c
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [wBT_OTPkmn3] ld a, [wBT_OTMon3]
cp b cp b
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [wBT_OTPkmn3Item] ld a, [wBT_OTMon3Item]
cp c cp c
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [sBTPkmnPrevTrainer1] ld a, [sBTMonPrevTrainer1]
cp b cp b
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [sBTPkmnPrevTrainer2] ld a, [sBTMonPrevTrainer2]
cp b cp b
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [sBTPkmnPrevTrainer3] ld a, [sBTMonPrevTrainer3]
cp b cp b
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [sBTPkmnPrevPrevTrainer1] ld a, [sBTMonPrevPrevTrainer1]
cp b cp b
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [sBTPkmnPrevPrevTrainer2] ld a, [sBTMonPrevPrevTrainer2]
cp b cp b
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld a, [sBTPkmnPrevPrevTrainer3] ld a, [sBTMonPrevPrevTrainer3]
cp b cp b
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerMon
ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
call CopyBytes call CopyBytes
@ -193,18 +193,18 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
dec c dec c
jp nz, .loop jp nz, .loop
ld a, [sBTPkmnPrevTrainer1] ld a, [sBTMonPrevTrainer1]
ld [sBTPkmnPrevPrevTrainer1], a ld [sBTMonPrevPrevTrainer1], a
ld a, [sBTPkmnPrevTrainer2] ld a, [sBTMonPrevTrainer2]
ld [sBTPkmnPrevPrevTrainer2], a ld [sBTMonPrevPrevTrainer2], a
ld a, [sBTPkmnPrevTrainer3] ld a, [sBTMonPrevTrainer3]
ld [sBTPkmnPrevPrevTrainer3], a ld [sBTMonPrevPrevTrainer3], a
ld a, [wBT_OTPkmn1] ld a, [wBT_OTMon1]
ld [sBTPkmnPrevTrainer1], a ld [sBTMonPrevTrainer1], a
ld a, [wBT_OTPkmn2] ld a, [wBT_OTMon2]
ld [sBTPkmnPrevTrainer2], a ld [sBTMonPrevTrainer2], a
ld a, [wBT_OTPkmn3] ld a, [wBT_OTMon3]
ld [sBTPkmnPrevTrainer3], a ld [sBTMonPrevTrainer3], a
call CloseSRAM call CloseSRAM
ret ret
; 1f814e ; 1f814e

18
engine/events/battle_tower/rules.asm
View File

@ -56,9 +56,9 @@ CheckForBattleTowerRules: ; 8b201
.TextPointers: ; 8b222 .TextPointers: ; 8b222
dw JumpText_ExcuseMeYoureNotReady dw JumpText_ExcuseMeYoureNotReady
dw JumpText_OnlyThreePkmnMayBeEntered dw JumpText_OnlyThreeMonMayBeEntered
dw JumpText_ThePkmnMustAllBeDifferentKinds dw JumpText_TheMonMustAllBeDifferentKinds
dw JumpText_ThePkmnMustNotHoldTheSameItems dw JumpText_TheMonMustNotHoldTheSameItems
dw JumpText_YouCantTakeAnEgg dw JumpText_YouCantTakeAnEgg
; 8b22c ; 8b22c
@ -92,21 +92,21 @@ JumpText_EggDoesNotQualify: ; 0x8b242
db "@" db "@"
; 0x8b247 ; 0x8b247
JumpText_OnlyThreePkmnMayBeEntered: ; 0x8b247 JumpText_OnlyThreeMonMayBeEntered: ; 0x8b247
; Only three #MON may be entered. ; Only three #MON may be entered.
text_jump Text_OnlyThreePkmnMayBeEntered text_jump Text_OnlyThreeMonMayBeEntered
db "@" db "@"
; 0x8b24c ; 0x8b24c
JumpText_ThePkmnMustAllBeDifferentKinds: ; 0x8b24c JumpText_TheMonMustAllBeDifferentKinds: ; 0x8b24c
; The @ #MON must all be different kinds. ; The @ #MON must all be different kinds.
text_jump Text_ThePkmnMustAllBeDifferentKinds text_jump Text_TheMonMustAllBeDifferentKinds
db "@" db "@"
; 0x8b251 ; 0x8b251
JumpText_ThePkmnMustNotHoldTheSameItems: ; 0x8b251 JumpText_TheMonMustNotHoldTheSameItems: ; 0x8b251
; The @ #MON must not hold the same items. ; The @ #MON must not hold the same items.
text_jump Text_ThePkmnMustNotHoldTheSameItems text_jump Text_TheMonMustNotHoldTheSameItems
db "@" db "@"
; 0x8b256 ; 0x8b256

2
engine/events/daycare.asm
View File

@ -567,7 +567,7 @@ DayCare_GiveEgg: ; 169ac
pop hl pop hl
push bc push bc
ld b, $0 ld b, $0
predef CalcPkmnStats predef CalcMonStats
pop bc pop bc
ld hl, MON_HP ld hl, MON_HP
add hl, bc add hl, bc

2
engine/events/poisonstep.asm
View File

@ -145,7 +145,7 @@ DoPoisonStep:: ; 505da
ld a, [wPartyCount] ld a, [wPartyCount]
cp [hl] cp [hl]
jr nz, .party_loop jr nz, .party_loop
predef CheckPlayerPartyForFitPkmn predef CheckPlayerPartyForFitMon
ld a, d ld a, d
ld [wScriptVar], a ld [wScriptVar], a
ret ret

4
engine/evolve.asm
View File

@ -55,7 +55,7 @@ EvolveAfterBattle_MasterLoop
push hl push hl
xor a xor a
ld [wMonType], a ld [wMonType], a
predef CopyPkmnToTempMon predef CopyMonToTempMon
pop hl pop hl
.loop .loop
@ -265,7 +265,7 @@ EvolveAfterBattle_MasterLoop
ld hl, wTempMonExp + 2 ld hl, wTempMonExp + 2
ld de, wTempMonMaxHP ld de, wTempMonMaxHP
ld b, $1 ld b, $1
predef CalcPkmnStats predef CalcMonStats
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMons ld hl, wPartyMons

Some files were not shown because too many files have changed in this diff Show More