mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
This commit is contained in:
Remy Oukaour
commit
5c28d05bb4
13
data/unknown_table.asm
Executable file
13
data/unknown_table.asm
Executable 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
|
||||
@ -1,4 +1,4 @@
|
||||
Dakutens: ; dummied out
|
||||
Dakutens: ; unused
|
||||
db "かが", "きぎ", "くぐ", "けげ", "こご"
|
||||
db "さざ", "しじ", "すず", "せぜ", "そぞ"
|
||||
db "ただ", "ちぢ", "つづ", "てで", "とど"
|
||||
@ -9,7 +9,7 @@ Dakutens: ; dummied out
|
||||
db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
|
||||
db -1 ; end
|
||||
|
||||
Handakutens: ; dummied out
|
||||
Handakutens: ; unused
|
||||
db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
|
||||
db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
|
||||
db -1 ; end
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
GetGen1TrainerClassName: ; 50a28
|
||||
; XXX
|
||||
Unreferenced_GetGen1TrainerClassName: ; 50a28
|
||||
ld hl, .Strings
|
||||
ld a, [TrainerClass]
|
||||
dec a
|
||||
|
||||
@ -545,7 +545,7 @@ AI_Items: ; 39196
|
||||
|
||||
AIUpdateHUD: ; 38387
|
||||
call UpdateEnemyMonInParty
|
||||
farcall UpdateEnemyHUD
|
||||
farcall Predef_UpdateEnemyHUD
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a
|
||||
ld hl, wEnemyItemState
|
||||
@ -664,7 +664,7 @@ EnemyPotionFinish: ; 38436
|
||||
xor a
|
||||
ld [wWhichHPBar], a
|
||||
call AIUsedItemSound
|
||||
predef AnimateHPBar
|
||||
predef Predef_AnimateHPBar
|
||||
jp AIUpdateHUD
|
||||
|
||||
|
||||
|
||||
@ -92,7 +92,7 @@ AIChooseMove: ; 440ce
|
||||
|
||||
push bc
|
||||
ld d, BANK(TrainerClassAttributes)
|
||||
predef FlagPredef
|
||||
predef Predef_SmallFarFlagAction
|
||||
ld d, c
|
||||
pop bc
|
||||
|
||||
|
||||
@ -1488,7 +1488,7 @@ AI_Smart_Encore: ; 38c3b
|
||||
push hl
|
||||
ld a, [wEnemyMoveStruct + MOVE_TYPE]
|
||||
ld hl, EnemyMonType1
|
||||
predef CheckTypeMatchup
|
||||
predef Predef_CheckTypeMatchup
|
||||
|
||||
pop hl
|
||||
ld a, [wd265]
|
||||
|
||||
@ -28,7 +28,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
|
||||
inc hl
|
||||
call GetMoveByte
|
||||
ld hl, EnemyMonType
|
||||
call CheckTypeMatchup
|
||||
call Predef_CheckTypeMatchup
|
||||
ld a, [wTypeMatchup]
|
||||
cp 10 + 1 ; 1.0 + 0.1
|
||||
jr nc, .super_effective
|
||||
@ -73,7 +73,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
|
||||
ld a, [BattleMonType1]
|
||||
ld b, a
|
||||
ld hl, EnemyMonType1
|
||||
call CheckTypeMatchup
|
||||
call Predef_CheckTypeMatchup
|
||||
ld a, [wTypeMatchup]
|
||||
cp 10 + 1 ; 1.0 + 0.1
|
||||
jr c, .ok
|
||||
@ -82,7 +82,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
|
||||
ld a, [BattleMonType2]
|
||||
cp b
|
||||
jr z, .ok2
|
||||
call CheckTypeMatchup
|
||||
call Predef_CheckTypeMatchup
|
||||
ld a, [wTypeMatchup]
|
||||
cp 10 + 1 ; 1.0 + 0.1
|
||||
jr c, .ok2
|
||||
@ -123,7 +123,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
|
||||
inc hl
|
||||
call GetMoveByte
|
||||
ld hl, BattleMonType1
|
||||
call CheckTypeMatchup
|
||||
call Predef_CheckTypeMatchup
|
||||
|
||||
ld a, [wTypeMatchup]
|
||||
; immune
|
||||
@ -390,7 +390,7 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
|
||||
inc hl
|
||||
call GetMoveByte
|
||||
ld hl, BaseType
|
||||
call CheckTypeMatchup
|
||||
call Predef_CheckTypeMatchup
|
||||
ld a, [wTypeMatchup]
|
||||
and a
|
||||
jr nz, .next
|
||||
@ -481,7 +481,7 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
|
||||
inc hl
|
||||
call GetMoveByte
|
||||
ld hl, BattleMonType1
|
||||
call CheckTypeMatchup
|
||||
call Predef_CheckTypeMatchup
|
||||
|
||||
; if immune or not very effective: continue
|
||||
ld a, [wTypeMatchup]
|
||||
@ -585,7 +585,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20
|
||||
.skip_move
|
||||
ld a, [BattleMonType1]
|
||||
ld hl, BaseType
|
||||
call CheckTypeMatchup
|
||||
call Predef_CheckTypeMatchup
|
||||
ld a, [wTypeMatchup]
|
||||
cp 10 + 1
|
||||
jr nc, .dont_choose_mon
|
||||
@ -593,7 +593,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20
|
||||
|
||||
.check_type
|
||||
ld hl, BaseType
|
||||
call CheckTypeMatchup
|
||||
call Predef_CheckTypeMatchup
|
||||
ld a, [wTypeMatchup]
|
||||
cp 10 + 1
|
||||
jr nc, .dont_choose_mon
|
||||
|
||||
@ -67,7 +67,7 @@ _AnimateHPBar: ; d627
|
||||
ld a, [hli]
|
||||
ld b, a
|
||||
pop hl
|
||||
call ComputeHPBarPixels
|
||||
call Predef_ComputeHPBarPixels
|
||||
ld a, e
|
||||
ld [wCurHPBarPixels], a
|
||||
|
||||
@ -79,7 +79,7 @@ _AnimateHPBar: ; d627
|
||||
ld e, a
|
||||
ld a, [wCurHPAnimMaxHP + 1]
|
||||
ld d, a
|
||||
call ComputeHPBarPixels
|
||||
call Predef_ComputeHPBarPixels
|
||||
ld a, e
|
||||
ld [wNewHPBarPixels], a
|
||||
|
||||
@ -183,11 +183,11 @@ LongAnim_UpdateVariables: ; d6f5
|
||||
ld c, a
|
||||
ld a, [hli]
|
||||
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
|
||||
; used. The game then proceeds as though it never deleted that output.
|
||||
; To fix, uncomment the line below.
|
||||
call ComputeHPBarPixels
|
||||
call Predef_ComputeHPBarPixels
|
||||
; ld a, e
|
||||
pop bc
|
||||
pop de
|
||||
@ -227,7 +227,7 @@ LongHPBarAnim_UpdateTiles: ; d749
|
||||
ld e, a
|
||||
ld a, [wCurHPAnimMaxHP + 1]
|
||||
ld d, a
|
||||
call ComputeHPBarPixels
|
||||
call Predef_ComputeHPBarPixels
|
||||
ld c, e
|
||||
ld d, HP_BAR_LENGTH
|
||||
ld a, [wWhichHPBar]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Predef_StartBattle: ; 8c20f
|
||||
Predef_DoBattleTransition: ; 8c20f
|
||||
call .InitGFX
|
||||
ld a, [rBGP]
|
||||
ld [wBGP], a
|
||||
@ -16,7 +16,7 @@ Predef_StartBattle: ; 8c20f
|
||||
ld a, [wJumptableIndex]
|
||||
bit 7, a
|
||||
jr nz, .done
|
||||
call FlashyTransitionToBattle
|
||||
call BattleTransitionJumptable
|
||||
call DelayFrame
|
||||
jr .loop
|
||||
|
||||
@ -144,7 +144,7 @@ TrainerBattlePokeballTiles: ; 8c2f4
|
||||
INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
|
||||
|
||||
|
||||
FlashyTransitionToBattle: ; 8c314
|
||||
BattleTransitionJumptable: ; 8c314
|
||||
jumptable .dw, wJumptableIndex
|
||||
; 8c323
|
||||
|
||||
@ -859,8 +859,7 @@ ENDM
|
||||
ret
|
||||
; 8c7c9 (23:47c9)
|
||||
|
||||
Function8c7c9:
|
||||
; XXX
|
||||
Unreferenced_Function8c7c9:
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a
|
||||
call WaitBGMap
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -182,7 +182,7 @@ CheckPlayerTurn:
|
||||
call StdBattleTextBox
|
||||
call CantMove
|
||||
call UpdateBattleMonInParty
|
||||
ld hl, UpdatePlayerHUD
|
||||
ld hl, Predef_UpdatePlayerHUD
|
||||
call CallBattleCore
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a
|
||||
@ -433,7 +433,7 @@ CheckEnemyTurn: ; 3421f
|
||||
call StdBattleTextBox
|
||||
call CantMove
|
||||
call UpdateEnemyMonInParty
|
||||
ld hl, UpdateEnemyHUD
|
||||
ld hl, Predef_UpdateEnemyHUD
|
||||
call CallBattleCore
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a
|
||||
@ -672,7 +672,7 @@ HitConfusion: ; 343a5
|
||||
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
|
||||
call z, PlayFXAnimID
|
||||
|
||||
ld hl, UpdatePlayerHUD
|
||||
ld hl, Predef_UpdatePlayerHUD
|
||||
call CallBattleCore
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a
|
||||
@ -1538,12 +1538,12 @@ BattleCheckTypeMatchup: ; 347c8
|
||||
ld hl, EnemyMonType1
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, CheckTypeMatchup
|
||||
jr z, Predef_CheckTypeMatchup
|
||||
ld hl, BattleMonType1
|
||||
CheckTypeMatchup: ; 347d3
|
||||
Predef_CheckTypeMatchup: ; 347d3
|
||||
; 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
|
||||
; offensive type in a will make this function do the right thing. Since a is overwritten,
|
||||
; the AI calls Predef_CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing
|
||||
; 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
|
||||
; current move into a in BattleCheckTypeMatchup, before falling through, which is
|
||||
; consistent with how the rest of the code assumes this code works like.
|
||||
@ -2621,7 +2621,7 @@ BattleCommand_CheckDestinyBond: ; 351c0
|
||||
ld [Buffer6], a
|
||||
ld h, b
|
||||
ld l, c
|
||||
predef AnimateHPBar
|
||||
predef Predef_AnimateHPBar
|
||||
call RefreshBattleHuds
|
||||
|
||||
call BattleCommand_SwitchTurn
|
||||
@ -4015,7 +4015,7 @@ BattleCommand_PainSplit: ; 35926
|
||||
ld a, $1
|
||||
ld [wWhichHPBar], a
|
||||
hlcoord 10, 9
|
||||
predef AnimateHPBar
|
||||
predef Predef_AnimateHPBar
|
||||
ld hl, EnemyMonHP
|
||||
ld a, [hli]
|
||||
ld [Buffer4], a
|
||||
@ -4030,7 +4030,7 @@ BattleCommand_PainSplit: ; 35926
|
||||
ld [wWhichHPBar], a
|
||||
call ResetDamage
|
||||
hlcoord 2, 2
|
||||
predef AnimateHPBar
|
||||
predef Predef_AnimateHPBar
|
||||
farcall _UpdateBattleHUDs
|
||||
|
||||
ld hl, SharedPainText
|
||||
@ -4172,7 +4172,7 @@ BattleCommand_Conversion2: ; 359e6
|
||||
|
||||
ld a, [hl]
|
||||
ld [wNamedObjectIndexBuffer], a
|
||||
predef GetTypeName
|
||||
predef Predef_GetTypeName
|
||||
ld hl, TransformedTypeText
|
||||
jp StdBattleTextBox
|
||||
|
||||
@ -4711,7 +4711,7 @@ PlayFXAnimID: ; 35d08
|
||||
ld c, 3
|
||||
call DelayFrames
|
||||
|
||||
callfar PlayBattleAnim
|
||||
callfar Predef_PlayBattleAnim
|
||||
|
||||
ret
|
||||
|
||||
@ -4773,7 +4773,7 @@ EnemyHurtItself: ; 35d1c
|
||||
hlcoord 2, 2
|
||||
xor a
|
||||
ld [wWhichHPBar], a
|
||||
predef AnimateHPBar
|
||||
predef Predef_AnimateHPBar
|
||||
.did_no_damage
|
||||
jp RefreshBattleHuds
|
||||
|
||||
@ -4833,7 +4833,7 @@ PlayerHurtItself: ; 35d7e
|
||||
hlcoord 10, 9
|
||||
ld a, $1
|
||||
ld [wWhichHPBar], a
|
||||
predef AnimateHPBar
|
||||
predef Predef_AnimateHPBar
|
||||
.did_no_damage
|
||||
jp RefreshBattleHuds
|
||||
|
||||
@ -5301,7 +5301,7 @@ SapHealth: ; 36011
|
||||
xor a
|
||||
.hp_bar
|
||||
ld [wWhichHPBar], a
|
||||
predef AnimateHPBar
|
||||
predef Predef_AnimateHPBar
|
||||
call RefreshBattleHuds
|
||||
jp UpdateBattleMonInParty
|
||||
|
||||
@ -6239,11 +6239,11 @@ BattleCommand_Curl: ; 365a7
|
||||
|
||||
|
||||
BattleCommand_RaiseSubNoAnim: ; 365af
|
||||
ld hl, GetBattleMonBackpic
|
||||
ld hl, Predef_GetBattleMonBackpic
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .PlayerTurn
|
||||
ld hl, GetEnemyMonFrontpic
|
||||
ld hl, Predef_GetEnemyMonFrontpic
|
||||
.PlayerTurn:
|
||||
xor a
|
||||
ld [hBGMapMode], a
|
||||
@ -7525,7 +7525,7 @@ BattleCommand_Recoil: ; 36cb2
|
||||
xor a
|
||||
.animate_hp_bar
|
||||
ld [wWhichHPBar], a
|
||||
predef AnimateHPBar
|
||||
predef Predef_AnimateHPBar
|
||||
call RefreshBattleHuds
|
||||
ld hl, RecoilText
|
||||
jp StdBattleTextBox
|
||||
@ -8023,7 +8023,7 @@ BattleCommand_LeechSeed: ; 36f9d
|
||||
|
||||
BattleCommand_Splash: ; 36fe1
|
||||
call AnimateCurrentMove
|
||||
farcall TrainerRankings_Splash
|
||||
farcall StubbedTrainerRankings_Splash
|
||||
jp PrintNothingHappened
|
||||
|
||||
; 36fed
|
||||
@ -8227,7 +8227,7 @@ BattleCommand_Conversion: ; 3707f
|
||||
inc de
|
||||
ld [de], a
|
||||
ld [wNamedObjectIndexBuffer], a
|
||||
farcall GetTypeName
|
||||
farcall Predef_GetTypeName
|
||||
call AnimateCurrentMove
|
||||
ld hl, TransformedTypeText
|
||||
jp StdBattleTextBox
|
||||
@ -8550,7 +8550,7 @@ CheckSubstituteOpp: ; 37378
|
||||
|
||||
|
||||
BattleCommand_Selfdestruct: ; 37380
|
||||
farcall TrainerRankings_Selfdestruct
|
||||
farcall StubbedTrainerRankings_Selfdestruct
|
||||
ld a, BATTLEANIM_PLAYER_DAMAGE
|
||||
ld [wNumHits], a
|
||||
ld c, 3
|
||||
@ -9856,7 +9856,7 @@ PlayUserBattleAnim: ; 37e47
|
||||
push hl
|
||||
push de
|
||||
push bc
|
||||
callfar PlayBattleAnim
|
||||
callfar Predef_PlayBattleAnim
|
||||
pop bc
|
||||
pop de
|
||||
pop hl
|
||||
@ -9878,7 +9878,7 @@ PlayOpponentBattleAnim: ; 37e54
|
||||
push bc
|
||||
call BattleCommand_SwitchTurn
|
||||
|
||||
callfar PlayBattleAnim
|
||||
callfar Predef_PlayBattleAnim
|
||||
|
||||
call BattleCommand_SwitchTurn
|
||||
pop bc
|
||||
|
||||
@ -35,7 +35,7 @@ CheckOppositeGender: ; 377f5
|
||||
xor a
|
||||
ld [MonType], a
|
||||
|
||||
farcall GetGender
|
||||
farcall Predef_GetGender
|
||||
jr c, .genderless_samegender
|
||||
|
||||
ld b, 1
|
||||
@ -58,7 +58,7 @@ CheckOppositeGender: ; 377f5
|
||||
ld [TempMonDVs + 1], a
|
||||
ld a, 3
|
||||
ld [MonType], a
|
||||
farcall GetGender
|
||||
farcall Predef_GetGender
|
||||
pop bc
|
||||
jr c, .genderless_samegender
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ AppearUser: ; fbd77 (3e:7d77)
|
||||
ld a, $31
|
||||
.okay
|
||||
ld [hGraphicStartTile], a
|
||||
predef PlaceGraphic
|
||||
predef Predef_PlaceGraphic
|
||||
FinishAppearDisappearUser: ; fbd91 (3e:7d91)
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a
|
||||
|
||||
@ -103,7 +103,7 @@ TrainerType1: ; 397eb
|
||||
ld a, OTPARTYMON
|
||||
ld [MonType], a
|
||||
push hl
|
||||
predef TryAddMonToParty
|
||||
predef Predef_TryAddMonToParty
|
||||
pop hl
|
||||
jr .loop
|
||||
; 39806
|
||||
@ -124,7 +124,7 @@ TrainerType2: ; 39806
|
||||
ld [MonType], a
|
||||
|
||||
push hl
|
||||
predef TryAddMonToParty
|
||||
predef Predef_TryAddMonToParty
|
||||
ld a, [OTPartyCount]
|
||||
dec a
|
||||
ld hl, OTPartyMon1Moves
|
||||
@ -200,7 +200,7 @@ TrainerType3: ; 39871
|
||||
ld a, OTPARTYMON
|
||||
ld [MonType], a
|
||||
push hl
|
||||
predef TryAddMonToParty
|
||||
predef Predef_TryAddMonToParty
|
||||
ld a, [OTPartyCount]
|
||||
dec a
|
||||
ld hl, OTPartyMon1Item
|
||||
@ -231,7 +231,7 @@ TrainerType4: ; 3989d
|
||||
ld [MonType], a
|
||||
|
||||
push hl
|
||||
predef TryAddMonToParty
|
||||
predef Predef_TryAddMonToParty
|
||||
ld a, [OTPartyCount]
|
||||
dec a
|
||||
ld hl, OTPartyMon1Item
|
||||
|
||||
@ -4,13 +4,13 @@ _ReturnToBattle_UseBall: ; 2715c
|
||||
ld a, [BattleType]
|
||||
cp BATTLETYPE_TUTORIAL
|
||||
jr z, .gettutorialbackpic
|
||||
farcall GetBattleMonBackpic
|
||||
farcall Predef_GetBattleMonBackpic
|
||||
jr .continue
|
||||
|
||||
.gettutorialbackpic
|
||||
farcall GetTrainerBackpic
|
||||
.continue
|
||||
farcall GetEnemyMonFrontpic
|
||||
farcall Predef_GetEnemyMonFrontpic
|
||||
farcall _LoadBattleFontsHPBar
|
||||
call GetMemSGBLayout
|
||||
call CloseWindow
|
||||
|
||||
@ -33,7 +33,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f
|
||||
add hl, de
|
||||
ld a, [hl]
|
||||
ld [BattleMonLevel], a
|
||||
predef Predef_StartBattle
|
||||
predef Predef_DoBattleTransition
|
||||
farcall _LoadBattleFontsHPBar
|
||||
ld a, 1
|
||||
ld [hBGMapMode], a
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
; Battle animation command interpreter.
|
||||
|
||||
PlayBattleAnim: ; cc0d6
|
||||
Predef_PlayBattleAnim: ; cc0d6
|
||||
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
@ -167,7 +167,7 @@ BattleAnimRestoreHuds: ; cc1bb
|
||||
ld [rSVBK], a
|
||||
|
||||
ld hl, UpdateBattleHuds
|
||||
ld a, BANK(UpdatePlayerHUD)
|
||||
ld a, BANK(Predef_UpdatePlayerHUD)
|
||||
rst FarCall ; Why not "call UpdateBattleHuds"?
|
||||
|
||||
pop af
|
||||
@ -232,8 +232,7 @@ ClearActorHud: ; cc207
|
||||
ret
|
||||
; cc220
|
||||
|
||||
Functioncc220: ; cc220
|
||||
; Appears to be unused.
|
||||
Unreferenced_Functioncc220: ; cc220
|
||||
xor a
|
||||
ld [hBGMapMode], a
|
||||
ld a, LOW(vBGMap0 tile $28)
|
||||
@ -929,18 +928,18 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
|
||||
ld a, [TempBattleMonSpecies] ; TempBattleMonSpecies
|
||||
ld [CurPartySpecies], a ; CurPartySpecies
|
||||
ld hl, BattleMonDVs ; BattleMonDVs
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
ld de, vTiles0 tile $00
|
||||
predef GetMonFrontpic
|
||||
predef Predef_GetMonFrontpic
|
||||
jr .done
|
||||
|
||||
.player
|
||||
ld a, [TempEnemyMonSpecies] ; TempEnemyMonSpecies
|
||||
ld [CurPartySpecies], a ; CurPartySpecies
|
||||
ld hl, EnemyMonDVs ; EnemyMonDVs
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
ld de, vTiles0 tile $00
|
||||
predef GetMonBackpic
|
||||
predef Predef_GetMonBackpic
|
||||
|
||||
.done
|
||||
pop af
|
||||
@ -1156,16 +1155,16 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776)
|
||||
jr z, .player
|
||||
|
||||
ld hl, BattleMonDVs
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
ld de, vTiles2 tile $00
|
||||
predef GetMonFrontpic
|
||||
predef Predef_GetMonFrontpic
|
||||
jr .done
|
||||
|
||||
.player
|
||||
ld hl, EnemyMonDVs
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
ld de, vTiles2 tile $31
|
||||
predef GetMonBackpic
|
||||
predef Predef_GetMonBackpic
|
||||
|
||||
.done
|
||||
pop af
|
||||
|
||||
@ -244,8 +244,7 @@ BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
|
||||
db "CANCEL@"
|
||||
; 0xe2564 (38:6564)
|
||||
|
||||
BillsPC_ClearThreeBoxes: ; e2564
|
||||
; unreferenced
|
||||
Unreferenced_BillsPCClearThreeBoxes: ; e2564
|
||||
hlcoord 0, 0
|
||||
ld b, 4
|
||||
ld c, 8
|
||||
@ -1096,10 +1095,10 @@ PCMonInfo: ; e2ac6 (38:6ac6)
|
||||
ld [CurPartySpecies], a
|
||||
ld [CurSpecies], a
|
||||
ld hl, TempMonDVs
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
call GetBaseData
|
||||
ld de, vTiles2 tile $00
|
||||
predef GetMonFrontpic
|
||||
predef Predef_GetMonFrontpic
|
||||
xor a
|
||||
ld [wBillsPC_MonHasMail], a
|
||||
ld a, [CurPartySpecies]
|
||||
@ -1116,7 +1115,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
|
||||
|
||||
ld a, $3
|
||||
ld [MonType], a
|
||||
farcall GetGender
|
||||
farcall Predef_GetGender
|
||||
jr c, .skip_gender
|
||||
ld a, "♂"
|
||||
jr nz, .printgender
|
||||
@ -1583,7 +1582,7 @@ endr
|
||||
db -1
|
||||
; e2ed5
|
||||
|
||||
BillsPC_UnusedFillBox: ; e2ed5
|
||||
Unreferenced_BillsPC_FillBox: ; e2ed5
|
||||
.row
|
||||
push bc
|
||||
push hl
|
||||
@ -1699,7 +1698,7 @@ BillsPC_StatsScreen: ; e2f7e (38:6f7e)
|
||||
call BillsPC_CopyMon
|
||||
ld a, $3
|
||||
ld [MonType], a
|
||||
predef StatsScreenInit
|
||||
predef Predef_StatsScreenInit
|
||||
call BillsPC_InitGFX
|
||||
call MaxVolume
|
||||
ret
|
||||
@ -1727,7 +1726,7 @@ StatsScreenDPad: ; e2f95 (38:6f95)
|
||||
ld [CurPartySpecies], a
|
||||
ld [CurSpecies], a
|
||||
ld hl, TempMonDVs
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
call GetBaseData
|
||||
call BillsPC_CopyMon
|
||||
.pressed_a_b_right_left
|
||||
@ -1820,7 +1819,7 @@ DepositPokemon: ; e307c (38:707c)
|
||||
call GetNick
|
||||
ld a, PC_DEPOSIT
|
||||
ld [wPokemonWithdrawDepositParameter], a
|
||||
predef SentGetPkmnIntoFromBox
|
||||
predef Predef_SendGetPkmnIntoFromBox
|
||||
jr c, .asm_boxisfull
|
||||
xor a
|
||||
ld [wPokemonWithdrawDepositParameter], a
|
||||
@ -1875,7 +1874,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
|
||||
call CloseSRAM
|
||||
xor a
|
||||
ld [wPokemonWithdrawDepositParameter], a
|
||||
predef SentGetPkmnIntoFromBox
|
||||
predef Predef_SendGetPkmnIntoFromBox
|
||||
jr c, .PartyFull
|
||||
ld a, PC_DEPOSIT
|
||||
ld [wPokemonWithdrawDepositParameter], a
|
||||
@ -2555,7 +2554,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
|
||||
ret
|
||||
; e3778 (38:7778)
|
||||
|
||||
hlcoord 11, 7 ; XXX
|
||||
hlcoord 11, 7 ; unused
|
||||
|
||||
.MenuDataHeader: ; 0xe377b
|
||||
db $40 ; flags
|
||||
|
||||
@ -142,7 +142,7 @@ BillsPC_DepositMenu: ; e4fe (3:64fe)
|
||||
and a
|
||||
ret
|
||||
|
||||
Functione512: ; unused
|
||||
Unreferenced_Functione512:
|
||||
ld a, [PartyCount]
|
||||
and a
|
||||
jr z, .no_pkmn
|
||||
@ -211,7 +211,7 @@ BillsPC_WithdrawMenu: ; e559 (3:6559)
|
||||
and a
|
||||
ret
|
||||
|
||||
Functione56d: ; unused
|
||||
Unreferenced_Functione56d:
|
||||
ld a, [PartyCount]
|
||||
cp PARTY_LENGTH
|
||||
jr nc, .asm_e576
|
||||
@ -267,7 +267,7 @@ CopyBoxmonToTempMon: ; e5bb
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Functione5d9: ; unreferenced
|
||||
Unreferenced_Functione5d9:
|
||||
ld a, [wCurBox]
|
||||
cp b
|
||||
jr z, .same_box
|
||||
|
||||
@ -10,7 +10,7 @@ CheckBreedmonCompatibility: ; 16e1d
|
||||
ld [TempMonDVs + 1], a
|
||||
ld a, TEMPMON
|
||||
ld [MonType], a
|
||||
predef GetGender
|
||||
predef Predef_GetGender
|
||||
jr c, .genderless
|
||||
ld b, $1
|
||||
jr nz, .breedmon2
|
||||
@ -26,7 +26,7 @@ CheckBreedmonCompatibility: ; 16e1d
|
||||
ld [TempMonDVs + 1], a
|
||||
ld a, $3
|
||||
ld [MonType], a
|
||||
predef GetGender
|
||||
predef Predef_GetGender
|
||||
pop bc
|
||||
jr c, .genderless
|
||||
ld a, $1
|
||||
@ -232,7 +232,7 @@ HatchEggs: ; 16f70 (5:6f70)
|
||||
push de
|
||||
|
||||
farcall SetEggMonCaughtData
|
||||
farcall TrainerRankings_EggsHatched
|
||||
farcall StubbedTrainerRankings_EggsHatched
|
||||
ld a, [CurPartyMon]
|
||||
ld hl, PartyMon1Species
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
@ -289,7 +289,7 @@ HatchEggs: ; 16f70 (5:6f70)
|
||||
ld bc, MON_STAT_EXP - 1
|
||||
add hl, bc
|
||||
ld b, $0
|
||||
predef CalcPkmnStats
|
||||
predef Predef_CalcPkmnStats
|
||||
pop bc
|
||||
ld hl, MON_MAXHP
|
||||
add hl, bc
|
||||
@ -514,7 +514,7 @@ GLOBAL EggMoves
|
||||
cp b
|
||||
jr nz, .loop5
|
||||
ld [wPutativeTMHMMove], a
|
||||
predef CanLearnTMHMMove
|
||||
predef Predef_CanLearnTMHMMove
|
||||
ld a, c
|
||||
and a
|
||||
jr z, .done
|
||||
@ -559,7 +559,7 @@ LoadEggMove: ; 17169
|
||||
ld [hl], b
|
||||
ld hl, wEggMonMoves
|
||||
ld de, wEggMonPP
|
||||
predef FillPP
|
||||
predef Predef_FillPP
|
||||
pop bc
|
||||
pop de
|
||||
ret
|
||||
@ -590,7 +590,7 @@ GetHeritableMoves: ; 17197
|
||||
ld [TempMonDVs + 1], a
|
||||
ld a, TEMPMON
|
||||
ld [MonType], a
|
||||
predef GetGender
|
||||
predef Predef_GetGender
|
||||
jr c, .inherit_mon2_moves
|
||||
jr nz, .inherit_mon2_moves
|
||||
jr .inherit_mon1_moves
|
||||
@ -606,7 +606,7 @@ GetHeritableMoves: ; 17197
|
||||
ld [TempMonDVs + 1], a
|
||||
ld a, TEMPMON
|
||||
ld [MonType], a
|
||||
predef GetGender
|
||||
predef Predef_GetGender
|
||||
jr c, .inherit_mon1_moves
|
||||
jr nz, .inherit_mon1_moves
|
||||
|
||||
@ -647,9 +647,9 @@ GetEggFrontpic: ; 17224 (5:7224)
|
||||
ld [CurSpecies], a
|
||||
call GetBaseData
|
||||
ld hl, BattleMonDVs
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
pop de
|
||||
predef_jump GetMonFrontpic
|
||||
predef_jump Predef_GetMonFrontpic
|
||||
|
||||
GetHatchlingFrontpic: ; 1723c (5:723c)
|
||||
push de
|
||||
@ -657,9 +657,9 @@ GetHatchlingFrontpic: ; 1723c (5:723c)
|
||||
ld [CurSpecies], a
|
||||
call GetBaseData
|
||||
ld hl, BattleMonDVs
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
pop de
|
||||
predef_jump GetAnimatedFrontpicPredef
|
||||
predef_jump Predef_GetAnimatedFrontpic
|
||||
|
||||
Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
|
||||
push af
|
||||
@ -677,7 +677,7 @@ Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
|
||||
ld a, c
|
||||
ld [hGraphicStartTile], a
|
||||
lb bc, 7, 7
|
||||
predef PlaceGraphic
|
||||
predef Predef_PlaceGraphic
|
||||
pop af
|
||||
call Hatch_LoadFrontpicPal
|
||||
call SetPalettes
|
||||
@ -779,7 +779,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
|
||||
hlcoord 6, 3
|
||||
ld d, $0
|
||||
ld e, ANIM_MON_HATCH
|
||||
predef AnimateFrontpic
|
||||
predef Predef_AnimateFrontpic
|
||||
pop af
|
||||
ld [CurSpecies], a
|
||||
ret
|
||||
@ -985,8 +985,7 @@ DayCareMonCompatibilityText: ; 1746c
|
||||
db "@"
|
||||
; 0x174b5
|
||||
|
||||
DayCareMonPrintEmptyString: ; 174b5
|
||||
; unreferenced
|
||||
Unreferenced_DayCareMonPrintEmptyString: ; 174b5
|
||||
ld hl, .string
|
||||
ret
|
||||
; 174b9
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user