mirror of https://github.com/pret/pokecrystal.git
Battle Anim Object struct constants
This commit is contained in:
PikalaxALT
parent
ddc05ec8dd
commit
3893feb835
|
|
@ -77,7 +77,7 @@ BattleAnimRunScript: ; cc11c
|
|||
call BattleAnimRestoreHuds
|
||||
|
||||
.disabled
|
||||
ld a, [wcfca]
|
||||
ld a, [wNumHits]
|
||||
and a
|
||||
jr z, .done
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ BattleAnimRunScript: ; cc11c
|
|||
|
||||
.hi_byte
|
||||
call WaitSFX
|
||||
call Functioncc881
|
||||
call PlayHitSound
|
||||
call RunBattleAnimScript
|
||||
|
||||
.done
|
||||
|
|
@ -191,13 +191,13 @@ BattleAnimRequestPals: ; cc1e2
|
|||
|
||||
ld a, [rBGP]
|
||||
ld b, a
|
||||
ld a, [wcfc7]
|
||||
ld a, [wBGP]
|
||||
cp b
|
||||
call nz, Functioncc91a
|
||||
|
||||
ld a, [rOBP0]
|
||||
ld b, a
|
||||
ld a, [wcfc8]
|
||||
ld a, [wOBP0]
|
||||
cp b
|
||||
call nz, Functioncc94b
|
||||
ret
|
||||
|
|
@ -625,6 +625,7 @@ endr
|
|||
ret
|
||||
|
||||
BattleAnimCmd_Obj: ; cc41f (33:441f)
|
||||
; index, ???, ???, ???
|
||||
call GetBattleAnimByte
|
||||
ld [BattleAnimTemps], a
|
||||
call GetBattleAnimByte
|
||||
|
|
@ -650,17 +651,17 @@ BattleAnimCmd_BGEffect: ; cc43b (33:443b)
|
|||
|
||||
BattleAnimCmd_BGP: ; cc457 (33:4457)
|
||||
call GetBattleAnimByte
|
||||
ld [wcfc7], a
|
||||
ld [wBGP], a
|
||||
ret
|
||||
|
||||
BattleAnimCmd_OBP0: ; cc45e (33:445e)
|
||||
call GetBattleAnimByte
|
||||
ld [wcfc8], a
|
||||
ld [wOBP0], a
|
||||
ret
|
||||
|
||||
BattleAnimCmd_OBP1: ; cc465 (33:4465)
|
||||
call GetBattleAnimByte
|
||||
ld [wcfc9], a
|
||||
ld [wOBP1], a
|
||||
ret
|
||||
|
||||
BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
|
||||
|
|
@ -670,7 +671,7 @@ BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
|
|||
jr z, .not_sgb
|
||||
ld a, $f0
|
||||
.not_sgb
|
||||
ld [wcfc8], a
|
||||
ld [wOBP0], a
|
||||
ret
|
||||
|
||||
BattleAnimCmd_ClearObjs: ; cc479 (33:4479)
|
||||
|
|
@ -691,10 +692,10 @@ BattleAnimCmd_5GFX: ; cc485 (33:4485)
|
|||
ld a, [BattleAnimByte]
|
||||
and $f
|
||||
ld c, a
|
||||
ld hl, w5_d300
|
||||
ld hl, wBattleAnimTileDict
|
||||
xor a
|
||||
ld [BattleAnimTemps], a
|
||||
.asm_cc492
|
||||
.loop
|
||||
ld a, [BattleAnimTemps]
|
||||
cp $4f
|
||||
ret nc
|
||||
|
|
@ -719,7 +720,7 @@ endr
|
|||
pop hl
|
||||
pop bc
|
||||
dec c
|
||||
jr nz, .asm_cc492
|
||||
jr nz, .loop
|
||||
ret
|
||||
|
||||
BattleAnimCmd_IncObj: ; cc4c0 (33:44c0)
|
||||
|
|
@ -797,7 +798,7 @@ BattleAnimCmd_SetObj: ; cc506 (33:4506)
|
|||
|
||||
BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
|
||||
|
||||
ld hl, w5_d300
|
||||
ld hl, wBattleAnimTileDict
|
||||
.asm_cc52f
|
||||
ld a, [hl]
|
||||
and a
|
||||
|
|
@ -853,7 +854,7 @@ Functioncc561: ; cc561 (33:4561)
|
|||
|
||||
BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
|
||||
|
||||
ld hl, w5_d300
|
||||
ld hl, wBattleAnimTileDict
|
||||
.asm_cc581
|
||||
ld a, [hl]
|
||||
and a
|
||||
|
|
@ -1249,7 +1250,7 @@ BattleAnimCmd_Cry: ; cc807 (33:4807)
|
|||
and 3
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, Datacc871
|
||||
ld hl, .CryData
|
||||
rept 4
|
||||
add hl, de
|
||||
endr
|
||||
|
|
@ -1266,14 +1267,14 @@ endr
|
|||
ld a, $f0
|
||||
ld [CryTracks], a ; CryTracks
|
||||
ld a, [BattleMonSpecies] ; BattleMonSpecies
|
||||
jr .asm_cc834
|
||||
jr .done_cry_tracks
|
||||
|
||||
.enemy
|
||||
ld a, $0f
|
||||
ld [CryTracks], a ; CryTracks
|
||||
ld a, [EnemyMonSpecies] ; EnemyMon
|
||||
|
||||
.asm_cc834
|
||||
.done_cry_tracks
|
||||
push hl
|
||||
call LoadCryHeader
|
||||
pop hl
|
||||
|
|
@ -1320,17 +1321,17 @@ endr
|
|||
ret
|
||||
; cc871 (33:4871)
|
||||
|
||||
Datacc871: ; cc871
|
||||
.CryData: ; cc871
|
||||
; +pitch, +length
|
||||
dw 0, $c0
|
||||
dw 0, $40
|
||||
dw 0, $00
|
||||
dw 0, $00
|
||||
dw $0000, $00c0
|
||||
dw $0000, $0040
|
||||
dw $0000, $0000
|
||||
dw $0000, $0000
|
||||
; cc881
|
||||
|
||||
|
||||
Functioncc881: ; cc881
|
||||
ld a, [wcfca]
|
||||
PlayHitSound: ; cc881
|
||||
ld a, [wNumHits]
|
||||
cp $1
|
||||
jr z, .okay
|
||||
cp $4
|
||||
|
|
@ -1366,17 +1367,17 @@ BattleAnimAssignPals: ; cc8a4
|
|||
ld a, %11110000
|
||||
|
||||
.sgb
|
||||
ld [wcfc8], a
|
||||
ld [wOBP0], a
|
||||
ld a, %11100100
|
||||
ld [wcfc7], a
|
||||
ld [wcfc9], a
|
||||
ld [wBGP], a
|
||||
ld [wOBP1], a
|
||||
ret
|
||||
|
||||
.cgb
|
||||
ld a, %11100100
|
||||
ld [wcfc7], a
|
||||
ld [wcfc8], a
|
||||
ld [wcfc9], a
|
||||
ld [wBGP], a
|
||||
ld [wOBP0], a
|
||||
ld [wOBP1], a
|
||||
call DmgToCgbBGPals
|
||||
lb de, %11100100, %11100100
|
||||
call DmgToCgbObjPals
|
||||
|
|
@ -1412,9 +1413,9 @@ endr
|
|||
Functioncc8f6: ; cc8f6
|
||||
call WaitTop
|
||||
ld a, %11100100
|
||||
ld [wcfc7], a
|
||||
ld [wcfc8], a
|
||||
ld [wcfc9], a
|
||||
ld [wBGP], a
|
||||
ld [wOBP0], a
|
||||
ld [wOBP1], a
|
||||
call DmgToCgbBGPals
|
||||
lb de, %11100100, %11100100
|
||||
call DmgToCgbObjPals
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -218,14 +218,14 @@ Functionc80fb: ; c80fb (32:40fb)
|
|||
ld h, 0
|
||||
add hl, de
|
||||
ld a, [hl]
|
||||
ld [wcfc7], a
|
||||
ld [wBGP], a
|
||||
ret
|
||||
|
||||
BattleBGEffect_WhiteHues: ; c812d (32:412d)
|
||||
ld de, Unknown_c813d
|
||||
call Functionc8d57
|
||||
jr c, .asm_c8139
|
||||
ld [wcfc7], a
|
||||
ld [wBGP], a
|
||||
ret
|
||||
|
||||
.asm_c8139
|
||||
|
|
@ -242,7 +242,7 @@ BattleBGEffect_BlackHues: ; c8141 (32:4141)
|
|||
ld de, Unknown_c8151
|
||||
call Functionc8d57
|
||||
jr c, .asm_c814d
|
||||
ld [wcfc7], a
|
||||
ld [wBGP], a
|
||||
ret
|
||||
|
||||
.asm_c814d
|
||||
|
|
@ -259,8 +259,8 @@ BattleBGEffect_AlternateHues: ; c8155 (32:4155)
|
|||
ld de, Unknown_c8168
|
||||
call Functionc8d57
|
||||
jr c, .asm_c8164
|
||||
ld [wcfc7], a
|
||||
ld [wcfc9], a
|
||||
ld [wBGP], a
|
||||
ld [wOBP1], a
|
||||
ret
|
||||
|
||||
.asm_c8164
|
||||
|
|
@ -282,7 +282,7 @@ BattleBGEffect_06: ; c8171 (32:4171)
|
|||
ld de, Unknown_c8188
|
||||
.asm_c817e
|
||||
call Functionc8d57
|
||||
ld [wcfc8], a
|
||||
ld [wOBP0], a
|
||||
ret
|
||||
|
||||
; c8185 (32:4185)
|
||||
|
|
@ -304,7 +304,7 @@ BattleBGEffect_07: ; c818b (32:418b)
|
|||
ld de, Unknown_c81a2
|
||||
.asm_c8198
|
||||
call Functionc8d57
|
||||
ld [wcfc8], a
|
||||
ld [wOBP0], a
|
||||
ret
|
||||
|
||||
; c819f (32:419f)
|
||||
|
|
@ -320,7 +320,7 @@ Unknown_c81a2:
|
|||
BattleBGEffect_08: ; c81a5 (32:41a5)
|
||||
ld de, Unknown_c81af
|
||||
call Functionc8d57
|
||||
ld [wcfc7], a
|
||||
ld [wBGP], a
|
||||
ret
|
||||
|
||||
; c81af (32:41af)
|
||||
|
|
@ -412,7 +412,7 @@ BattleBGEffect_FeetFollow: ; c8214 (32:4214)
|
|||
Functionc8223: ; c8223 (32:4223)
|
||||
call Functionc9042
|
||||
jr z, .asm_c8230
|
||||
ld hl, w5_d40e
|
||||
ld hl, wNumActiveBattleAnims
|
||||
inc [hl]
|
||||
call EndBattleBGEffect
|
||||
ret
|
||||
|
|
@ -478,7 +478,7 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281)
|
|||
Functionc8290: ; c8290 (32:4290)
|
||||
call Functionc9042
|
||||
jr z, .asm_c829d
|
||||
ld hl, w5_d40e
|
||||
ld hl, wNumActiveBattleAnims
|
||||
inc [hl]
|
||||
call EndBattleBGEffect
|
||||
ret
|
||||
|
|
@ -2002,7 +2002,7 @@ Functionc8b22: ; c8b22 (32:4b22)
|
|||
ld hl, Unknown_c8bd8
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
ld [wcfc9], a
|
||||
ld [wOBP1], a
|
||||
ld d, a
|
||||
ld e, [hl]
|
||||
ld bc, $2f30
|
||||
|
|
@ -2013,7 +2013,7 @@ Functionc8b22: ; c8b22 (32:4b22)
|
|||
ld d, [hl]
|
||||
inc hl
|
||||
ld a, [hl]
|
||||
ld [wcfc9], a
|
||||
ld [wOBP1], a
|
||||
ld e, a
|
||||
ld bc, $3728
|
||||
.asm_c8b5b
|
||||
|
|
@ -2024,8 +2024,8 @@ Functionc8b22: ; c8b22 (32:4b22)
|
|||
Functionc8b60: ; c8b60 (32:4b60)
|
||||
call Functionc8f19
|
||||
ld a, $e4
|
||||
ld [wcfc7], a
|
||||
ld [wcfc9], a
|
||||
ld [wBGP], a
|
||||
ld [wOBP1], a
|
||||
ret
|
||||
|
||||
Functionc8b6c: ; c8b6c (32:4b6c)
|
||||
|
|
@ -2733,8 +2733,8 @@ Functionc8f19: ; c8f19 (32:4f19)
|
|||
ld [hLCDStatCustom], a
|
||||
ld a, $e4
|
||||
ld [rBGP], a
|
||||
ld [wcfc7], a
|
||||
ld [wcfc9], a
|
||||
ld [wBGP], a
|
||||
ld [wOBP1], a
|
||||
ld [hLCDStatCustom + 1], a
|
||||
ld [hLCDStatCustom + 2], a
|
||||
call Functionc8eca
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ HandleBerserkGene: ; 3c27c
|
|||
bit SUBSTATUS_CONFUSED, a
|
||||
ret nz
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_CONFUSED
|
||||
call Call_PlayBattleAnim_OnlyIfVisible
|
||||
call SwitchTurnCore
|
||||
|
|
@ -1098,7 +1098,7 @@ ResidualDamage: ; 3c716
|
|||
pop de
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
call Call_PlayBattleAnim_OnlyIfVisible
|
||||
call GetEighthMaxHP
|
||||
ld de, PlayerToxicCount
|
||||
|
|
@ -1138,7 +1138,7 @@ ResidualDamage: ; 3c716
|
|||
|
||||
call SwitchTurnCore
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_SAP
|
||||
ld a, BATTLE_VARS_SUBSTATUS3_OPP
|
||||
call GetBattleVar
|
||||
|
|
@ -1163,7 +1163,7 @@ ResidualDamage: ; 3c716
|
|||
bit SUBSTATUS_NIGHTMARE, [hl]
|
||||
jr z, .not_nightmare
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_IN_NIGHTMARE
|
||||
call Call_PlayBattleAnim_OnlyIfVisible
|
||||
call GetQuarterMaxHP
|
||||
|
|
@ -1181,7 +1181,7 @@ ResidualDamage: ; 3c716
|
|||
jr z, .not_cursed
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_IN_NIGHTMARE
|
||||
call Call_PlayBattleAnim_OnlyIfVisible
|
||||
call GetQuarterMaxHP
|
||||
|
|
@ -1325,7 +1325,7 @@ HandleWrap: ; 3c874
|
|||
|
||||
call SwitchTurnCore
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [FXAnimIDHi], a
|
||||
predef PlayBattleAnim
|
||||
call SwitchTurnCore
|
||||
|
|
@ -1827,7 +1827,7 @@ HandleWeather: ; 3cb9e
|
|||
|
||||
call SwitchTurnCore
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_IN_SANDSTORM
|
||||
call Call_PlayBattleAnim
|
||||
call SwitchTurnCore
|
||||
|
|
@ -3761,7 +3761,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
|
|||
call GetMonFrontpic
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [wKickCounter], a
|
||||
call SetEnemyTurn
|
||||
ld de, ANIM_SEND_OUT_MON
|
||||
|
|
@ -4267,7 +4267,7 @@ SendOutPlayerMon: ; 3db5f
|
|||
ld [wEnemyWrapCount], a
|
||||
call SetPlayerTurn
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [wKickCounter], a
|
||||
ld de, ANIM_SEND_OUT_MON
|
||||
call Call_PlayBattleAnim
|
||||
|
|
@ -4460,7 +4460,7 @@ Function3dce6: ; 3dce6
|
|||
push af
|
||||
xor a
|
||||
ld [hBattleTurn], a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_RETURN_MON
|
||||
call Call_PlayBattleAnim
|
||||
pop af
|
||||
|
|
@ -4593,7 +4593,7 @@ ItemRecoveryAnim: ; 3ddc8
|
|||
ld [FXAnimIDLo], a
|
||||
call SwitchTurnCore
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [FXAnimIDHi], a
|
||||
predef PlayBattleAnim
|
||||
call SwitchTurnCore
|
||||
|
|
@ -8761,7 +8761,7 @@ CleanUpBattleRAM: ; 3f6d0
|
|||
ld [wFailedToFlee], a
|
||||
ld [wNumFleeAttempts], a
|
||||
ld [wForcedSwitch], a
|
||||
ld [wd0d8], a
|
||||
ld [wPartyMenuCursor], a
|
||||
ld [wKeyItemsPocketCursor], a
|
||||
ld [wItemsPocketCursor], a
|
||||
ld [wd0d2], a
|
||||
|
|
@ -9591,7 +9591,7 @@ BattleStartMessage: ; 3fc8b
|
|||
jr nc, .not_shiny
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld a, 1
|
||||
ld [hBattleTurn], a
|
||||
ld a, 1
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ CheckPlayerTurn:
|
|||
jr z, .woke_up
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_SLP
|
||||
call FarPlayBattleAnimation
|
||||
jr .fast_asleep
|
||||
|
|
@ -276,7 +276,7 @@ CheckPlayerTurn:
|
|||
ld hl, IsConfusedText
|
||||
call StdBattleTextBox
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_CONFUSED
|
||||
call FarPlayBattleAnimation
|
||||
|
||||
|
|
@ -305,7 +305,7 @@ CheckPlayerTurn:
|
|||
ld hl, InLoveWithText
|
||||
call StdBattleTextBox
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_IN_LOVE
|
||||
call FarPlayBattleAnimation
|
||||
|
||||
|
|
@ -420,7 +420,7 @@ CheckEnemyTurn: ; 3421f
|
|||
ld hl, FastAsleepText
|
||||
call StdBattleTextBox
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_SLP
|
||||
call FarPlayBattleAnimation
|
||||
jr .fast_asleep
|
||||
|
|
@ -521,7 +521,7 @@ CheckEnemyTurn: ; 3421f
|
|||
call StdBattleTextBox
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_CONFUSED
|
||||
call FarPlayBattleAnimation
|
||||
|
||||
|
|
@ -542,7 +542,7 @@ CheckEnemyTurn: ; 3421f
|
|||
call BattleCommand_DamageCalc
|
||||
call BattleCommand_LowerSub
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
|
||||
; Flicker the monster pic unless flying or underground.
|
||||
ld de, ANIM_HIT_CONFUSION
|
||||
|
|
@ -567,7 +567,7 @@ CheckEnemyTurn: ; 3421f
|
|||
ld hl, InLoveWithText
|
||||
call StdBattleTextBox
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld de, ANIM_IN_LOVE
|
||||
call FarPlayBattleAnimation
|
||||
|
||||
|
|
@ -656,7 +656,7 @@ HitConfusion: ; 343a5
|
|||
call BattleCommand_LowerSub
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
|
||||
; Flicker the monster pic unless flying or underground.
|
||||
ld de, ANIM_HIT_CONFUSION
|
||||
|
|
@ -2071,7 +2071,7 @@ BattleCommand_LowerSub: ; 34eee
|
|||
jr c, .mimic_anims
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [FXAnimIDHi], a
|
||||
inc a
|
||||
ld [wKickCounter], a
|
||||
|
|
@ -2125,7 +2125,7 @@ BattleCommand_HitTargetNoSub: ; 34f60
|
|||
ld a, BATTLEANIM_PLAYER_DAMAGE
|
||||
|
||||
.got_rollout_count
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld a, BATTLE_VARS_MOVE_EFFECT
|
||||
call GetBattleVar
|
||||
cp EFFECT_MULTI_HIT
|
||||
|
|
@ -2177,7 +2177,7 @@ BattleCommand_HitTargetNoSub: ; 34f60
|
|||
pop af
|
||||
jp z, PlayFXAnimID
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
jp PlayFXAnimID
|
||||
; 34fd1
|
||||
|
||||
|
|
@ -2208,7 +2208,7 @@ BattleCommand_StatDownAnim: ; 34fdb
|
|||
|
||||
|
||||
BattleCommand_StatUpDownAnim: ; 34feb
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
xor a
|
||||
ld [wKickCounter], a
|
||||
ld a, BATTLE_VARS_MOVE_ANIM
|
||||
|
|
@ -2241,7 +2241,7 @@ BattleCommand_RaiseSub: ; 35004
|
|||
jp c, BattleCommand_RaiseSubNoAnim
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [FXAnimIDHi], a
|
||||
ld a, $2
|
||||
ld [wKickCounter], a
|
||||
|
|
@ -2599,7 +2599,7 @@ BattleCommand_CheckDestinyBond: ; 351c0
|
|||
|
||||
call BattleCommand_SwitchTurn
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [FXAnimIDHi], a
|
||||
inc a
|
||||
ld [wKickCounter], a
|
||||
|
|
@ -5254,7 +5254,7 @@ BattleCommand_BurnTarget: ; 3608c
|
|||
; burntarget
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
call CheckSubstituteOpp
|
||||
ret nz
|
||||
ld a, BATTLE_VARS_STATUS_OPP
|
||||
|
|
@ -5324,7 +5324,7 @@ BattleCommand_FreezeTarget: ; 36102
|
|||
; freezetarget
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
call CheckSubstituteOpp
|
||||
ret nz
|
||||
ld a, BATTLE_VARS_STATUS_OPP
|
||||
|
|
@ -5379,7 +5379,7 @@ BattleCommand_ParalyzeTarget: ; 36165
|
|||
; paralyzetarget
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
call CheckSubstituteOpp
|
||||
ret nz
|
||||
ld a, BATTLE_VARS_STATUS_OPP
|
||||
|
|
@ -6549,7 +6549,7 @@ BattleCommand_Teleport: ; 36778
|
|||
.run_away
|
||||
call UpdateBattleMonInParty
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
inc a
|
||||
ld [wForcedSwitch], a
|
||||
ld [wKickCounter], a
|
||||
|
|
@ -6617,7 +6617,7 @@ BattleCommand_ForceSwitch: ; 3680f
|
|||
.wild_force_flee
|
||||
call UpdateBattleMonInParty
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
inc a
|
||||
ld [wForcedSwitch], a
|
||||
call SetBattleDraw
|
||||
|
|
@ -6710,7 +6710,7 @@ BattleCommand_ForceSwitch: ; 3680f
|
|||
.wild_succeed_playeristarget
|
||||
call UpdateBattleMonInParty
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
inc a
|
||||
ld [wForcedSwitch], a
|
||||
call SetBattleDraw
|
||||
|
|
@ -7141,7 +7141,7 @@ BattleCommand_Charge: ; 36b4d
|
|||
|
||||
call BattleCommand_LowerSub
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
inc a
|
||||
ld [wKickCounter], a
|
||||
call LoadMoveAnim
|
||||
|
|
@ -7713,7 +7713,7 @@ endr
|
|||
jr c, .mobile
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [FXAnimIDHi], a
|
||||
ld [wKickCounter], a
|
||||
ld a, SUBSTITUTE
|
||||
|
|
@ -8234,7 +8234,7 @@ BattleCommand_Transform: ; 371cd
|
|||
call CheckHiddenOpponent
|
||||
jp nz, Function372d2
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [FXAnimIDHi], a
|
||||
ld a, $1
|
||||
ld [wKickCounter], a
|
||||
|
|
@ -8352,7 +8352,7 @@ endr
|
|||
call BattleCommand_RaiseSubNoAnim
|
||||
.after_anim
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [FXAnimIDHi], a
|
||||
ld a, $2
|
||||
ld [wKickCounter], a
|
||||
|
|
@ -8546,7 +8546,7 @@ CheckSubstituteOpp: ; 37378
|
|||
BattleCommand_SelfDestruct: ; 37380
|
||||
callba MobileFn_10610d
|
||||
ld a, BATTLEANIM_PLAYER_DAMAGE
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld c, 3
|
||||
call DelayFrames
|
||||
ld a, BATTLE_VARS_STATUS
|
||||
|
|
@ -9773,7 +9773,7 @@ PlayDamageAnim: ; 37e19
|
|||
ld a, BATTLEANIM_PLAYER_DAMAGE
|
||||
|
||||
.player
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
|
||||
jp PlayUserBattleAnim
|
||||
; 37e36
|
||||
|
|
@ -9781,7 +9781,7 @@ PlayDamageAnim: ; 37e19
|
|||
|
||||
LoadMoveAnim: ; 37e36
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
ld [FXAnimIDHi], a
|
||||
|
||||
ld a, BATTLE_VARS_MOVE_ANIM
|
||||
|
|
@ -9819,7 +9819,7 @@ PlayOpponentBattleAnim: ; 37e54
|
|||
ld a, d
|
||||
ld [FXAnimIDHi], a
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
|
||||
push hl
|
||||
push de
|
||||
|
|
|
|||
|
|
@ -374,3 +374,30 @@ SUBSTATUS_CURLED EQU 0
|
|||
const WIN
|
||||
const LOSE
|
||||
const DRAW
|
||||
|
||||
const_def
|
||||
const BATTLEANIMSTRUCT_INDEX
|
||||
const BATTLEANIMSTRUCT_01
|
||||
const BATTLEANIMSTRUCT_02
|
||||
const BATTLEANIMSTRUCT_03
|
||||
const BATTLEANIMSTRUCT_04
|
||||
const BATTLEANIMSTRUCT_05
|
||||
const BATTLEANIMSTRUCT_06
|
||||
const BATTLEANIMSTRUCT_07
|
||||
const BATTLEANIMSTRUCT_08
|
||||
const BATTLEANIMSTRUCT_09
|
||||
const BATTLEANIMSTRUCT_0A
|
||||
const BATTLEANIMSTRUCT_0B
|
||||
const BATTLEANIMSTRUCT_0C
|
||||
const BATTLEANIMSTRUCT_0D
|
||||
const BATTLEANIMSTRUCT_0E
|
||||
const BATTLEANIMSTRUCT_0F
|
||||
const BATTLEANIMSTRUCT_10
|
||||
const BATTLEANIMSTRUCT_11
|
||||
const BATTLEANIMSTRUCT_12
|
||||
const BATTLEANIMSTRUCT_13
|
||||
const BATTLEANIMSTRUCT_14
|
||||
const BATTLEANIMSTRUCT_15
|
||||
const BATTLEANIMSTRUCT_16
|
||||
const BATTLEANIMSTRUCT_17
|
||||
BATTLEANIMSTRUCT_LENGTH EQU const_value
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ const_value SET const_value + -1
|
|||
const ANIM_SHAKE ; $114
|
||||
const ANIM_HIT_CONFUSION ; $115
|
||||
|
||||
; wcfca uses offsets from ANIM_MISS
|
||||
; wNumHits uses offsets from ANIM_MISS
|
||||
const_def
|
||||
const BATTLEANIM_NONE
|
||||
const BATTLEANIM_ENEMY_DAMAGE
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
Predef_StartBattle: ; 8c20f
|
||||
call Function8c26d
|
||||
ld a, [rBGP]
|
||||
ld [wcfc7], a
|
||||
ld [wBGP], a
|
||||
ld a, [rOBP0]
|
||||
ld [wcfc8], a
|
||||
ld [wOBP0], a
|
||||
ld a, [rOBP1]
|
||||
ld [wcfc9], a
|
||||
ld [wOBP1], a
|
||||
call DelayFrame
|
||||
ld hl, hVBlank
|
||||
ld a, [hl]
|
||||
|
|
@ -35,7 +35,7 @@ Predef_StartBattle: ; 8c20f
|
|||
ld [rSVBK], a
|
||||
|
||||
ld a, %11111111
|
||||
ld [wcfc7], a
|
||||
ld [wBGP], a
|
||||
call DmgToCgbBGPals
|
||||
call DelayFrame
|
||||
xor a
|
||||
|
|
@ -278,7 +278,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
|
|||
ld a, [hl]
|
||||
cp %00000001
|
||||
jr z, .done
|
||||
ld [wcfc7], a
|
||||
ld [wBGP], a
|
||||
call DmgToCgbBGPals
|
||||
and a
|
||||
ret
|
||||
|
|
|
|||
|
|
@ -678,7 +678,7 @@ InitPartyMenuWithCancel: ; 50405
|
|||
xor a
|
||||
ld [wSwitchMon], a
|
||||
ld de, PartyMenuAttributes
|
||||
call InitMenu3
|
||||
call SetMenuAttributes
|
||||
ld a, [PartyCount]
|
||||
inc a
|
||||
ld [w2DMenuNumRows], a ; list length
|
||||
|
|
@ -704,7 +704,7 @@ InitPartyMenuWithCancel: ; 50405
|
|||
InitPartyMenuNoCancel: ; 0x5042d
|
||||
; no cancel
|
||||
ld de, PartyMenuAttributes
|
||||
call InitMenu3
|
||||
call SetMenuAttributes
|
||||
ld a, [PartyCount]
|
||||
ld [w2DMenuNumRows], a ; list length
|
||||
ld b, a
|
||||
|
|
@ -726,13 +726,17 @@ InitPartyMenuNoCancel: ; 0x5042d
|
|||
PartyMenuAttributes: ; 5044f
|
||||
; cursor y
|
||||
; cursor x
|
||||
; list length
|
||||
; ?
|
||||
; num rows
|
||||
; num cols
|
||||
; bit 6: animate sprites bit 5: wrap around
|
||||
; ?
|
||||
; distance between items (hi: y, lo: x)
|
||||
; allowed buttons (mask)
|
||||
db $01, $00, $00, $01, $60, $00, $20, $00
|
||||
db 1, 0
|
||||
db 0, 1
|
||||
db $60, $00
|
||||
dn 2, 0
|
||||
db 0
|
||||
; 50457
|
||||
|
||||
PartyMenuSelect: ; 0x50457
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ endr
|
|||
.GetMenuAccountTextPointer ; 12819
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, wcf97
|
||||
ld hl, wMenuData2PointerTableAddr
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
|
|
@ -1475,8 +1475,8 @@ ChooseMoveToDelete: ; 12f5b
|
|||
|
||||
.asm_12f73: ; 12f73
|
||||
call SetUpMoveScreenBG
|
||||
ld de, Unknown_12fb2
|
||||
call InitMenu3
|
||||
ld de, DeleteMoveScreenAttrs
|
||||
call SetMenuAttributes
|
||||
call SetUpMoveList
|
||||
ld hl, w2DMenuFlags1
|
||||
set 6, [hl]
|
||||
|
|
@ -1514,8 +1514,12 @@ ChooseMoveToDelete: ; 12f5b
|
|||
ret
|
||||
; 12fb2
|
||||
|
||||
Unknown_12fb2: ; 12fb2
|
||||
db $03, $01, $03, $01, $40, $00, $20, $c3
|
||||
DeleteMoveScreenAttrs: ; 12fb2
|
||||
db 3, 1
|
||||
db 3, 1
|
||||
db $40, $00
|
||||
dn 2, 0
|
||||
db D_UP | D_DOWN | A_BUTTON | B_BUTTON
|
||||
; 12fba
|
||||
|
||||
ManagePokemonMoves: ; 12fba
|
||||
|
|
@ -1539,11 +1543,11 @@ ManagePokemonMoves: ; 12fba
|
|||
MoveScreenLoop: ; 12fd5
|
||||
ld a, [CurPartyMon]
|
||||
inc a
|
||||
ld [wd0d8], a
|
||||
ld [wPartyMenuCursor], a
|
||||
call SetUpMoveScreenBG
|
||||
call Function132d3
|
||||
ld de, Unknown_13163
|
||||
call InitMenu3
|
||||
ld de, MoveScreenAttributes
|
||||
call SetMenuAttributes
|
||||
.loop
|
||||
call SetUpMoveList
|
||||
ld hl, w2DMenuFlags1
|
||||
|
|
@ -1746,8 +1750,12 @@ MoveScreenLoop: ; 12fd5
|
|||
jp ClearTileMap
|
||||
; 13163
|
||||
|
||||
Unknown_13163: ; 13163
|
||||
db $03, $01, $03, $01, $40, $00, $20, $f3
|
||||
MoveScreenAttributes: ; 13163
|
||||
db 3, 1
|
||||
db 3, 1
|
||||
db $40, $00
|
||||
dn 2, 0
|
||||
db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON
|
||||
; 1316b
|
||||
|
||||
String_1316b: ; 1316b
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ SwitchItemsInBag: ; 2490c (9:490c)
|
|||
cp b
|
||||
jr z, .trivial
|
||||
ld a, [wScrollingMenuCursorPosition]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
ld a, [hl]
|
||||
cp $ff
|
||||
cp -1
|
||||
ret z
|
||||
ld a, [wSwitchItem]
|
||||
dec a
|
||||
|
|
@ -45,10 +45,10 @@ SwitchItemsInBag: ; 2490c (9:490c)
|
|||
call Function24a6c
|
||||
push bc
|
||||
ld a, [wSwitchItem]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
dec hl
|
||||
push hl
|
||||
call Function24a80
|
||||
call ItemSwitch_ConvertSpacingToDW
|
||||
add hl, bc
|
||||
ld d, h
|
||||
ld e, l
|
||||
|
|
@ -71,10 +71,10 @@ SwitchItemsInBag: ; 2490c (9:490c)
|
|||
call Function24a6c
|
||||
push bc
|
||||
ld a, [wSwitchItem]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
ld d, h
|
||||
ld e, l
|
||||
call Function24a80
|
||||
call ItemSwitch_ConvertSpacingToDW
|
||||
add hl, bc
|
||||
pop bc
|
||||
call CopyBytes
|
||||
|
|
@ -86,11 +86,11 @@ SwitchItemsInBag: ; 2490c (9:490c)
|
|||
|
||||
Function249a7: ; 249a7 (9:49a7)
|
||||
ld a, [wSwitchItem]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
ld d, h
|
||||
ld e, l
|
||||
ld a, [wScrollingMenuCursorPosition]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
ld a, [de]
|
||||
cp [hl]
|
||||
jr nz, .asm_249cd
|
||||
|
|
@ -112,11 +112,11 @@ Function249a7: ; 249a7 (9:49a7)
|
|||
|
||||
Function249d1: ; 249d1 (9:49d1)
|
||||
ld a, [wSwitchItem]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
inc hl
|
||||
push hl
|
||||
ld a, [wScrollingMenuCursorPosition]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
inc hl
|
||||
ld a, [hl]
|
||||
pop hl
|
||||
|
|
@ -126,11 +126,11 @@ Function249d1: ; 249d1 (9:49d1)
|
|||
sub 99
|
||||
push af
|
||||
ld a, [wScrollingMenuCursorPosition]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
inc hl
|
||||
ld [hl], 99
|
||||
ld a, [wSwitchItem]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
inc hl
|
||||
pop af
|
||||
ld [hl], a
|
||||
|
|
@ -141,7 +141,7 @@ Function249d1: ; 249d1 (9:49d1)
|
|||
.asm_24a01
|
||||
push af
|
||||
ld a, [wScrollingMenuCursorPosition]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
inc hl
|
||||
pop af
|
||||
ld [hl], a
|
||||
|
|
@ -154,7 +154,7 @@ Function249d1: ; 249d1 (9:49d1)
|
|||
jr nz, .asm_24a25
|
||||
dec [hl]
|
||||
ld a, [wSwitchItem]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
ld [hl], $ff
|
||||
xor a
|
||||
ld [wSwitchItem], a
|
||||
|
|
@ -162,10 +162,10 @@ Function249d1: ; 249d1 (9:49d1)
|
|||
|
||||
.asm_24a25
|
||||
dec [hl]
|
||||
call Function24a80
|
||||
call ItemSwitch_ConvertSpacingToDW
|
||||
push bc
|
||||
ld a, [wSwitchItem]
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
pop bc
|
||||
push hl
|
||||
add hl, bc
|
||||
|
|
@ -181,24 +181,24 @@ Function249d1: ; 249d1 (9:49d1)
|
|||
ret
|
||||
|
||||
Function24a40: ; 24a40 (9:4a40)
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
ld de, wd002
|
||||
call Function24a80
|
||||
call ItemSwitch_ConvertSpacingToDW
|
||||
call CopyBytes
|
||||
ret
|
||||
|
||||
Function24a4d: ; 24a4d (9:4a4d)
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
ld d, h
|
||||
ld e, l
|
||||
ld hl, wd002
|
||||
call Function24a80
|
||||
call ItemSwitch_ConvertSpacingToDW
|
||||
call CopyBytes
|
||||
ret
|
||||
|
||||
Function24a5c: ; 24a5c (9:4a5c)
|
||||
ItemSwitch_GetNthItem: ; 24a5c (9:4a5c)
|
||||
push af
|
||||
call Function24a80
|
||||
call ItemSwitch_ConvertSpacingToDW
|
||||
ld hl, wMenuData2_ItemsPointerAddr
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
|
|
@ -210,13 +210,13 @@ Function24a5c: ; 24a5c (9:4a5c)
|
|||
|
||||
Function24a6c: ; 24a6c (9:4a6c)
|
||||
push hl
|
||||
call Function24a80
|
||||
call ItemSwitch_ConvertSpacingToDW
|
||||
ld a, d
|
||||
sub e
|
||||
jr nc, .asm_24a76
|
||||
jr nc, .dont_negate
|
||||
dec a
|
||||
cpl
|
||||
.asm_24a76
|
||||
.dont_negate
|
||||
ld hl, 0
|
||||
call AddNTimes
|
||||
ld b, h
|
||||
|
|
@ -224,12 +224,13 @@ Function24a6c: ; 24a6c (9:4a6c)
|
|||
pop hl
|
||||
ret
|
||||
|
||||
Function24a80: ; 24a80 (9:4a80)
|
||||
ItemSwitch_ConvertSpacingToDW: ; 24a80 (9:4a80)
|
||||
; This function is absolutely idiotic.
|
||||
push hl
|
||||
ld a, [wcf94]
|
||||
ld a, [wMenuData2_ScrollingMenuSpacing]
|
||||
ld c, a
|
||||
ld b, 0
|
||||
ld hl, Unknown_24a91
|
||||
ld hl, .spacing_dws
|
||||
rept 2
|
||||
add hl, bc
|
||||
endr
|
||||
|
|
@ -241,23 +242,23 @@ endr
|
|||
|
||||
; 24a91 (9:4a91)
|
||||
|
||||
Unknown_24a91: ; 24a91
|
||||
.spacing_dws: ; 24a91
|
||||
dw 0, 1, 2
|
||||
; 24a97
|
||||
|
||||
Function24a97: ; 24a97 (9:4a97)
|
||||
push af
|
||||
call Function24a80
|
||||
call ItemSwitch_ConvertSpacingToDW
|
||||
ld a, c
|
||||
cp $2
|
||||
jr nz, .asm_24aa7
|
||||
cp 2
|
||||
jr nz, .not_2
|
||||
pop af
|
||||
call Function24a5c
|
||||
call ItemSwitch_GetNthItem
|
||||
inc hl
|
||||
ld a, [hl]
|
||||
ret
|
||||
|
||||
.asm_24aa7
|
||||
.not_2
|
||||
pop af
|
||||
ld a, $1
|
||||
ret
|
||||
|
|
|
|||
|
|
@ -450,11 +450,11 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae
|
|||
call GetSGBLayout
|
||||
call UpdateTimePals
|
||||
ld a, [rBGP]
|
||||
ld [wcfc7], a
|
||||
ld [wBGP], a
|
||||
ld a, [rOBP0]
|
||||
ld [wcfc8], a
|
||||
ld [wOBP0], a
|
||||
ld a, [rOBP1]
|
||||
ld [wcfc9], a
|
||||
ld [wOBP1], a
|
||||
pop af
|
||||
ld [wPermission], a
|
||||
pop af
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ endr
|
|||
big_step_right
|
||||
; 1bb1
|
||||
|
||||
InitMenu3:: ; 1bb1
|
||||
SetMenuAttributes:: ; 1bb1
|
||||
push hl
|
||||
push bc
|
||||
ld hl, w2DMenuCursorInitY
|
||||
|
|
|
|||
|
|
@ -247,11 +247,11 @@ UpdatePals:: ; 37f
|
|||
jp nz, UpdateCGBPals
|
||||
|
||||
; update gb pals
|
||||
ld a, [wcfc7]
|
||||
ld a, [wBGP]
|
||||
ld [rBGP], a
|
||||
ld a, [wcfc8]
|
||||
ld a, [wOBP0]
|
||||
ld [rOBP0], a
|
||||
ld a, [wcfc9]
|
||||
ld a, [wOBP1]
|
||||
ld [rOBP1], a
|
||||
|
||||
and a
|
||||
|
|
|
|||
|
|
@ -413,7 +413,7 @@ endr
|
|||
xor a
|
||||
ld [hBattleTurn], a
|
||||
ld [Buffer2], a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
predef PlayBattleAnim
|
||||
|
||||
ld a, [wWildMon]
|
||||
|
|
@ -2161,7 +2161,7 @@ endr
|
|||
|
||||
Softboiled_MilkDrinkFunction: ; f3df (3:73df)
|
||||
; Softboiled/Milk Drink in the field
|
||||
ld a, [wd0d8]
|
||||
ld a, [wPartyMenuCursor]
|
||||
dec a
|
||||
ld b, a
|
||||
call .SelectMilkDrinkRecipient ; select pokemon
|
||||
|
|
@ -2186,7 +2186,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df)
|
|||
.skip
|
||||
ld a, b
|
||||
inc a
|
||||
ld [wd0d8], a
|
||||
ld [wPartyMenuCursor], a
|
||||
ret
|
||||
|
||||
.SelectMilkDrinkRecipient: ; f419 (3:7419)
|
||||
|
|
@ -2197,7 +2197,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df)
|
|||
call ChoosePkmnToUseItemOn
|
||||
pop bc
|
||||
jr c, .set_carry
|
||||
ld a, [wd0d8]
|
||||
ld a, [wPartyMenuCursor]
|
||||
dec a
|
||||
ld c, a
|
||||
ld a, b
|
||||
|
|
@ -2958,7 +2958,7 @@ UseBallInTrainerBattle: ; f7a0
|
|||
xor a
|
||||
ld [wKickCounter], a
|
||||
ld [hBattleTurn], a
|
||||
ld [wcfca], a
|
||||
ld [wNumHits], a
|
||||
predef PlayBattleAnim
|
||||
ld hl, BlockedTheBallText
|
||||
call PrintText
|
||||
|
|
|
|||
|
|
@ -507,7 +507,7 @@ Function4ab1a: ; 4ab1a
|
|||
inc a
|
||||
ld b, a
|
||||
ld a, [wMenuCursorY]
|
||||
ld [wd0d8], a
|
||||
ld [wPartyMenuCursor], a
|
||||
cp b
|
||||
jr z, .asm_4ab7e
|
||||
ld a, [wMenuCursorY]
|
||||
|
|
@ -528,7 +528,7 @@ Function4ab1a: ; 4ab1a
|
|||
|
||||
.asm_4ab6d
|
||||
ld a, [wMenuCursorY]
|
||||
ld [wd0d8], a
|
||||
ld [wPartyMenuCursor], a
|
||||
.asm_4ab73
|
||||
ld de, SFX_READ_TEXT_2
|
||||
call PlaySFX
|
||||
|
|
|
|||
|
|
@ -1803,7 +1803,7 @@ Function100b12: ; 100b12
|
|||
ld de, LoadMenuDataHeader
|
||||
call FarCall_de
|
||||
ld a, BANK(BattleMenuDataHeader)
|
||||
ld [wcf94], a
|
||||
ld [wMenuData2_2DMenuItemStringsBank], a
|
||||
ld a, [wd0d2]
|
||||
ld [wMenuCursorBuffer], a
|
||||
call Function100e72
|
||||
|
|
@ -1844,7 +1844,7 @@ Function100b45: ; 100b45
|
|||
|
||||
Function100b7a: ; 100b7a
|
||||
ld hl, CopyMenuData2
|
||||
ld a, [wcf94]
|
||||
ld a, [wMenuData2_2DMenuItemStringsBank]
|
||||
rst FarCall
|
||||
callba Draw2DMenu
|
||||
callba MobileTextBorder
|
||||
|
|
@ -1858,7 +1858,7 @@ Function100b7a: ; 100b7a
|
|||
|
||||
MobileMoveSelectionScreen: ; 100b9f
|
||||
xor a
|
||||
ld [wd0e3], a
|
||||
ld [wMoveSwapBuffer], a
|
||||
callba CheckPlayerHasUsableMoves
|
||||
ret z
|
||||
call Function100dd8
|
||||
|
|
@ -1989,8 +1989,8 @@ Function100c74: ; 100c74
|
|||
; 100c98
|
||||
|
||||
Function100c98: ; 100c98
|
||||
ld de, Unknown_100cad
|
||||
call InitMenu3
|
||||
ld de, .attrs
|
||||
call SetMenuAttributes
|
||||
ld a, [wNumMoves]
|
||||
inc a
|
||||
ld [w2DMenuNumRows], a
|
||||
|
|
@ -2000,8 +2000,12 @@ Function100c98: ; 100c98
|
|||
ret
|
||||
; 100cad
|
||||
|
||||
Unknown_100cad: ; 100cad
|
||||
db $a, $1, $ff, $1, $a0, $, $20, $c3
|
||||
.attrs: ; 100cad
|
||||
db 10, 1
|
||||
db 255, 1
|
||||
db $a0, $00
|
||||
dn 2, 0
|
||||
db D_UP | D_DOWN | A_BUTTON | B_BUTTON
|
||||
|
||||
Function100cb5: ; 100cb5
|
||||
call Function100dd8
|
||||
|
|
@ -2009,7 +2013,7 @@ Function100cb5: ; 100cb5
|
|||
ld hl, w2DMenuFlags1
|
||||
set 7, [hl]
|
||||
res 6, [hl]
|
||||
.asm_100cc0
|
||||
.loop
|
||||
call Function100dd2
|
||||
callba MobileMenuJoypad
|
||||
push bc
|
||||
|
|
@ -2017,22 +2021,22 @@ Function100cb5: ; 100cb5
|
|||
callba Function10402d
|
||||
call Function100dfd
|
||||
pop bc
|
||||
jr c, .asm_100d17
|
||||
jr c, .done
|
||||
ld a, [wMenuJoypadFilter]
|
||||
and c
|
||||
jr z, .asm_100cc0
|
||||
jr z, .loop
|
||||
call PlaceHollowCursor
|
||||
ld a, [PartyCount]
|
||||
inc a
|
||||
ld b, a
|
||||
ld a, [wMenuCursorY]
|
||||
cp b
|
||||
jr z, .asm_100d17
|
||||
ld [wd0d8], a
|
||||
jr z, .done
|
||||
ld [wPartyMenuCursor], a
|
||||
ld a, [hJoyLast]
|
||||
ld b, a
|
||||
bit 1, b
|
||||
jr nz, .asm_100d17
|
||||
jr nz, .done
|
||||
ld a, [wMenuCursorY]
|
||||
dec a
|
||||
ld [CurPartyMon], a
|
||||
|
|
@ -2048,7 +2052,7 @@ Function100cb5: ; 100cb5
|
|||
and a
|
||||
ret
|
||||
|
||||
.asm_100d17
|
||||
.done
|
||||
ld de, SFX_READ_TEXT_2
|
||||
call PlaySFX
|
||||
call WaitSFX
|
||||
|
|
@ -2529,7 +2533,7 @@ Unknown_100fc0: ; 100fc0
|
|||
db -1
|
||||
|
||||
Unknown_100feb: ; 100feb
|
||||
dbwww $, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL
|
||||
dbwww $0, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL
|
||||
db -1
|
||||
|
||||
Unknown_100ff3: ; 100ff3
|
||||
|
|
@ -6311,7 +6315,7 @@ Function1029cf: ; 1029cf
|
|||
ld hl, wcd4b
|
||||
set 1, [hl]
|
||||
ld de, MenuData3_102a33
|
||||
call InitMenu3
|
||||
call SetMenuAttributes
|
||||
ld a, [wcd4a]
|
||||
inc a
|
||||
ld [wcd4a], a
|
||||
|
|
@ -6353,7 +6357,9 @@ String_102a26: ; 102a26
|
|||
MenuData3_102a33:
|
||||
db 8, 11
|
||||
db 2, 1
|
||||
db $80, $00, $20, $01
|
||||
db $80, $00
|
||||
dn 2, 0
|
||||
db A_BUTTON
|
||||
|
||||
Function102a3b: ; 102a3b
|
||||
ld a, [wcd30]
|
||||
|
|
@ -6487,7 +6493,7 @@ Function102b4e: ; 102b4e
|
|||
ld a, [wMenuCursorY]
|
||||
push af
|
||||
ld de, Unknown_102b73
|
||||
call InitMenu3
|
||||
call SetMenuAttributes
|
||||
pop af
|
||||
ld [wMenuCursorY], a
|
||||
ld a, [OTPartyCount]
|
||||
|
|
@ -6504,7 +6510,11 @@ Function102b68: ; 102b68 ; unreferenced
|
|||
; 102b73
|
||||
|
||||
Unknown_102b73:
|
||||
db $9, $6, $ff, $1, $a0, $, $10, $c1
|
||||
db 9, 6
|
||||
db 255, 1
|
||||
db $a0, $00
|
||||
dn 1, 0
|
||||
db D_UP | D_DOWN | A_BUTTON
|
||||
|
||||
Function102b7b: ; 102b7b
|
||||
xor a
|
||||
|
|
@ -6512,7 +6522,7 @@ Function102b7b: ; 102b7b
|
|||
ld a, [wMenuCursorY]
|
||||
push af
|
||||
ld de, Unknown_102b94
|
||||
call InitMenu3
|
||||
call SetMenuAttributes
|
||||
pop af
|
||||
ld [wMenuCursorY], a
|
||||
ld a, [PartyCount]
|
||||
|
|
@ -6521,7 +6531,11 @@ Function102b7b: ; 102b7b
|
|||
; 102b94
|
||||
|
||||
Unknown_102b94:
|
||||
db $1, $6, $ff, $1, $a0, $, $10, $c1
|
||||
db 1, 6
|
||||
db 255, 1
|
||||
db $a0, $00
|
||||
dn 1, 0
|
||||
db D_UP | D_DOWN | A_BUTTON
|
||||
|
||||
Function102b9c: ; 102b9c
|
||||
ld a, [wcd4d]
|
||||
|
|
@ -7250,20 +7264,20 @@ endr
|
|||
; 103112
|
||||
|
||||
Unknown_103112: ; 103112
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $1, $, $, $, $, $, $, $
|
||||
db $2, $1, $, $, $, $, $, $
|
||||
db $3, $2, $1, $, $, $, $, $
|
||||
db $4, $3, $2, $1, $, $, $, $
|
||||
db $4, $4, $3, $2, $1, $, $, $
|
||||
db $4, $4, $4, $3, $2, $1, $, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $1, $0, $0, $0, $0, $0, $0, $
|
||||
db $2, $1, $0, $0, $0, $0, $0, $
|
||||
db $3, $2, $1, $0, $0, $0, $0, $
|
||||
db $4, $3, $2, $1, $0, $0, $0, $
|
||||
db $4, $4, $3, $2, $1, $0, $0, $
|
||||
db $4, $4, $4, $3, $2, $1, $0, $
|
||||
db $4, $4, $4, $4, $3, $2, $1, $
|
||||
db $4, $4, $4, $4, $4, $3, $2, $1
|
||||
db $4, $4, $4, $4, $4, $4, $3, $2
|
||||
|
|
@ -7279,48 +7293,48 @@ Unknown_103112: ; 103112
|
|||
db $3, $4, $4, $4, $4, $4, $4, $4
|
||||
db $2, $3, $4, $4, $4, $4, $4, $4
|
||||
db $1, $2, $3, $4, $4, $4, $4, $4
|
||||
db $, $1, $2, $3, $4, $4, $4, $4
|
||||
db $, $, $1, $2, $3, $4, $4, $4
|
||||
db $, $, $, $1, $2, $3, $4, $4
|
||||
db $, $, $, $, $1, $2, $3, $4
|
||||
db $, $, $, $, $, $1, $2, $3
|
||||
db $, $, $, $, $, $, $1, $2
|
||||
db $, $, $, $, $, $, $, $1
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $, $, $, $, $, $, $, $
|
||||
db $0, $1, $2, $3, $4, $4, $4, $4
|
||||
db $0, $0, $1, $2, $3, $4, $4, $4
|
||||
db $0, $0, $0, $1, $2, $3, $4, $4
|
||||
db $0, $0, $0, $0, $1, $2, $3, $4
|
||||
db $0, $0, $0, $0, $0, $1, $2, $3
|
||||
db $0, $0, $0, $0, $0, $0, $1, $2
|
||||
db $0, $0, $0, $0, $0, $0, $0, $1
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
db $0, $0, $0, $0, $0, $0, $0, $
|
||||
; 10327a
|
||||
|
||||
Unknown_10327a: ; 10327a
|
||||
db $, $, $, $
|
||||
db $, $, $1, $
|
||||
db $, $, $2, $
|
||||
db $, $, $3, $
|
||||
db $, $, $1, $1
|
||||
db $, $, $, $
|
||||
db $, $, $1, $2
|
||||
db $, $, $2, $2
|
||||
db $, $, $3, $2
|
||||
db $, $, $1, $3
|
||||
db $0, $0, $0, $
|
||||
db $0, $0, $1, $
|
||||
db $0, $0, $2, $
|
||||
db $0, $0, $3, $
|
||||
db $0, $0, $1, $1
|
||||
db $0, $0, $0, $
|
||||
db $0, $0, $1, $2
|
||||
db $0, $0, $2, $2
|
||||
db $0, $0, $3, $2
|
||||
db $0, $0, $1, $3
|
||||
|
||||
GFX_1032a2:
|
||||
INCBIN "gfx/unknown/1032a2.2bpp"
|
||||
|
||||
Unknown_1032e2:
|
||||
db $, $, $ff, $1f
|
||||
db $0, $0, $ff, $1f
|
||||
db $f4, $1b, $8d, $42
|
||||
db $, $, $67, $45
|
||||
db $, $, $, $
|
||||
db $, $, $1f, $13
|
||||
db $0, $0, $67, $45
|
||||
db $0, $0, $0, $
|
||||
db $0, $0, $1f, $13
|
||||
db $99, $1, $ff, $10
|
||||
db $, $, $19, $
|
||||
db $, $, $, $
|
||||
db $0, $0, $19, $
|
||||
db $0, $0, $0, $
|
||||
; 103302
|
||||
|
||||
Function103302: ; 103302
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ Tileset01Anim: ; 0xfc0a3
|
|||
|
||||
TilesetAnimfc0d7: ; 0xfc0d7
|
||||
dw VTiles2 tile $03, WriteTileToBuffer
|
||||
dw wcf41, ScrollTileRightLeft
|
||||
dw wTileAnimBuffer, ScrollTileRightLeft
|
||||
dw VTiles2 tile $03, WriteTileFromBuffer
|
||||
dw NULL, WaitTileAnimation
|
||||
dw NULL, WaitTileAnimation
|
||||
|
|
@ -113,7 +113,7 @@ TilesetAnimfc0d7: ; 0xfc0d7
|
|||
|
||||
TilesetAnimfc103: ; 0xfc103
|
||||
dw VTiles2 tile $14, WriteTileToBuffer
|
||||
dw wcf41, ScrollTileRightLeft
|
||||
dw wTileAnimBuffer, ScrollTileRightLeft
|
||||
dw VTiles2 tile $14, WriteTileFromBuffer
|
||||
dw NULL, WaitTileAnimation
|
||||
dw NULL, WaitTileAnimation
|
||||
|
|
@ -153,32 +153,32 @@ Tileset15Anim: ; 0xfc15f
|
|||
|
||||
TilesetAnimfc17f: ; 0xfc17f
|
||||
dw VTiles2 tile $53, WriteTileToBuffer
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw VTiles2 tile $53, WriteTileFromBuffer
|
||||
dw VTiles2 tile $03, WriteTileToBuffer
|
||||
dw wcf41, ScrollTileRightLeft
|
||||
dw wTileAnimBuffer, ScrollTileRightLeft
|
||||
dw VTiles2 tile $03, WriteTileFromBuffer
|
||||
dw VTiles2 tile $53, WriteTileToBuffer
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw VTiles2 tile $53, WriteTileFromBuffer
|
||||
dw NULL, DoneTileAnimation
|
||||
; 0xfc1af
|
||||
|
||||
TilesetAnimfc1af: ; 0xfc1af
|
||||
dw VTiles2 tile $54, WriteTileToBuffer
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw VTiles2 tile $54, WriteTileFromBuffer
|
||||
dw NULL, WaitTileAnimation
|
||||
dw VTiles2 tile $03, WriteTileToBuffer
|
||||
dw wcf41, ScrollTileRightLeft
|
||||
dw wTileAnimBuffer, ScrollTileRightLeft
|
||||
dw VTiles2 tile $03, WriteTileFromBuffer
|
||||
dw NULL, WaitTileAnimation
|
||||
dw VTiles2 tile $54, WriteTileToBuffer
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw VTiles2 tile $54, WriteTileFromBuffer
|
||||
dw NULL, DoneTileAnimation
|
||||
; 0xfc1e7
|
||||
|
|
@ -187,7 +187,7 @@ Tileset24Anim: ; 0xfc1e7
|
|||
Tileset30Anim: ; 0xfc1e7
|
||||
dw VTiles2 tile $14, WriteTileToBuffer
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw wcf41, ScrollTileRightLeft
|
||||
dw wTileAnimBuffer, ScrollTileRightLeft
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw VTiles2 tile $14, WriteTileFromBuffer
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
|
|
@ -195,11 +195,11 @@ Tileset30Anim: ; 0xfc1e7
|
|||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw VTiles2 tile $40, WriteTileToBuffer
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw VTiles2 tile $40, WriteTileFromBuffer
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
|
|
@ -209,7 +209,7 @@ Tileset30Anim: ; 0xfc1e7
|
|||
Tileset29Anim: ; 0xfc233
|
||||
dw VTiles2 tile $35, WriteTileToBuffer
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw wcf41, ScrollTileRightLeft
|
||||
dw wTileAnimBuffer, ScrollTileRightLeft
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw VTiles2 tile $35, WriteTileFromBuffer
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
|
|
@ -217,11 +217,11 @@ Tileset29Anim: ; 0xfc233
|
|||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw VTiles2 tile $31, WriteTileToBuffer
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw wcf41, ScrollTileDown
|
||||
dw wTileAnimBuffer, ScrollTileDown
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
dw VTiles2 tile $31, WriteTileFromBuffer
|
||||
dw NULL, FlickeringCaveEntrancePalette
|
||||
|
|
@ -249,7 +249,7 @@ Tileset23Anim: ; 0xfc27f
|
|||
|
||||
TilesetAnimfc2bf: ; 0xfc2bf
|
||||
dw VTiles2 tile $4f, WriteTileToBuffer
|
||||
dw wcf41, ScrollTileRightLeft
|
||||
dw wTileAnimBuffer, ScrollTileRightLeft
|
||||
dw VTiles2 tile $4f, WriteTileFromBuffer
|
||||
dw NULL, WaitTileAnimation
|
||||
dw NULL, WaitTileAnimation
|
||||
|
|
@ -430,10 +430,9 @@ AnimateFountain: ; fc387
|
|||
add a
|
||||
add l
|
||||
ld l, a
|
||||
jr nc, .asm_fc399
|
||||
jr nc, .okay
|
||||
inc h
|
||||
|
||||
.asm_fc399
|
||||
.okay
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
|
|
@ -860,14 +859,14 @@ AnimateWhirlpoolTile: ; fc678
|
|||
|
||||
|
||||
WriteTileFromBuffer: ; fc696
|
||||
; Write tiledata at wcf41 to de.
|
||||
; wcf41 is loaded to sp for WriteTile.
|
||||
; Write tiledata at wTileAnimBuffer to de.
|
||||
; wTileAnimBuffer is loaded to sp for WriteTile.
|
||||
|
||||
ld hl, [sp+0]
|
||||
ld b, h
|
||||
ld c, l
|
||||
|
||||
ld hl, wcf41
|
||||
ld hl, wTileAnimBuffer
|
||||
ld sp, hl
|
||||
|
||||
ld h, d
|
||||
|
|
@ -877,7 +876,7 @@ WriteTileFromBuffer: ; fc696
|
|||
|
||||
|
||||
WriteTileToBuffer: ; fc6a2
|
||||
; Write tiledata de to wcf41.
|
||||
; Write tiledata de to wTileAnimBuffer.
|
||||
; de is loaded to sp for WriteTile.
|
||||
|
||||
ld hl, [sp+0]
|
||||
|
|
@ -888,7 +887,7 @@ WriteTileToBuffer: ; fc6a2
|
|||
ld l, e
|
||||
ld sp, hl
|
||||
|
||||
ld hl, wcf41
|
||||
ld hl, wTileAnimBuffer
|
||||
|
||||
; fallthrough
|
||||
|
||||
|
|
|
|||
93
wram.asm
93
wram.asm
|
|
@ -1498,11 +1498,13 @@ AttrMap:: ; cdd9
|
|||
; bit 0-2: palette id
|
||||
ds SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
AttrMapEnd::
|
||||
|
||||
wcf41:: ds 1
|
||||
ds 1
|
||||
wcf42:: ds 2
|
||||
wcf44:: ds 1
|
||||
wcf45:: ds 12
|
||||
wcf45::
|
||||
ds AttrMapEnd - @
|
||||
wTileAnimBuffer::
|
||||
ds $10
|
||||
; addresses dealing with serial comms
|
||||
wOtherPlayerLinkMode:: ds 1
|
||||
wOtherPlayerLinkAction:: ds 4
|
||||
|
|
@ -1594,46 +1596,47 @@ wMenuData2Flags:: ds 1 ; cf91
|
|||
; bit 0: Disable B button
|
||||
|
||||
wMenuData2_ScrollingMenuHeight::
|
||||
wMenuData2Items:: ds 1
|
||||
wMenuData2Items::
|
||||
ds 1 ; cf92
|
||||
wMenuData2IndicesPointer::
|
||||
wMenuData2Spacing::
|
||||
wMenuData2_ScrollingMenuWidth::
|
||||
wcf93:: ds 1
|
||||
ds 1 ; cf93
|
||||
wMenuData2_2DMenuItemStringsBank::
|
||||
wMenuData2_ScrollingMenuSpacing::
|
||||
wcf94:: ds 1
|
||||
ds 1 ; cf94
|
||||
wMenuData2_2DMenuItemStringsAddr::
|
||||
wMenuData2DisplayFunctionPointer::
|
||||
wMenuData2_ItemsPointerBank::
|
||||
wcf95:: ds 1 ; bank
|
||||
ds 1 ; cf95
|
||||
wMenuData2_ItemsPointerAddr::
|
||||
wcf96:: ds 1 ; addr lo
|
||||
ds 1 ; cf96
|
||||
wMenuData2PointerTableAddr::
|
||||
wMenuData2_2DMenuFunctionBank::
|
||||
wcf97:: ds 1 ; addr hi
|
||||
ds 1 ; cf97
|
||||
wMenuData2_2DMenuFunctionAddr::
|
||||
wMenuData2_ScrollingMenuFunction1::
|
||||
wcf98:: ds 3
|
||||
ds 3 ; cf98
|
||||
wMenuData2_ScrollingMenuFunction2::
|
||||
wcf9b:: ds 3
|
||||
ds 3 ; cf9b
|
||||
wMenuData2_ScrollingMenuFunction3::
|
||||
wcf9e:: ds 3
|
||||
ds 3 ; cf9e
|
||||
wMenuData2End::
|
||||
|
||||
wMenuData3::
|
||||
w2DMenuCursorInitY:: ds 1
|
||||
w2DMenuCursorInitX:: ds 1
|
||||
w2DMenuNumRows:: ds 1
|
||||
w2DMenuNumCols:: ds 1
|
||||
w2DMenuFlags1:: ds 1
|
||||
w2DMenuFlags2:: ds 1
|
||||
w2DMenuCursorOffsets:: ds 1
|
||||
wMenuJoypadFilter:: ds 1
|
||||
w2DMenuCursorInitY:: ds 1 ; cfa1
|
||||
w2DMenuCursorInitX:: ds 1 ; cfa2
|
||||
w2DMenuNumRows:: ds 1 ; cfa3
|
||||
w2DMenuNumCols:: ds 1 ; cfa4
|
||||
w2DMenuFlags1:: ds 1 ; cfa5
|
||||
w2DMenuFlags2:: ds 1 ; cfa6
|
||||
w2DMenuCursorOffsets:: ds 1 ; cfa7
|
||||
wMenuJoypadFilter:: ds 1 ; cfa8
|
||||
wMenuData3End::
|
||||
|
||||
wMenuCursorY:: ds 1
|
||||
wMenuCursorX:: ds 1
|
||||
wCursorOffCharacter:: ds 1
|
||||
wMenuCursorY:: ds 1 ; cfa9
|
||||
wMenuCursorX:: ds 1 ; cfaa
|
||||
wCursorOffCharacter:: ds 1 ; cfab
|
||||
wCursorCurrentTile:: ds 2 ; cfac
|
||||
ds 3
|
||||
|
||||
|
|
@ -1675,18 +1678,17 @@ FXAnimID::
|
|||
FXAnimIDLo:: ; cfc2
|
||||
ds 1
|
||||
FXAnimIDHi:: ; cfc3
|
||||
ds 1
|
||||
|
||||
wcfc4:: ds 1
|
||||
wcfc5:: ds 1
|
||||
ds 3
|
||||
|
||||
TileAnimationTimer:: ; cfc6
|
||||
ds 1
|
||||
|
||||
wcfc7:: ds 1
|
||||
wcfc8:: ds 1
|
||||
wcfc9:: ds 1
|
||||
wcfca:: ds 2
|
||||
; palette backups?
|
||||
wBGP:: ds 1
|
||||
wOBP0:: ds 1
|
||||
wOBP1:: ds 1
|
||||
|
||||
wNumHits:: ds 2
|
||||
|
||||
Options:: ; cfcc
|
||||
; bit 0-2: number of frames to delay when printing text
|
||||
|
|
@ -3272,11 +3274,34 @@ LYOverridesBackupEnd::
|
|||
|
||||
SECTION "Battle Animations", WRAMX [$d300], BANK [5]
|
||||
|
||||
w5_d300:: ds 10
|
||||
wBattleAnimTileDict:: ds 10
|
||||
|
||||
battle_anim_struct: MACRO
|
||||
; Placeholder until we can figure out what it all means
|
||||
ds $18
|
||||
\1Index:: ds 1
|
||||
\1Anim01:: ds 1
|
||||
\1Anim02:: ds 1
|
||||
\1Anim03:: ds 1
|
||||
\1Anim04:: ds 1
|
||||
\1Anim05:: ds 1
|
||||
\1Anim06:: ds 1
|
||||
\1Anim07:: ds 1
|
||||
\1Anim08:: ds 1
|
||||
\1Anim09:: ds 1
|
||||
\1Anim0a:: ds 1
|
||||
\1Anim0b:: ds 1
|
||||
\1Anim0c:: ds 1
|
||||
\1Anim0d:: ds 1
|
||||
\1Anim0e:: ds 1
|
||||
\1Anim0f:: ds 1
|
||||
\1Anim10:: ds 1
|
||||
\1Anim11:: ds 1
|
||||
\1Anim12:: ds 1
|
||||
\1Anim13:: ds 1
|
||||
\1Anim14:: ds 1
|
||||
\1Anim15:: ds 1
|
||||
\1Anim16:: ds 1
|
||||
\1Anim17:: ds 1
|
||||
endm
|
||||
|
||||
ActiveAnimObjects:: ; d30a
|
||||
|
|
@ -3295,7 +3320,7 @@ ActiveAnimObjectsEnd:: ; d3aa
|
|||
ActiveBGEffects:: ; d3fa
|
||||
ds 4 * 5
|
||||
|
||||
w5_d40e:: ds 1
|
||||
wNumActiveBattleAnims:: ds 1
|
||||
|
||||
BattleAnimFlags:: ; d40f
|
||||
ds 1
|
||||
|
|
|
|||
Loading…
Reference in New Issue