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

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

Browse Source 
# 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
This commit is contained in:
Remy Oukaour 2018-01-14 22:56:36 -05:00
commit 5c28d05bb4
249 changed files with 1382 additions and 1408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/unknown_table.asm Executable file
View File

@ -0,0 +1,13 @@
Unreferenced_53d84:
db $1a, $15
db $33, $16
db $4b, $17
db $62, $18
db $79, $19
db $90, $1a
db $a8, $1b
db $c4, $1c
db $e0, $1d
db $f6, $1e
db $ff, $1f
db $ff, $20

4
data/unused_text/dakutens.asm
View File

@ -1,4 +1,4 @@
Dakutens: ; dummied out Dakutens: ; unused
db "かが", "きぎ", "くぐ", "けげ", "こご" db "かが", "きぎ", "くぐ", "けげ", "こご"
db "さざ", "しじ", "すず", "せぜ", "そぞ" db "さざ", "しじ", "すず", "せぜ", "そぞ"
db "ただ", "ちぢ", "つづ", "てで", "とど" db "ただ", "ちぢ", "つづ", "てで", "とど"
@ -9,7 +9,7 @@ Dakutens: ; dummied out
db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
db -1 ; end db -1 ; end
Handakutens: ; dummied out Handakutens: ; unused
db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
db -1 ; end db -1 ; end

3
data/unused_text/gen_1_trainers.asm
View File

@ -1,5 +1,4 @@
GetGen1TrainerClassName: ; 50a28 Unreferenced_GetGen1TrainerClassName: ; 50a28
; XXX
ld hl, .Strings ld hl, .Strings
ld a, [TrainerClass] ld a, [TrainerClass]
dec a dec a

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

@ -545,7 +545,7 @@ AI_Items: ; 39196
AIUpdateHUD: ; 38387 AIUpdateHUD: ; 38387
call UpdateEnemyMonInParty call UpdateEnemyMonInParty
farcall UpdateEnemyHUD farcall Predef_UpdateEnemyHUD
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ld hl, wEnemyItemState ld hl, wEnemyItemState
@ -664,7 +664,7 @@ EnemyPotionFinish: ; 38436
xor a xor a
ld [wWhichHPBar], a ld [wWhichHPBar], a
call AIUsedItemSound call AIUsedItemSound
predef AnimateHPBar predef Predef_AnimateHPBar
jp AIUpdateHUD jp AIUpdateHUD

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

@ -92,7 +92,7 @@ AIChooseMove: ; 440ce
push bc push bc
ld d, BANK(TrainerClassAttributes) ld d, BANK(TrainerClassAttributes)
predef FlagPredef predef Predef_SmallFarFlagAction
ld d, c ld d, c
pop bc pop bc

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

@ -1488,7 +1488,7 @@ AI_Smart_Encore: ; 38c3b
push hl push hl
ld a, [wEnemyMoveStruct + MOVE_TYPE] ld a, [wEnemyMoveStruct + MOVE_TYPE]
ld hl, EnemyMonType1 ld hl, EnemyMonType1
predef CheckTypeMatchup predef Predef_CheckTypeMatchup
pop hl pop hl
ld a, [wd265] ld a, [wd265]

16
engine/battle/ai/switch.asm
View File

@ -28,7 +28,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, EnemyMonType ld hl, EnemyMonType
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp 10 + 1 ; 1.0 + 0.1
jr nc, .super_effective jr nc, .super_effective
@ -73,7 +73,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
ld a, [BattleMonType1] ld a, [BattleMonType1]
ld b, a ld b, a
ld hl, EnemyMonType1 ld hl, EnemyMonType1
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp 10 + 1 ; 1.0 + 0.1
jr c, .ok jr c, .ok
@ -82,7 +82,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
ld a, [BattleMonType2] ld a, [BattleMonType2]
cp b cp b
jr z, .ok2 jr z, .ok2
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp 10 + 1 ; 1.0 + 0.1
jr c, .ok2 jr c, .ok2
@ -123,7 +123,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, BattleMonType1 ld hl, BattleMonType1
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
; immune ; immune
@ -390,7 +390,7 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, BaseType ld hl, BaseType
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
and a and a
jr nz, .next jr nz, .next
@ -481,7 +481,7 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, BattleMonType1 ld hl, BattleMonType1
call CheckTypeMatchup call Predef_CheckTypeMatchup
; if immune or not very effective: continue ; if immune or not very effective: continue
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
@ -585,7 +585,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20
.skip_move .skip_move
ld a, [BattleMonType1] ld a, [BattleMonType1]
ld hl, BaseType ld hl, BaseType
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 cp 10 + 1
jr nc, .dont_choose_mon jr nc, .dont_choose_mon
@ -593,7 +593,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20
.check_type .check_type
ld hl, BaseType ld hl, BaseType
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 cp 10 + 1
jr nc, .dont_choose_mon jr nc, .dont_choose_mon

10
engine/battle/anim_hp_bar.asm
View File

@ -67,7 +67,7 @@ _AnimateHPBar: ; d627
ld a, [hli] ld a, [hli]
ld b, a ld b, a
pop hl pop hl
call ComputeHPBarPixels call Predef_ComputeHPBarPixels
ld a, e ld a, e
ld [wCurHPBarPixels], a ld [wCurHPBarPixels], a
@ -79,7 +79,7 @@ _AnimateHPBar: ; d627
ld e, a ld e, a
ld a, [wCurHPAnimMaxHP + 1] ld a, [wCurHPAnimMaxHP + 1]
ld d, a ld d, a
call ComputeHPBarPixels call Predef_ComputeHPBarPixels
ld a, e ld a, e
ld [wNewHPBarPixels], a ld [wNewHPBarPixels], a
@ -183,11 +183,11 @@ LongAnim_UpdateVariables: ; d6f5
ld c, a ld c, a
ld a, [hli] ld a, [hli]
ld b, a ld b, a
; This routine is buggy. The result from ComputeHPBarPixels is stored ; This routine is buggy. The result from Predef_ComputeHPBarPixels is stored
; in e. However, the pop de opcode deletes this result before it is even ; in e. However, the pop de opcode deletes this result before it is even
; used. The game then proceeds as though it never deleted that output. ; used. The game then proceeds as though it never deleted that output.
; To fix, uncomment the line below. ; To fix, uncomment the line below.
call ComputeHPBarPixels call Predef_ComputeHPBarPixels
; ld a, e ; ld a, e
pop bc pop bc
pop de pop de
@ -227,7 +227,7 @@ LongHPBarAnim_UpdateTiles: ; d749
ld e, a ld e, a
ld a, [wCurHPAnimMaxHP + 1] ld a, [wCurHPAnimMaxHP + 1]
ld d, a ld d, a
call ComputeHPBarPixels call Predef_ComputeHPBarPixels
ld c, e ld c, e
ld d, HP_BAR_LENGTH ld d, HP_BAR_LENGTH
ld a, [wWhichHPBar] ld a, [wWhichHPBar]

9
engine/battle/battle_transition.asm
View File

@ -1,4 +1,4 @@
Predef_StartBattle: ; 8c20f Predef_DoBattleTransition: ; 8c20f
call .InitGFX call .InitGFX
ld a, [rBGP] ld a, [rBGP]
ld [wBGP], a ld [wBGP], a
@ -16,7 +16,7 @@ Predef_StartBattle: ; 8c20f
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
bit 7, a bit 7, a
jr nz, .done jr nz, .done
call FlashyTransitionToBattle call BattleTransitionJumptable
call DelayFrame call DelayFrame
jr .loop jr .loop
@ -144,7 +144,7 @@ TrainerBattlePokeballTiles: ; 8c2f4
INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp" INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
FlashyTransitionToBattle: ; 8c314 BattleTransitionJumptable: ; 8c314
jumptable .dw, wJumptableIndex jumptable .dw, wJumptableIndex
; 8c323 ; 8c323
@ -859,8 +859,7 @@ ENDM
ret ret
; 8c7c9 (23:47c9) ; 8c7c9 (23:47c9)
Function8c7c9: Unreferenced_Function8c7c9:
; XXX
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
call WaitBGMap call WaitBGMap

187
engine/battle/core.asm
View File

File diff suppressed because it is too large Load Diff

46
engine/battle/effect_commands.asm
View File

@ -182,7 +182,7 @@ CheckPlayerTurn:
call StdBattleTextBox call StdBattleTextBox
call CantMove call CantMove
call UpdateBattleMonInParty call UpdateBattleMonInParty
ld hl, UpdatePlayerHUD ld hl, Predef_UpdatePlayerHUD
call CallBattleCore call CallBattleCore
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
@ -433,7 +433,7 @@ CheckEnemyTurn: ; 3421f
call StdBattleTextBox call StdBattleTextBox
call CantMove call CantMove
call UpdateEnemyMonInParty call UpdateEnemyMonInParty
ld hl, UpdateEnemyHUD ld hl, Predef_UpdateEnemyHUD
call CallBattleCore call CallBattleCore
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
@ -672,7 +672,7 @@ HitConfusion: ; 343a5
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
call z, PlayFXAnimID call z, PlayFXAnimID
ld hl, UpdatePlayerHUD ld hl, Predef_UpdatePlayerHUD
call CallBattleCore call CallBattleCore
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
@ -1538,12 +1538,12 @@ BattleCheckTypeMatchup: ; 347c8
ld hl, EnemyMonType1 ld hl, EnemyMonType1
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, CheckTypeMatchup jr z, Predef_CheckTypeMatchup
ld hl, BattleMonType1 ld hl, BattleMonType1
CheckTypeMatchup: ; 347d3 Predef_CheckTypeMatchup: ; 347d3
; There is an incorrect assumption about this function made in the AI related code: when ; There is an incorrect assumption about this function made in the AI related code: when
; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the ; the AI calls Predef_CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing
; offensive type in a will make this function do the right thing. Since a is overwritten, ; the offensive type in a will make this function do the right thing. Since a is overwritten,
; this assumption is incorrect. A simple fix would be to load the move type for the ; this assumption is incorrect. A simple fix would be to load the move type for the
; current move into a in BattleCheckTypeMatchup, before falling through, which is ; current move into a in BattleCheckTypeMatchup, before falling through, which is
; consistent with how the rest of the code assumes this code works like. ; consistent with how the rest of the code assumes this code works like.
@ -2621,7 +2621,7 @@ BattleCommand_CheckDestinyBond: ; 351c0
ld [Buffer6], a ld [Buffer6], a
ld h, b ld h, b
ld l, c ld l, c
predef AnimateHPBar predef Predef_AnimateHPBar
call RefreshBattleHuds call RefreshBattleHuds
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
@ -4015,7 +4015,7 @@ BattleCommand_PainSplit: ; 35926
ld a, $1 ld a, $1
ld [wWhichHPBar], a ld [wWhichHPBar], a
hlcoord 10, 9 hlcoord 10, 9
predef AnimateHPBar predef Predef_AnimateHPBar
ld hl, EnemyMonHP ld hl, EnemyMonHP
ld a, [hli] ld a, [hli]
ld [Buffer4], a ld [Buffer4], a
@ -4030,7 +4030,7 @@ BattleCommand_PainSplit: ; 35926
ld [wWhichHPBar], a ld [wWhichHPBar], a
call ResetDamage call ResetDamage
hlcoord 2, 2 hlcoord 2, 2
predef AnimateHPBar predef Predef_AnimateHPBar
farcall _UpdateBattleHUDs farcall _UpdateBattleHUDs
ld hl, SharedPainText ld hl, SharedPainText
@ -4172,7 +4172,7 @@ BattleCommand_Conversion2: ; 359e6
ld a, [hl] ld a, [hl]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
predef GetTypeName predef Predef_GetTypeName
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextBox jp StdBattleTextBox
@ -4711,7 +4711,7 @@ PlayFXAnimID: ; 35d08
ld c, 3 ld c, 3
call DelayFrames call DelayFrames
callfar PlayBattleAnim callfar Predef_PlayBattleAnim
ret ret
@ -4773,7 +4773,7 @@ EnemyHurtItself: ; 35d1c
hlcoord 2, 2 hlcoord 2, 2
xor a xor a
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef AnimateHPBar predef Predef_AnimateHPBar
.did_no_damage .did_no_damage
jp RefreshBattleHuds jp RefreshBattleHuds
@ -4833,7 +4833,7 @@ PlayerHurtItself: ; 35d7e
hlcoord 10, 9 hlcoord 10, 9
ld a, $1 ld a, $1
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef AnimateHPBar predef Predef_AnimateHPBar
.did_no_damage .did_no_damage
jp RefreshBattleHuds jp RefreshBattleHuds
@ -5301,7 +5301,7 @@ SapHealth: ; 36011
xor a xor a
.hp_bar .hp_bar
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef AnimateHPBar predef Predef_AnimateHPBar
call RefreshBattleHuds call RefreshBattleHuds
jp UpdateBattleMonInParty jp UpdateBattleMonInParty
@ -6239,11 +6239,11 @@ BattleCommand_Curl: ; 365a7
BattleCommand_RaiseSubNoAnim: ; 365af BattleCommand_RaiseSubNoAnim: ; 365af
ld hl, GetBattleMonBackpic ld hl, Predef_GetBattleMonBackpic
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .PlayerTurn jr z, .PlayerTurn
ld hl, GetEnemyMonFrontpic ld hl, Predef_GetEnemyMonFrontpic
.PlayerTurn: .PlayerTurn:
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
@ -7525,7 +7525,7 @@ BattleCommand_Recoil: ; 36cb2
xor a xor a
.animate_hp_bar .animate_hp_bar
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef AnimateHPBar predef Predef_AnimateHPBar
call RefreshBattleHuds call RefreshBattleHuds
ld hl, RecoilText ld hl, RecoilText
jp StdBattleTextBox jp StdBattleTextBox
@ -8023,7 +8023,7 @@ BattleCommand_LeechSeed: ; 36f9d
BattleCommand_Splash: ; 36fe1 BattleCommand_Splash: ; 36fe1
call AnimateCurrentMove call AnimateCurrentMove
farcall TrainerRankings_Splash farcall StubbedTrainerRankings_Splash
jp PrintNothingHappened jp PrintNothingHappened
; 36fed ; 36fed
@ -8227,7 +8227,7 @@ BattleCommand_Conversion: ; 3707f
inc de inc de
ld [de], a ld [de], a
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
farcall GetTypeName farcall Predef_GetTypeName
call AnimateCurrentMove call AnimateCurrentMove
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextBox jp StdBattleTextBox
@ -8550,7 +8550,7 @@ CheckSubstituteOpp: ; 37378
BattleCommand_Selfdestruct: ; 37380 BattleCommand_Selfdestruct: ; 37380
farcall TrainerRankings_Selfdestruct farcall StubbedTrainerRankings_Selfdestruct
ld a, BATTLEANIM_PLAYER_DAMAGE ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wNumHits], a ld [wNumHits], a
ld c, 3 ld c, 3
@ -9856,7 +9856,7 @@ PlayUserBattleAnim: ; 37e47
push hl push hl
push de push de
push bc push bc
callfar PlayBattleAnim callfar Predef_PlayBattleAnim
pop bc pop bc
pop de pop de
pop hl pop hl
@ -9878,7 +9878,7 @@ PlayOpponentBattleAnim: ; 37e54
push bc push bc
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
callfar PlayBattleAnim callfar Predef_PlayBattleAnim
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
pop bc pop bc

4
engine/battle/effect_commands/attract.asm
View File

@ -35,7 +35,7 @@ CheckOppositeGender: ; 377f5
xor a xor a
ld [MonType], a ld [MonType], a
farcall GetGender farcall Predef_GetGender
jr c, .genderless_samegender jr c, .genderless_samegender
ld b, 1 ld b, 1
@ -58,7 +58,7 @@ CheckOppositeGender: ; 377f5
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld a, 3 ld a, 3
ld [MonType], a ld [MonType], a
farcall GetGender farcall Predef_GetGender
pop bc pop bc
jr c, .genderless_samegender jr c, .genderless_samegender

2
engine/battle/misc.asm
View File

@ -33,7 +33,7 @@ AppearUser: ; fbd77 (3e:7d77)
ld a, $31 ld a, $31
.okay .okay
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
predef PlaceGraphic predef Predef_PlaceGraphic
FinishAppearDisappearUser: ; fbd91 (3e:7d91) FinishAppearDisappearUser: ; fbd91 (3e:7d91)
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a

8
engine/battle/read_trainer_party.asm
View File

@ -103,7 +103,7 @@ TrainerType1: ; 397eb
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [MonType], a
push hl push hl
predef TryAddMonToParty predef Predef_TryAddMonToParty
pop hl pop hl
jr .loop jr .loop
; 39806 ; 39806
@ -124,7 +124,7 @@ TrainerType2: ; 39806
ld [MonType], a ld [MonType], a
push hl push hl
predef TryAddMonToParty predef Predef_TryAddMonToParty
ld a, [OTPartyCount] ld a, [OTPartyCount]
dec a dec a
ld hl, OTPartyMon1Moves ld hl, OTPartyMon1Moves
@ -200,7 +200,7 @@ TrainerType3: ; 39871
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [MonType], a
push hl push hl
predef TryAddMonToParty predef Predef_TryAddMonToParty
ld a, [OTPartyCount] ld a, [OTPartyCount]
dec a dec a
ld hl, OTPartyMon1Item ld hl, OTPartyMon1Item
@ -231,7 +231,7 @@ TrainerType4: ; 3989d
ld [MonType], a ld [MonType], a
push hl push hl
predef TryAddMonToParty predef Predef_TryAddMonToParty
ld a, [OTPartyCount] ld a, [OTPartyCount]
dec a dec a
ld hl, OTPartyMon1Item ld hl, OTPartyMon1Item

4
engine/battle/returntobattle_useball.asm
View File

@ -4,13 +4,13 @@ _ReturnToBattle_UseBall: ; 2715c
ld a, [BattleType] ld a, [BattleType]
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .gettutorialbackpic jr z, .gettutorialbackpic
farcall GetBattleMonBackpic farcall Predef_GetBattleMonBackpic
jr .continue jr .continue
.gettutorialbackpic .gettutorialbackpic
farcall GetTrainerBackpic farcall GetTrainerBackpic
.continue .continue
farcall GetEnemyMonFrontpic farcall Predef_GetEnemyMonFrontpic
farcall _LoadBattleFontsHPBar farcall _LoadBattleFontsHPBar
call GetMemSGBLayout call GetMemSGBLayout
call CloseWindow call CloseWindow

2
engine/battle/start_battle.asm
View File

@ -33,7 +33,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld [BattleMonLevel], a ld [BattleMonLevel], a
predef Predef_StartBattle predef Predef_DoBattleTransition
farcall _LoadBattleFontsHPBar farcall _LoadBattleFontsHPBar
ld a, 1 ld a, 1
ld [hBGMapMode], a ld [hBGMapMode], a

23
engine/battle_anims/anim_commands.asm
View File

@ -1,6 +1,6 @@
; Battle animation command interpreter. ; Battle animation command interpreter.
PlayBattleAnim: ; cc0d6 Predef_PlayBattleAnim: ; cc0d6
ld a, [rSVBK] ld a, [rSVBK]
push af push af
@ -167,7 +167,7 @@ BattleAnimRestoreHuds: ; cc1bb
ld [rSVBK], a ld [rSVBK], a
ld hl, UpdateBattleHuds ld hl, UpdateBattleHuds
ld a, BANK(UpdatePlayerHUD) ld a, BANK(Predef_UpdatePlayerHUD)
rst FarCall ; Why not "call UpdateBattleHuds"? rst FarCall ; Why not "call UpdateBattleHuds"?
pop af pop af
@ -232,8 +232,7 @@ ClearActorHud: ; cc207
ret ret
; cc220 ; cc220
Functioncc220: ; cc220 Unreferenced_Functioncc220: ; cc220
; Appears to be unused.
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld a, LOW(vBGMap0 tile $28) ld a, LOW(vBGMap0 tile $28)
@ -929,18 +928,18 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
ld a, [TempBattleMonSpecies] ; TempBattleMonSpecies ld a, [TempBattleMonSpecies] ; TempBattleMonSpecies
ld [CurPartySpecies], a ; CurPartySpecies ld [CurPartySpecies], a ; CurPartySpecies
ld hl, BattleMonDVs ; BattleMonDVs ld hl, BattleMonDVs ; BattleMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld de, vTiles0 tile $00 ld de, vTiles0 tile $00
predef GetMonFrontpic predef Predef_GetMonFrontpic
jr .done jr .done
.player .player
ld a, [TempEnemyMonSpecies] ; TempEnemyMonSpecies ld a, [TempEnemyMonSpecies] ; TempEnemyMonSpecies
ld [CurPartySpecies], a ; CurPartySpecies ld [CurPartySpecies], a ; CurPartySpecies
ld hl, EnemyMonDVs ; EnemyMonDVs ld hl, EnemyMonDVs ; EnemyMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld de, vTiles0 tile $00 ld de, vTiles0 tile $00
predef GetMonBackpic predef Predef_GetMonBackpic
.done .done
pop af pop af
@ -1156,16 +1155,16 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776)
jr z, .player jr z, .player
ld hl, BattleMonDVs ld hl, BattleMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
predef GetMonFrontpic predef Predef_GetMonFrontpic
jr .done jr .done
.player .player
ld hl, EnemyMonDVs ld hl, EnemyMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld de, vTiles2 tile $31 ld de, vTiles2 tile $31
predef GetMonBackpic predef Predef_GetMonBackpic
.done .done
pop af pop af

21
engine/billspc.asm
View File

@ -244,8 +244,7 @@ BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
db "CANCEL@" db "CANCEL@"
; 0xe2564 (38:6564) ; 0xe2564 (38:6564)
BillsPC_ClearThreeBoxes: ; e2564 Unreferenced_BillsPCClearThreeBoxes: ; e2564
; unreferenced
hlcoord 0, 0 hlcoord 0, 0
ld b, 4 ld b, 4
ld c, 8 ld c, 8
@ -1096,10 +1095,10 @@ PCMonInfo: ; e2ac6 (38:6ac6)
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
ld hl, TempMonDVs ld hl, TempMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
call GetBaseData call GetBaseData
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
predef GetMonFrontpic predef Predef_GetMonFrontpic
xor a xor a
ld [wBillsPC_MonHasMail], a ld [wBillsPC_MonHasMail], a
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
@ -1116,7 +1115,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
ld a, $3 ld a, $3
ld [MonType], a ld [MonType], a
farcall GetGender farcall Predef_GetGender
jr c, .skip_gender jr c, .skip_gender
ld a, "♂" ld a, "♂"
jr nz, .printgender jr nz, .printgender
@ -1583,7 +1582,7 @@ endr
db -1 db -1
; e2ed5 ; e2ed5
BillsPC_UnusedFillBox: ; e2ed5 Unreferenced_BillsPC_FillBox: ; e2ed5
.row .row
push bc push bc
push hl push hl
@ -1699,7 +1698,7 @@ BillsPC_StatsScreen: ; e2f7e (38:6f7e)
call BillsPC_CopyMon call BillsPC_CopyMon
ld a, $3 ld a, $3
ld [MonType], a ld [MonType], a
predef StatsScreenInit predef Predef_StatsScreenInit
call BillsPC_InitGFX call BillsPC_InitGFX
call MaxVolume call MaxVolume
ret ret
@ -1727,7 +1726,7 @@ StatsScreenDPad: ; e2f95 (38:6f95)
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
ld hl, TempMonDVs ld hl, TempMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
call GetBaseData call GetBaseData
call BillsPC_CopyMon call BillsPC_CopyMon
.pressed_a_b_right_left .pressed_a_b_right_left
@ -1820,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 SentGetPkmnIntoFromBox predef Predef_SendGetPkmnIntoFromBox
jr c, .asm_boxisfull jr c, .asm_boxisfull
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
@ -1875,7 +1874,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
call CloseSRAM call CloseSRAM
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
predef SentGetPkmnIntoFromBox predef Predef_SendGetPkmnIntoFromBox
jr c, .PartyFull jr c, .PartyFull
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
@ -2555,7 +2554,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
ret ret
; e3778 (38:7778) ; e3778 (38:7778)
hlcoord 11, 7 ; XXX hlcoord 11, 7 ; unused
.MenuDataHeader: ; 0xe377b .MenuDataHeader: ; 0xe377b
db $40 ; flags db $40 ; flags

6
engine/billspctop.asm
View File

@ -142,7 +142,7 @@ BillsPC_DepositMenu: ; e4fe (3:64fe)
and a and a
ret ret
Functione512: ; unused Unreferenced_Functione512:
ld a, [PartyCount] ld a, [PartyCount]
and a and a
jr z, .no_pkmn jr z, .no_pkmn
@ -211,7 +211,7 @@ BillsPC_WithdrawMenu: ; e559 (3:6559)
and a and a
ret ret
Functione56d: ; unused Unreferenced_Functione56d:
ld a, [PartyCount] ld a, [PartyCount]
cp PARTY_LENGTH cp PARTY_LENGTH
jr nc, .asm_e576 jr nc, .asm_e576
@ -267,7 +267,7 @@ CopyBoxmonToTempMon: ; e5bb
call CloseSRAM call CloseSRAM
ret ret
Functione5d9: ; unreferenced Unreferenced_Functione5d9:
ld a, [wCurBox] ld a, [wCurBox]
cp b cp b
jr z, .same_box jr z, .same_box

31
engine/breeding.asm
View File

@ -10,7 +10,7 @@ CheckBreedmonCompatibility: ; 16e1d
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
predef GetGender predef Predef_GetGender
jr c, .genderless jr c, .genderless
ld b, $1 ld b, $1
jr nz, .breedmon2 jr nz, .breedmon2
@ -26,7 +26,7 @@ CheckBreedmonCompatibility: ; 16e1d
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld a, $3 ld a, $3
ld [MonType], a ld [MonType], a
predef GetGender predef Predef_GetGender
pop bc pop bc
jr c, .genderless jr c, .genderless
ld a, $1 ld a, $1
@ -232,7 +232,7 @@ HatchEggs: ; 16f70 (5:6f70)
push de push de
farcall SetEggMonCaughtData farcall SetEggMonCaughtData
farcall TrainerRankings_EggsHatched farcall StubbedTrainerRankings_EggsHatched
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, PartyMon1Species ld hl, PartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
@ -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 Predef_CalcPkmnStats
pop bc pop bc
ld hl, MON_MAXHP ld hl, MON_MAXHP
add hl, bc add hl, bc
@ -514,7 +514,7 @@ GLOBAL EggMoves
cp b cp b
jr nz, .loop5 jr nz, .loop5
ld [wPutativeTMHMMove], a ld [wPutativeTMHMMove], a
predef CanLearnTMHMMove predef Predef_CanLearnTMHMMove
ld a, c ld a, c
and a and a
jr z, .done jr z, .done
@ -559,7 +559,7 @@ LoadEggMove: ; 17169
ld [hl], b ld [hl], b
ld hl, wEggMonMoves ld hl, wEggMonMoves
ld de, wEggMonPP ld de, wEggMonPP
predef FillPP predef Predef_FillPP
pop bc pop bc
pop de pop de
ret ret
@ -590,7 +590,7 @@ GetHeritableMoves: ; 17197
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
predef GetGender predef Predef_GetGender
jr c, .inherit_mon2_moves jr c, .inherit_mon2_moves
jr nz, .inherit_mon2_moves jr nz, .inherit_mon2_moves
jr .inherit_mon1_moves jr .inherit_mon1_moves
@ -606,7 +606,7 @@ GetHeritableMoves: ; 17197
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
predef GetGender predef Predef_GetGender
jr c, .inherit_mon1_moves jr c, .inherit_mon1_moves
jr nz, .inherit_mon1_moves jr nz, .inherit_mon1_moves
@ -647,9 +647,9 @@ GetEggFrontpic: ; 17224 (5:7224)
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
ld hl, BattleMonDVs ld hl, BattleMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
pop de pop de
predef_jump GetMonFrontpic predef_jump Predef_GetMonFrontpic
GetHatchlingFrontpic: ; 1723c (5:723c) GetHatchlingFrontpic: ; 1723c (5:723c)
push de push de
@ -657,9 +657,9 @@ GetHatchlingFrontpic: ; 1723c (5:723c)
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
ld hl, BattleMonDVs ld hl, BattleMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
pop de pop de
predef_jump GetAnimatedFrontpicPredef predef_jump Predef_GetAnimatedFrontpic
Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254) Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
push af push af
@ -677,7 +677,7 @@ Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
ld a, c ld a, c
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
pop af pop af
call Hatch_LoadFrontpicPal call Hatch_LoadFrontpicPal
call SetPalettes call SetPalettes
@ -779,7 +779,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
hlcoord 6, 3 hlcoord 6, 3
ld d, $0 ld d, $0
ld e, ANIM_MON_HATCH ld e, ANIM_MON_HATCH
predef AnimateFrontpic predef Predef_AnimateFrontpic
pop af pop af
ld [CurSpecies], a ld [CurSpecies], a
ret ret
@ -985,8 +985,7 @@ DayCareMonCompatibilityText: ; 1746c
db "@" db "@"
; 0x174b5 ; 0x174b5
DayCareMonPrintEmptyString: ; 174b5 Unreferenced_DayCareMonPrintEmptyString: ; 174b5
; unreferenced
ld hl, .string ld hl, .string
ret ret
; 174b9 ; 174b9

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