pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Battle Anim Object struct constants

Browse Source
This commit is contained in:
PikalaxALT 2015-12-23 14:00:29 -05:00
parent ddc05ec8dd
commit 3893feb835
19 changed files with 1323 additions and 1254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
battle/anim_commands.asm
View File

@ -77,7 +77,7 @@ BattleAnimRunScript: ; cc11c
call BattleAnimRestoreHuds call BattleAnimRestoreHuds
.disabled .disabled
ld a, [wcfca] ld a, [wNumHits]
and a and a
jr z, .done jr z, .done
@ -92,7 +92,7 @@ BattleAnimRunScript: ; cc11c
.hi_byte .hi_byte
call WaitSFX call WaitSFX
call Functioncc881 call PlayHitSound
call RunBattleAnimScript call RunBattleAnimScript
.done .done
@ -191,13 +191,13 @@ BattleAnimRequestPals: ; cc1e2
ld a, [rBGP] ld a, [rBGP]
ld b, a ld b, a
ld a, [wcfc7] ld a, [wBGP]
cp b cp b
call nz, Functioncc91a call nz, Functioncc91a
ld a, [rOBP0] ld a, [rOBP0]
ld b, a ld b, a
ld a, [wcfc8] ld a, [wOBP0]
cp b cp b
call nz, Functioncc94b call nz, Functioncc94b
ret ret
@ -625,6 +625,7 @@ endr
ret ret
BattleAnimCmd_Obj: ; cc41f (33:441f) BattleAnimCmd_Obj: ; cc41f (33:441f)
; index, ???, ???, ???
call GetBattleAnimByte call GetBattleAnimByte
ld [BattleAnimTemps], a ld [BattleAnimTemps], a
call GetBattleAnimByte call GetBattleAnimByte
@ -650,17 +651,17 @@ BattleAnimCmd_BGEffect: ; cc43b (33:443b)
BattleAnimCmd_BGP: ; cc457 (33:4457) BattleAnimCmd_BGP: ; cc457 (33:4457)
call GetBattleAnimByte call GetBattleAnimByte
ld [wcfc7], a ld [wBGP], a
ret ret
BattleAnimCmd_OBP0: ; cc45e (33:445e) BattleAnimCmd_OBP0: ; cc45e (33:445e)
call GetBattleAnimByte call GetBattleAnimByte
ld [wcfc8], a ld [wOBP0], a
ret ret
BattleAnimCmd_OBP1: ; cc465 (33:4465) BattleAnimCmd_OBP1: ; cc465 (33:4465)
call GetBattleAnimByte call GetBattleAnimByte
ld [wcfc9], a ld [wOBP1], a
ret ret
BattleAnimCmd_ResetObp0: ; cc46c (33:446c) BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
@ -670,7 +671,7 @@ BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
jr z, .not_sgb jr z, .not_sgb
ld a, $f0 ld a, $f0
.not_sgb .not_sgb
ld [wcfc8], a ld [wOBP0], a
ret ret
BattleAnimCmd_ClearObjs: ; cc479 (33:4479) BattleAnimCmd_ClearObjs: ; cc479 (33:4479)
@ -691,10 +692,10 @@ BattleAnimCmd_5GFX: ; cc485 (33:4485)
ld a, [BattleAnimByte] ld a, [BattleAnimByte]
and $f and $f
ld c, a ld c, a
ld hl, w5_d300 ld hl, wBattleAnimTileDict
xor a xor a
ld [BattleAnimTemps], a ld [BattleAnimTemps], a
.asm_cc492 .loop
ld a, [BattleAnimTemps] ld a, [BattleAnimTemps]
cp $4f cp $4f
ret nc ret nc
@ -719,7 +720,7 @@ endr
pop hl pop hl
pop bc pop bc
dec c dec c
jr nz, .asm_cc492 jr nz, .loop
ret ret
BattleAnimCmd_IncObj: ; cc4c0 (33:44c0) BattleAnimCmd_IncObj: ; cc4c0 (33:44c0)
@ -797,7 +798,7 @@ BattleAnimCmd_SetObj: ; cc506 (33:4506)
BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c) BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
ld hl, w5_d300 ld hl, wBattleAnimTileDict
.asm_cc52f .asm_cc52f
ld a, [hl] ld a, [hl]
and a and a
@ -853,7 +854,7 @@ Functioncc561: ; cc561 (33:4561)
BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e) BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
ld hl, w5_d300 ld hl, wBattleAnimTileDict
.asm_cc581 .asm_cc581
ld a, [hl] ld a, [hl]
and a and a
@ -1249,7 +1250,7 @@ BattleAnimCmd_Cry: ; cc807 (33:4807)
and 3 and 3
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, Datacc871 ld hl, .CryData
rept 4 rept 4
add hl, de add hl, de
endr endr
@ -1266,14 +1267,14 @@ endr
ld a, $f0 ld a, $f0
ld [CryTracks], a ; CryTracks ld [CryTracks], a ; CryTracks
ld a, [BattleMonSpecies] ; BattleMonSpecies ld a, [BattleMonSpecies] ; BattleMonSpecies
jr .asm_cc834 jr .done_cry_tracks
.enemy .enemy
ld a, $0f ld a, $0f
ld [CryTracks], a ; CryTracks ld [CryTracks], a ; CryTracks
ld a, [EnemyMonSpecies] ; EnemyMon ld a, [EnemyMonSpecies] ; EnemyMon
.asm_cc834 .done_cry_tracks
push hl push hl
call LoadCryHeader call LoadCryHeader
pop hl pop hl
@ -1320,17 +1321,17 @@ endr
ret ret
; cc871 (33:4871) ; cc871 (33:4871)
Datacc871: ; cc871 .CryData: ; cc871
; +pitch, +length ; +pitch, +length
dw 0, $c0 dw $0000, $00c0
dw 0, $40 dw $0000, $0040
dw 0, $00 dw $0000, $0000
dw 0, $00 dw $0000, $0000
; cc881 ; cc881
Functioncc881: ; cc881 PlayHitSound: ; cc881
ld a, [wcfca] ld a, [wNumHits]
cp $1 cp $1
jr z, .okay jr z, .okay
cp $4 cp $4
@ -1366,17 +1367,17 @@ BattleAnimAssignPals: ; cc8a4
ld a, %11110000 ld a, %11110000
.sgb .sgb
ld [wcfc8], a ld [wOBP0], a
ld a, %11100100 ld a, %11100100
ld [wcfc7], a ld [wBGP], a
ld [wcfc9], a ld [wOBP1], a
ret ret
.cgb .cgb
ld a, %11100100 ld a, %11100100
ld [wcfc7], a ld [wBGP], a
ld [wcfc8], a ld [wOBP0], a
ld [wcfc9], a ld [wOBP1], a
call DmgToCgbBGPals call DmgToCgbBGPals
lb de, %11100100, %11100100 lb de, %11100100, %11100100
call DmgToCgbObjPals call DmgToCgbObjPals
@ -1412,9 +1413,9 @@ endr
Functioncc8f6: ; cc8f6 Functioncc8f6: ; cc8f6
call WaitTop call WaitTop
ld a, %11100100 ld a, %11100100
ld [wcfc7], a ld [wBGP], a
ld [wcfc8], a ld [wOBP0], a
ld [wcfc9], a ld [wOBP1], a
call DmgToCgbBGPals call DmgToCgbBGPals
lb de, %11100100, %11100100 lb de, %11100100, %11100100
call DmgToCgbObjPals call DmgToCgbObjPals

1922
battle/anim_objects.asm
View File

File diff suppressed because it is too large Load Diff

32
battle/bg_effects.asm
View File

@ -218,14 +218,14 @@ Functionc80fb: ; c80fb (32:40fb)
ld h, 0 ld h, 0
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld [wcfc7], a ld [wBGP], a
ret ret
BattleBGEffect_WhiteHues: ; c812d (32:412d) BattleBGEffect_WhiteHues: ; c812d (32:412d)
ld de, Unknown_c813d ld de, Unknown_c813d
call Functionc8d57 call Functionc8d57
jr c, .asm_c8139 jr c, .asm_c8139
ld [wcfc7], a ld [wBGP], a
ret ret
.asm_c8139 .asm_c8139
@ -242,7 +242,7 @@ BattleBGEffect_BlackHues: ; c8141 (32:4141)
ld de, Unknown_c8151 ld de, Unknown_c8151
call Functionc8d57 call Functionc8d57
jr c, .asm_c814d jr c, .asm_c814d
ld [wcfc7], a ld [wBGP], a
ret ret
.asm_c814d .asm_c814d
@ -259,8 +259,8 @@ BattleBGEffect_AlternateHues: ; c8155 (32:4155)
ld de, Unknown_c8168 ld de, Unknown_c8168
call Functionc8d57 call Functionc8d57
jr c, .asm_c8164 jr c, .asm_c8164
ld [wcfc7], a ld [wBGP], a
ld [wcfc9], a ld [wOBP1], a
ret ret
.asm_c8164 .asm_c8164
@ -282,7 +282,7 @@ BattleBGEffect_06: ; c8171 (32:4171)
ld de, Unknown_c8188 ld de, Unknown_c8188
.asm_c817e .asm_c817e
call Functionc8d57 call Functionc8d57
ld [wcfc8], a ld [wOBP0], a
ret ret
; c8185 (32:4185) ; c8185 (32:4185)
@ -304,7 +304,7 @@ BattleBGEffect_07: ; c818b (32:418b)
ld de, Unknown_c81a2 ld de, Unknown_c81a2
.asm_c8198 .asm_c8198
call Functionc8d57 call Functionc8d57
ld [wcfc8], a ld [wOBP0], a
ret ret
; c819f (32:419f) ; c819f (32:419f)
@ -320,7 +320,7 @@ Unknown_c81a2:
BattleBGEffect_08: ; c81a5 (32:41a5) BattleBGEffect_08: ; c81a5 (32:41a5)
ld de, Unknown_c81af ld de, Unknown_c81af
call Functionc8d57 call Functionc8d57
ld [wcfc7], a ld [wBGP], a
ret ret
; c81af (32:41af) ; c81af (32:41af)
@ -412,7 +412,7 @@ BattleBGEffect_FeetFollow: ; c8214 (32:4214)
Functionc8223: ; c8223 (32:4223) Functionc8223: ; c8223 (32:4223)
call Functionc9042 call Functionc9042
jr z, .asm_c8230 jr z, .asm_c8230
ld hl, w5_d40e ld hl, wNumActiveBattleAnims
inc [hl] inc [hl]
call EndBattleBGEffect call EndBattleBGEffect
ret ret
@ -478,7 +478,7 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281)
Functionc8290: ; c8290 (32:4290) Functionc8290: ; c8290 (32:4290)
call Functionc9042 call Functionc9042
jr z, .asm_c829d jr z, .asm_c829d
ld hl, w5_d40e ld hl, wNumActiveBattleAnims
inc [hl] inc [hl]
call EndBattleBGEffect call EndBattleBGEffect
ret ret
@ -2002,7 +2002,7 @@ Functionc8b22: ; c8b22 (32:4b22)
ld hl, Unknown_c8bd8 ld hl, Unknown_c8bd8
add hl, de add hl, de
ld a, [hli] ld a, [hli]
ld [wcfc9], a ld [wOBP1], a
ld d, a ld d, a
ld e, [hl] ld e, [hl]
ld bc, $2f30 ld bc, $2f30
@ -2013,7 +2013,7 @@ Functionc8b22: ; c8b22 (32:4b22)
ld d, [hl] ld d, [hl]
inc hl inc hl
ld a, [hl] ld a, [hl]
ld [wcfc9], a ld [wOBP1], a
ld e, a ld e, a
ld bc, $3728 ld bc, $3728
.asm_c8b5b .asm_c8b5b
@ -2024,8 +2024,8 @@ Functionc8b22: ; c8b22 (32:4b22)
Functionc8b60: ; c8b60 (32:4b60) Functionc8b60: ; c8b60 (32:4b60)
call Functionc8f19 call Functionc8f19
ld a, $e4 ld a, $e4
ld [wcfc7], a ld [wBGP], a
ld [wcfc9], a ld [wOBP1], a
ret ret
Functionc8b6c: ; c8b6c (32:4b6c) Functionc8b6c: ; c8b6c (32:4b6c)
@ -2733,8 +2733,8 @@ Functionc8f19: ; c8f19 (32:4f19)
ld [hLCDStatCustom], a ld [hLCDStatCustom], a
ld a, $e4 ld a, $e4
ld [rBGP], a ld [rBGP], a
ld [wcfc7], a ld [wBGP], a
ld [wcfc9], a ld [wOBP1], a
ld [hLCDStatCustom + 1], a ld [hLCDStatCustom + 1], a
ld [hLCDStatCustom + 2], a ld [hLCDStatCustom + 2], a
call Functionc8eca call Functionc8eca

26
battle/core.asm
View File

@ -421,7 +421,7 @@ HandleBerserkGene: ; 3c27c
bit SUBSTATUS_CONFUSED, a bit SUBSTATUS_CONFUSED, a
ret nz ret nz
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_CONFUSED ld de, ANIM_CONFUSED
call Call_PlayBattleAnim_OnlyIfVisible call Call_PlayBattleAnim_OnlyIfVisible
call SwitchTurnCore call SwitchTurnCore
@ -1098,7 +1098,7 @@ ResidualDamage: ; 3c716
pop de pop de
xor a xor a
ld [wcfca], a ld [wNumHits], a
call Call_PlayBattleAnim_OnlyIfVisible call Call_PlayBattleAnim_OnlyIfVisible
call GetEighthMaxHP call GetEighthMaxHP
ld de, PlayerToxicCount ld de, PlayerToxicCount
@ -1138,7 +1138,7 @@ ResidualDamage: ; 3c716
call SwitchTurnCore call SwitchTurnCore
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_SAP ld de, ANIM_SAP
ld a, BATTLE_VARS_SUBSTATUS3_OPP ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar call GetBattleVar
@ -1163,7 +1163,7 @@ ResidualDamage: ; 3c716
bit SUBSTATUS_NIGHTMARE, [hl] bit SUBSTATUS_NIGHTMARE, [hl]
jr z, .not_nightmare jr z, .not_nightmare
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_IN_NIGHTMARE ld de, ANIM_IN_NIGHTMARE
call Call_PlayBattleAnim_OnlyIfVisible call Call_PlayBattleAnim_OnlyIfVisible
call GetQuarterMaxHP call GetQuarterMaxHP
@ -1181,7 +1181,7 @@ ResidualDamage: ; 3c716
jr z, .not_cursed jr z, .not_cursed
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_IN_NIGHTMARE ld de, ANIM_IN_NIGHTMARE
call Call_PlayBattleAnim_OnlyIfVisible call Call_PlayBattleAnim_OnlyIfVisible
call GetQuarterMaxHP call GetQuarterMaxHP
@ -1325,7 +1325,7 @@ HandleWrap: ; 3c874
call SwitchTurnCore call SwitchTurnCore
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
predef PlayBattleAnim predef PlayBattleAnim
call SwitchTurnCore call SwitchTurnCore
@ -1827,7 +1827,7 @@ HandleWeather: ; 3cb9e
call SwitchTurnCore call SwitchTurnCore
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_IN_SANDSTORM ld de, ANIM_IN_SANDSTORM
call Call_PlayBattleAnim call Call_PlayBattleAnim
call SwitchTurnCore call SwitchTurnCore
@ -3761,7 +3761,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
call GetMonFrontpic call GetMonFrontpic
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [wKickCounter], a ld [wKickCounter], a
call SetEnemyTurn call SetEnemyTurn
ld de, ANIM_SEND_OUT_MON ld de, ANIM_SEND_OUT_MON
@ -4267,7 +4267,7 @@ SendOutPlayerMon: ; 3db5f
ld [wEnemyWrapCount], a ld [wEnemyWrapCount], a
call SetPlayerTurn call SetPlayerTurn
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [wKickCounter], a ld [wKickCounter], a
ld de, ANIM_SEND_OUT_MON ld de, ANIM_SEND_OUT_MON
call Call_PlayBattleAnim call Call_PlayBattleAnim
@ -4460,7 +4460,7 @@ Function3dce6: ; 3dce6
push af push af
xor a xor a
ld [hBattleTurn], a ld [hBattleTurn], a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_RETURN_MON ld de, ANIM_RETURN_MON
call Call_PlayBattleAnim call Call_PlayBattleAnim
pop af pop af
@ -4593,7 +4593,7 @@ ItemRecoveryAnim: ; 3ddc8
ld [FXAnimIDLo], a ld [FXAnimIDLo], a
call SwitchTurnCore call SwitchTurnCore
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
predef PlayBattleAnim predef PlayBattleAnim
call SwitchTurnCore call SwitchTurnCore
@ -8761,7 +8761,7 @@ CleanUpBattleRAM: ; 3f6d0
ld [wFailedToFlee], a ld [wFailedToFlee], a
ld [wNumFleeAttempts], a ld [wNumFleeAttempts], a
ld [wForcedSwitch], a ld [wForcedSwitch], a
ld [wd0d8], a ld [wPartyMenuCursor], a
ld [wKeyItemsPocketCursor], a ld [wKeyItemsPocketCursor], a
ld [wItemsPocketCursor], a ld [wItemsPocketCursor], a
ld [wd0d2], a ld [wd0d2], a
@ -9591,7 +9591,7 @@ BattleStartMessage: ; 3fc8b
jr nc, .not_shiny jr nc, .not_shiny
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld a, 1 ld a, 1
ld [hBattleTurn], a ld [hBattleTurn], a
ld a, 1 ld a, 1

56
battle/effect_commands.asm
View File

@ -172,7 +172,7 @@ CheckPlayerTurn:
jr z, .woke_up jr z, .woke_up
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_SLP ld de, ANIM_SLP
call FarPlayBattleAnimation call FarPlayBattleAnimation
jr .fast_asleep jr .fast_asleep
@ -276,7 +276,7 @@ CheckPlayerTurn:
ld hl, IsConfusedText ld hl, IsConfusedText
call StdBattleTextBox call StdBattleTextBox
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_CONFUSED ld de, ANIM_CONFUSED
call FarPlayBattleAnimation call FarPlayBattleAnimation
@ -305,7 +305,7 @@ CheckPlayerTurn:
ld hl, InLoveWithText ld hl, InLoveWithText
call StdBattleTextBox call StdBattleTextBox
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_IN_LOVE ld de, ANIM_IN_LOVE
call FarPlayBattleAnimation call FarPlayBattleAnimation
@ -420,7 +420,7 @@ CheckEnemyTurn: ; 3421f
ld hl, FastAsleepText ld hl, FastAsleepText
call StdBattleTextBox call StdBattleTextBox
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_SLP ld de, ANIM_SLP
call FarPlayBattleAnimation call FarPlayBattleAnimation
jr .fast_asleep jr .fast_asleep
@ -521,7 +521,7 @@ CheckEnemyTurn: ; 3421f
call StdBattleTextBox call StdBattleTextBox
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_CONFUSED ld de, ANIM_CONFUSED
call FarPlayBattleAnimation call FarPlayBattleAnimation
@ -542,7 +542,7 @@ CheckEnemyTurn: ; 3421f
call BattleCommand_DamageCalc call BattleCommand_DamageCalc
call BattleCommand_LowerSub call BattleCommand_LowerSub
xor a xor a
ld [wcfca], a ld [wNumHits], a
; Flicker the monster pic unless flying or underground. ; Flicker the monster pic unless flying or underground.
ld de, ANIM_HIT_CONFUSION ld de, ANIM_HIT_CONFUSION
@ -567,7 +567,7 @@ CheckEnemyTurn: ; 3421f
ld hl, InLoveWithText ld hl, InLoveWithText
call StdBattleTextBox call StdBattleTextBox
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld de, ANIM_IN_LOVE ld de, ANIM_IN_LOVE
call FarPlayBattleAnimation call FarPlayBattleAnimation
@ -656,7 +656,7 @@ HitConfusion: ; 343a5
call BattleCommand_LowerSub call BattleCommand_LowerSub
xor a xor a
ld [wcfca], a ld [wNumHits], a
; Flicker the monster pic unless flying or underground. ; Flicker the monster pic unless flying or underground.
ld de, ANIM_HIT_CONFUSION ld de, ANIM_HIT_CONFUSION
@ -2071,7 +2071,7 @@ BattleCommand_LowerSub: ; 34eee
jr c, .mimic_anims jr c, .mimic_anims
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
inc a inc a
ld [wKickCounter], a ld [wKickCounter], a
@ -2125,7 +2125,7 @@ BattleCommand_HitTargetNoSub: ; 34f60
ld a, BATTLEANIM_PLAYER_DAMAGE ld a, BATTLEANIM_PLAYER_DAMAGE
.got_rollout_count .got_rollout_count
ld [wcfca], a ld [wNumHits], a
ld a, BATTLE_VARS_MOVE_EFFECT ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar call GetBattleVar
cp EFFECT_MULTI_HIT cp EFFECT_MULTI_HIT
@ -2177,7 +2177,7 @@ BattleCommand_HitTargetNoSub: ; 34f60
pop af pop af
jp z, PlayFXAnimID jp z, PlayFXAnimID
xor a xor a
ld [wcfca], a ld [wNumHits], a
jp PlayFXAnimID jp PlayFXAnimID
; 34fd1 ; 34fd1
@ -2208,7 +2208,7 @@ BattleCommand_StatDownAnim: ; 34fdb
BattleCommand_StatUpDownAnim: ; 34feb BattleCommand_StatUpDownAnim: ; 34feb
ld [wcfca], a ld [wNumHits], a
xor a xor a
ld [wKickCounter], a ld [wKickCounter], a
ld a, BATTLE_VARS_MOVE_ANIM ld a, BATTLE_VARS_MOVE_ANIM
@ -2241,7 +2241,7 @@ BattleCommand_RaiseSub: ; 35004
jp c, BattleCommand_RaiseSubNoAnim jp c, BattleCommand_RaiseSubNoAnim
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
ld a, $2 ld a, $2
ld [wKickCounter], a ld [wKickCounter], a
@ -2599,7 +2599,7 @@ BattleCommand_CheckDestinyBond: ; 351c0
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
inc a inc a
ld [wKickCounter], a ld [wKickCounter], a
@ -5254,7 +5254,7 @@ BattleCommand_BurnTarget: ; 3608c
; burntarget ; burntarget
xor a xor a
ld [wcfca], a ld [wNumHits], a
call CheckSubstituteOpp call CheckSubstituteOpp
ret nz ret nz
ld a, BATTLE_VARS_STATUS_OPP ld a, BATTLE_VARS_STATUS_OPP
@ -5324,7 +5324,7 @@ BattleCommand_FreezeTarget: ; 36102
; freezetarget ; freezetarget
xor a xor a
ld [wcfca], a ld [wNumHits], a
call CheckSubstituteOpp call CheckSubstituteOpp
ret nz ret nz
ld a, BATTLE_VARS_STATUS_OPP ld a, BATTLE_VARS_STATUS_OPP
@ -5379,7 +5379,7 @@ BattleCommand_ParalyzeTarget: ; 36165
; paralyzetarget ; paralyzetarget
xor a xor a
ld [wcfca], a ld [wNumHits], a
call CheckSubstituteOpp call CheckSubstituteOpp
ret nz ret nz
ld a, BATTLE_VARS_STATUS_OPP ld a, BATTLE_VARS_STATUS_OPP
@ -6549,7 +6549,7 @@ BattleCommand_Teleport: ; 36778
.run_away .run_away
call UpdateBattleMonInParty call UpdateBattleMonInParty
xor a xor a
ld [wcfca], a ld [wNumHits], a
inc a inc a
ld [wForcedSwitch], a ld [wForcedSwitch], a
ld [wKickCounter], a ld [wKickCounter], a
@ -6617,7 +6617,7 @@ BattleCommand_ForceSwitch: ; 3680f
.wild_force_flee .wild_force_flee
call UpdateBattleMonInParty call UpdateBattleMonInParty
xor a xor a
ld [wcfca], a ld [wNumHits], a
inc a inc a
ld [wForcedSwitch], a ld [wForcedSwitch], a
call SetBattleDraw call SetBattleDraw
@ -6710,7 +6710,7 @@ BattleCommand_ForceSwitch: ; 3680f
.wild_succeed_playeristarget .wild_succeed_playeristarget
call UpdateBattleMonInParty call UpdateBattleMonInParty
xor a xor a
ld [wcfca], a ld [wNumHits], a
inc a inc a
ld [wForcedSwitch], a ld [wForcedSwitch], a
call SetBattleDraw call SetBattleDraw
@ -7141,7 +7141,7 @@ BattleCommand_Charge: ; 36b4d
call BattleCommand_LowerSub call BattleCommand_LowerSub
xor a xor a
ld [wcfca], a ld [wNumHits], a
inc a inc a
ld [wKickCounter], a ld [wKickCounter], a
call LoadMoveAnim call LoadMoveAnim
@ -7713,7 +7713,7 @@ endr
jr c, .mobile jr c, .mobile
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
ld [wKickCounter], a ld [wKickCounter], a
ld a, SUBSTITUTE ld a, SUBSTITUTE
@ -8234,7 +8234,7 @@ BattleCommand_Transform: ; 371cd
call CheckHiddenOpponent call CheckHiddenOpponent
jp nz, Function372d2 jp nz, Function372d2
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
ld a, $1 ld a, $1
ld [wKickCounter], a ld [wKickCounter], a
@ -8352,7 +8352,7 @@ endr
call BattleCommand_RaiseSubNoAnim call BattleCommand_RaiseSubNoAnim
.after_anim .after_anim
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
ld a, $2 ld a, $2
ld [wKickCounter], a ld [wKickCounter], a
@ -8546,7 +8546,7 @@ CheckSubstituteOpp: ; 37378
BattleCommand_SelfDestruct: ; 37380 BattleCommand_SelfDestruct: ; 37380
callba MobileFn_10610d callba MobileFn_10610d
ld a, BATTLEANIM_PLAYER_DAMAGE ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wcfca], a ld [wNumHits], a
ld c, 3 ld c, 3
call DelayFrames call DelayFrames
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
@ -9773,7 +9773,7 @@ PlayDamageAnim: ; 37e19
ld a, BATTLEANIM_PLAYER_DAMAGE ld a, BATTLEANIM_PLAYER_DAMAGE
.player .player
ld [wcfca], a ld [wNumHits], a
jp PlayUserBattleAnim jp PlayUserBattleAnim
; 37e36 ; 37e36
@ -9781,7 +9781,7 @@ PlayDamageAnim: ; 37e19
LoadMoveAnim: ; 37e36 LoadMoveAnim: ; 37e36
xor a xor a
ld [wcfca], a ld [wNumHits], a
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
ld a, BATTLE_VARS_MOVE_ANIM ld a, BATTLE_VARS_MOVE_ANIM
@ -9819,7 +9819,7 @@ PlayOpponentBattleAnim: ; 37e54
ld a, d ld a, d
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
xor a xor a
ld [wcfca], a ld [wNumHits], a
push hl push hl
push de push de

27
constants/battle_constants.asm
View File

@ -374,3 +374,30 @@ SUBSTATUS_CURLED EQU 0
const WIN const WIN
const LOSE const LOSE
const DRAW 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

2
constants/move_constants.asm
View File

@ -287,7 +287,7 @@ const_value SET const_value + -1
const ANIM_SHAKE ; $114 const ANIM_SHAKE ; $114
const ANIM_HIT_CONFUSION ; $115 const ANIM_HIT_CONFUSION ; $115
; wcfca uses offsets from ANIM_MISS ; wNumHits uses offsets from ANIM_MISS
const_def const_def
const BATTLEANIM_NONE const BATTLEANIM_NONE
const BATTLEANIM_ENEMY_DAMAGE const BATTLEANIM_ENEMY_DAMAGE

10
engine/battle_start.asm
View File

@ -1,11 +1,11 @@
Predef_StartBattle: ; 8c20f Predef_StartBattle: ; 8c20f
call Function8c26d call Function8c26d
ld a, [rBGP] ld a, [rBGP]
ld [wcfc7], a ld [wBGP], a
ld a, [rOBP0] ld a, [rOBP0]
ld [wcfc8], a ld [wOBP0], a
ld a, [rOBP1] ld a, [rOBP1]
ld [wcfc9], a ld [wOBP1], a
call DelayFrame call DelayFrame
ld hl, hVBlank ld hl, hVBlank
ld a, [hl] ld a, [hl]
@ -35,7 +35,7 @@ Predef_StartBattle: ; 8c20f
ld [rSVBK], a ld [rSVBK], a
ld a, %11111111 ld a, %11111111
ld [wcfc7], a ld [wBGP], a
call DmgToCgbBGPals call DmgToCgbBGPals
call DelayFrame call DelayFrame
xor a xor a
@ -278,7 +278,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
ld a, [hl] ld a, [hl]
cp %00000001 cp %00000001
jr z, .done jr z, .done
ld [wcfc7], a ld [wBGP], a
call DmgToCgbBGPals call DmgToCgbBGPals
and a and a
ret ret

14
engine/party_menu.asm
View File

@ -678,7 +678,7 @@ InitPartyMenuWithCancel: ; 50405
xor a xor a
ld [wSwitchMon], a ld [wSwitchMon], a
ld de, PartyMenuAttributes ld de, PartyMenuAttributes
call InitMenu3 call SetMenuAttributes
ld a, [PartyCount] ld a, [PartyCount]
inc a inc a
ld [w2DMenuNumRows], a ; list length ld [w2DMenuNumRows], a ; list length
@ -704,7 +704,7 @@ InitPartyMenuWithCancel: ; 50405
InitPartyMenuNoCancel: ; 0x5042d InitPartyMenuNoCancel: ; 0x5042d
; no cancel ; no cancel
ld de, PartyMenuAttributes ld de, PartyMenuAttributes
call InitMenu3 call SetMenuAttributes
ld a, [PartyCount] ld a, [PartyCount]
ld [w2DMenuNumRows], a ; list length ld [w2DMenuNumRows], a ; list length
ld b, a ld b, a
@ -726,13 +726,17 @@ InitPartyMenuNoCancel: ; 0x5042d
PartyMenuAttributes: ; 5044f PartyMenuAttributes: ; 5044f
; cursor y ; cursor y
; cursor x ; cursor x
; list length ; num rows
; ? ; num cols
; bit 6: animate sprites bit 5: wrap around ; bit 6: animate sprites bit 5: wrap around
; ? ; ?
; distance between items (hi: y, lo: x) ; distance between items (hi: y, lo: x)
; allowed buttons (mask) ; 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 ; 50457
PartyMenuSelect: ; 0x50457 PartyMenuSelect: ; 0x50457

28
engine/startmenu.asm
View File

@ -270,7 +270,7 @@ endr
.GetMenuAccountTextPointer ; 12819 .GetMenuAccountTextPointer ; 12819
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, wcf97 ld hl, wMenuData2PointerTableAddr
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -1475,8 +1475,8 @@ ChooseMoveToDelete: ; 12f5b
.asm_12f73: ; 12f73 .asm_12f73: ; 12f73
call SetUpMoveScreenBG call SetUpMoveScreenBG
ld de, Unknown_12fb2 ld de, DeleteMoveScreenAttrs
call InitMenu3 call SetMenuAttributes
call SetUpMoveList call SetUpMoveList
ld hl, w2DMenuFlags1 ld hl, w2DMenuFlags1
set 6, [hl] set 6, [hl]
@ -1514,8 +1514,12 @@ ChooseMoveToDelete: ; 12f5b
ret ret
; 12fb2 ; 12fb2
Unknown_12fb2: ; 12fb2 DeleteMoveScreenAttrs: ; 12fb2
db $03, $01, $03, $01, $40, $00, $20, $c3 db 3, 1
db 3, 1
db $40, $00
dn 2, 0
db D_UP | D_DOWN | A_BUTTON | B_BUTTON
; 12fba ; 12fba
ManagePokemonMoves: ; 12fba ManagePokemonMoves: ; 12fba
@ -1539,11 +1543,11 @@ ManagePokemonMoves: ; 12fba
MoveScreenLoop: ; 12fd5 MoveScreenLoop: ; 12fd5
ld a, [CurPartyMon] ld a, [CurPartyMon]
inc a inc a
ld [wd0d8], a ld [wPartyMenuCursor], a
call SetUpMoveScreenBG call SetUpMoveScreenBG
call Function132d3 call Function132d3
ld de, Unknown_13163 ld de, MoveScreenAttributes
call InitMenu3 call SetMenuAttributes
.loop .loop
call SetUpMoveList call SetUpMoveList
ld hl, w2DMenuFlags1 ld hl, w2DMenuFlags1
@ -1746,8 +1750,12 @@ MoveScreenLoop: ; 12fd5
jp ClearTileMap jp ClearTileMap
; 13163 ; 13163
Unknown_13163: ; 13163 MoveScreenAttributes: ; 13163
db $03, $01, $03, $01, $40, $00, $20, $f3 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 ; 1316b
String_1316b: ; 1316b String_1316b: ; 1316b

69
engine/switch_items.asm
View File

@ -8,9 +8,9 @@ SwitchItemsInBag: ; 2490c (9:490c)
cp b cp b
jr z, .trivial jr z, .trivial
ld a, [wScrollingMenuCursorPosition] ld a, [wScrollingMenuCursorPosition]
call Function24a5c call ItemSwitch_GetNthItem
ld a, [hl] ld a, [hl]
cp $ff cp -1
ret z ret z
ld a, [wSwitchItem] ld a, [wSwitchItem]
dec a dec a
@ -45,10 +45,10 @@ SwitchItemsInBag: ; 2490c (9:490c)
call Function24a6c call Function24a6c
push bc push bc
ld a, [wSwitchItem] ld a, [wSwitchItem]
call Function24a5c call ItemSwitch_GetNthItem
dec hl dec hl
push hl push hl
call Function24a80 call ItemSwitch_ConvertSpacingToDW
add hl, bc add hl, bc
ld d, h ld d, h
ld e, l ld e, l
@ -71,10 +71,10 @@ SwitchItemsInBag: ; 2490c (9:490c)
call Function24a6c call Function24a6c
push bc push bc
ld a, [wSwitchItem] ld a, [wSwitchItem]
call Function24a5c call ItemSwitch_GetNthItem
ld d, h ld d, h
ld e, l ld e, l
call Function24a80 call ItemSwitch_ConvertSpacingToDW
add hl, bc add hl, bc
pop bc pop bc
call CopyBytes call CopyBytes
@ -86,11 +86,11 @@ SwitchItemsInBag: ; 2490c (9:490c)
Function249a7: ; 249a7 (9:49a7) Function249a7: ; 249a7 (9:49a7)
ld a, [wSwitchItem] ld a, [wSwitchItem]
call Function24a5c call ItemSwitch_GetNthItem
ld d, h ld d, h
ld e, l ld e, l
ld a, [wScrollingMenuCursorPosition] ld a, [wScrollingMenuCursorPosition]
call Function24a5c call ItemSwitch_GetNthItem
ld a, [de] ld a, [de]
cp [hl] cp [hl]
jr nz, .asm_249cd jr nz, .asm_249cd
@ -112,11 +112,11 @@ Function249a7: ; 249a7 (9:49a7)
Function249d1: ; 249d1 (9:49d1) Function249d1: ; 249d1 (9:49d1)
ld a, [wSwitchItem] ld a, [wSwitchItem]
call Function24a5c call ItemSwitch_GetNthItem
inc hl inc hl
push hl push hl
ld a, [wScrollingMenuCursorPosition] ld a, [wScrollingMenuCursorPosition]
call Function24a5c call ItemSwitch_GetNthItem
inc hl inc hl
ld a, [hl] ld a, [hl]
pop hl pop hl
@ -126,11 +126,11 @@ Function249d1: ; 249d1 (9:49d1)
sub 99 sub 99
push af push af
ld a, [wScrollingMenuCursorPosition] ld a, [wScrollingMenuCursorPosition]
call Function24a5c call ItemSwitch_GetNthItem
inc hl inc hl
ld [hl], 99 ld [hl], 99
ld a, [wSwitchItem] ld a, [wSwitchItem]
call Function24a5c call ItemSwitch_GetNthItem
inc hl inc hl
pop af pop af
ld [hl], a ld [hl], a
@ -141,7 +141,7 @@ Function249d1: ; 249d1 (9:49d1)
.asm_24a01 .asm_24a01
push af push af
ld a, [wScrollingMenuCursorPosition] ld a, [wScrollingMenuCursorPosition]
call Function24a5c call ItemSwitch_GetNthItem
inc hl inc hl
pop af pop af
ld [hl], a ld [hl], a
@ -154,7 +154,7 @@ Function249d1: ; 249d1 (9:49d1)
jr nz, .asm_24a25 jr nz, .asm_24a25
dec [hl] dec [hl]
ld a, [wSwitchItem] ld a, [wSwitchItem]
call Function24a5c call ItemSwitch_GetNthItem
ld [hl], $ff ld [hl], $ff
xor a xor a
ld [wSwitchItem], a ld [wSwitchItem], a
@ -162,10 +162,10 @@ Function249d1: ; 249d1 (9:49d1)
.asm_24a25 .asm_24a25
dec [hl] dec [hl]
call Function24a80 call ItemSwitch_ConvertSpacingToDW
push bc push bc
ld a, [wSwitchItem] ld a, [wSwitchItem]
call Function24a5c call ItemSwitch_GetNthItem
pop bc pop bc
push hl push hl
add hl, bc add hl, bc
@ -181,24 +181,24 @@ Function249d1: ; 249d1 (9:49d1)
ret ret
Function24a40: ; 24a40 (9:4a40) Function24a40: ; 24a40 (9:4a40)
call Function24a5c call ItemSwitch_GetNthItem
ld de, wd002 ld de, wd002
call Function24a80 call ItemSwitch_ConvertSpacingToDW
call CopyBytes call CopyBytes
ret ret
Function24a4d: ; 24a4d (9:4a4d) Function24a4d: ; 24a4d (9:4a4d)
call Function24a5c call ItemSwitch_GetNthItem
ld d, h ld d, h
ld e, l ld e, l
ld hl, wd002 ld hl, wd002
call Function24a80 call ItemSwitch_ConvertSpacingToDW
call CopyBytes call CopyBytes
ret ret
Function24a5c: ; 24a5c (9:4a5c) ItemSwitch_GetNthItem: ; 24a5c (9:4a5c)
push af push af
call Function24a80 call ItemSwitch_ConvertSpacingToDW
ld hl, wMenuData2_ItemsPointerAddr ld hl, wMenuData2_ItemsPointerAddr
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -210,13 +210,13 @@ Function24a5c: ; 24a5c (9:4a5c)
Function24a6c: ; 24a6c (9:4a6c) Function24a6c: ; 24a6c (9:4a6c)
push hl push hl
call Function24a80 call ItemSwitch_ConvertSpacingToDW
ld a, d ld a, d
sub e sub e
jr nc, .asm_24a76 jr nc, .dont_negate
dec a dec a
cpl cpl
.asm_24a76 .dont_negate
ld hl, 0 ld hl, 0
call AddNTimes call AddNTimes
ld b, h ld b, h
@ -224,12 +224,13 @@ Function24a6c: ; 24a6c (9:4a6c)
pop hl pop hl
ret ret
Function24a80: ; 24a80 (9:4a80) ItemSwitch_ConvertSpacingToDW: ; 24a80 (9:4a80)
; This function is absolutely idiotic.
push hl push hl
ld a, [wcf94] ld a, [wMenuData2_ScrollingMenuSpacing]
ld c, a ld c, a
ld b, 0 ld b, 0
ld hl, Unknown_24a91 ld hl, .spacing_dws
rept 2 rept 2
add hl, bc add hl, bc
endr endr
@ -241,23 +242,23 @@ endr
; 24a91 (9:4a91) ; 24a91 (9:4a91)
Unknown_24a91: ; 24a91 .spacing_dws: ; 24a91
dw 0, 1, 2 dw 0, 1, 2
; 24a97 ; 24a97
Function24a97: ; 24a97 (9:4a97) Function24a97: ; 24a97 (9:4a97)
push af push af
call Function24a80 call ItemSwitch_ConvertSpacingToDW
ld a, c ld a, c
cp $2 cp 2
jr nz, .asm_24aa7 jr nz, .not_2
pop af pop af
call Function24a5c call ItemSwitch_GetNthItem
inc hl inc hl
ld a, [hl] ld a, [hl]
ret ret
.asm_24aa7 .not_2
pop af pop af
ld a, $1 ld a, $1
ret ret

6
event/magnet_train.asm
View File

@ -450,11 +450,11 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae
call GetSGBLayout call GetSGBLayout
call UpdateTimePals call UpdateTimePals
ld a, [rBGP] ld a, [rBGP]
ld [wcfc7], a ld [wBGP], a
ld a, [rOBP0] ld a, [rOBP0]
ld [wcfc8], a ld [wOBP0], a
ld a, [rOBP1] ld a, [rOBP1]
ld [wcfc9], a ld [wOBP1], a
pop af pop af
ld [wPermission], a ld [wPermission], a
pop af pop af

2
home/movement.asm
View File

@ -136,7 +136,7 @@ endr
big_step_right big_step_right
; 1bb1 ; 1bb1
InitMenu3:: ; 1bb1 SetMenuAttributes:: ; 1bb1
push hl push hl
push bc push bc
ld hl, w2DMenuCursorInitY ld hl, w2DMenuCursorInitY

6
home/vblank.asm
View File

@ -247,11 +247,11 @@ UpdatePals:: ; 37f
jp nz, UpdateCGBPals jp nz, UpdateCGBPals
; update gb pals ; update gb pals
ld a, [wcfc7] ld a, [wBGP]
ld [rBGP], a ld [rBGP], a
ld a, [wcfc8] ld a, [wOBP0]
ld [rOBP0], a ld [rOBP0], a
ld a, [wcfc9] ld a, [wOBP1]
ld [rOBP1], a ld [rOBP1], a
and a and a

10
items/item_effects.asm
View File

@ -413,7 +413,7 @@ endr
xor a xor a
ld [hBattleTurn], a ld [hBattleTurn], a
ld [Buffer2], a ld [Buffer2], a
ld [wcfca], a ld [wNumHits], a
predef PlayBattleAnim predef PlayBattleAnim
ld a, [wWildMon] ld a, [wWildMon]
@ -2161,7 +2161,7 @@ endr
Softboiled_MilkDrinkFunction: ; f3df (3:73df) Softboiled_MilkDrinkFunction: ; f3df (3:73df)
; Softboiled/Milk Drink in the field ; Softboiled/Milk Drink in the field
ld a, [wd0d8] ld a, [wPartyMenuCursor]
dec a dec a
ld b, a ld b, a
call .SelectMilkDrinkRecipient ; select pokemon call .SelectMilkDrinkRecipient ; select pokemon
@ -2186,7 +2186,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df)
.skip .skip
ld a, b ld a, b
inc a inc a
ld [wd0d8], a ld [wPartyMenuCursor], a
ret ret
.SelectMilkDrinkRecipient: ; f419 (3:7419) .SelectMilkDrinkRecipient: ; f419 (3:7419)
@ -2197,7 +2197,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df)
call ChoosePkmnToUseItemOn call ChoosePkmnToUseItemOn
pop bc pop bc
jr c, .set_carry jr c, .set_carry
ld a, [wd0d8] ld a, [wPartyMenuCursor]
dec a dec a
ld c, a ld c, a
ld a, b ld a, b
@ -2958,7 +2958,7 @@ UseBallInTrainerBattle: ; f7a0
xor a xor a
ld [wKickCounter], a ld [wKickCounter], a
ld [hBattleTurn], a ld [hBattleTurn], a
ld [wcfca], a ld [wNumHits], a
predef PlayBattleAnim predef PlayBattleAnim
ld hl, BlockedTheBallText ld hl, BlockedTheBallText
call PrintText call PrintText

4
misc/mobile_12_2.asm
View File

@ -507,7 +507,7 @@ Function4ab1a: ; 4ab1a
inc a inc a
ld b, a ld b, a
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
ld [wd0d8], a ld [wPartyMenuCursor], a
cp b cp b
jr z, .asm_4ab7e jr z, .asm_4ab7e
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
@ -528,7 +528,7 @@ Function4ab1a: ; 4ab1a
.asm_4ab6d .asm_4ab6d
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
ld [wd0d8], a ld [wPartyMenuCursor], a
.asm_4ab73 .asm_4ab73
ld de, SFX_READ_TEXT_2 ld de, SFX_READ_TEXT_2
call PlaySFX call PlaySFX

148
misc/mobile_40.asm
View File

@ -1803,7 +1803,7 @@ Function100b12: ; 100b12
ld de, LoadMenuDataHeader ld de, LoadMenuDataHeader
call FarCall_de call FarCall_de
ld a, BANK(BattleMenuDataHeader) ld a, BANK(BattleMenuDataHeader)
ld [wcf94], a ld [wMenuData2_2DMenuItemStringsBank], a
ld a, [wd0d2] ld a, [wd0d2]
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
call Function100e72 call Function100e72
@ -1844,7 +1844,7 @@ Function100b45: ; 100b45
Function100b7a: ; 100b7a Function100b7a: ; 100b7a
ld hl, CopyMenuData2 ld hl, CopyMenuData2
ld a, [wcf94] ld a, [wMenuData2_2DMenuItemStringsBank]
rst FarCall rst FarCall
callba Draw2DMenu callba Draw2DMenu
callba MobileTextBorder callba MobileTextBorder
@ -1858,7 +1858,7 @@ Function100b7a: ; 100b7a
MobileMoveSelectionScreen: ; 100b9f MobileMoveSelectionScreen: ; 100b9f
xor a xor a
ld [wd0e3], a ld [wMoveSwapBuffer], a
callba CheckPlayerHasUsableMoves callba CheckPlayerHasUsableMoves
ret z ret z
call Function100dd8 call Function100dd8
@ -1989,8 +1989,8 @@ Function100c74: ; 100c74
; 100c98 ; 100c98
Function100c98: ; 100c98 Function100c98: ; 100c98
ld de, Unknown_100cad ld de, .attrs
call InitMenu3 call SetMenuAttributes
ld a, [wNumMoves] ld a, [wNumMoves]
inc a inc a
ld [w2DMenuNumRows], a ld [w2DMenuNumRows], a
@ -2000,8 +2000,12 @@ Function100c98: ; 100c98
ret ret
; 100cad ; 100cad
Unknown_100cad: ; 100cad .attrs: ; 100cad
db $a, $1, $ff, $1, $a0, $, $20, $c3 db 10, 1
db 255, 1
db $a0, $00
dn 2, 0
db D_UP | D_DOWN | A_BUTTON | B_BUTTON
Function100cb5: ; 100cb5 Function100cb5: ; 100cb5
call Function100dd8 call Function100dd8
@ -2009,7 +2013,7 @@ Function100cb5: ; 100cb5
ld hl, w2DMenuFlags1 ld hl, w2DMenuFlags1
set 7, [hl] set 7, [hl]
res 6, [hl] res 6, [hl]
.asm_100cc0 .loop
call Function100dd2 call Function100dd2
callba MobileMenuJoypad callba MobileMenuJoypad
push bc push bc
@ -2017,22 +2021,22 @@ Function100cb5: ; 100cb5
callba Function10402d callba Function10402d
call Function100dfd call Function100dfd
pop bc pop bc
jr c, .asm_100d17 jr c, .done
ld a, [wMenuJoypadFilter] ld a, [wMenuJoypadFilter]
and c and c
jr z, .asm_100cc0 jr z, .loop
call PlaceHollowCursor call PlaceHollowCursor
ld a, [PartyCount] ld a, [PartyCount]
inc a inc a
ld b, a ld b, a
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
cp b cp b
jr z, .asm_100d17 jr z, .done
ld [wd0d8], a ld [wPartyMenuCursor], a
ld a, [hJoyLast] ld a, [hJoyLast]
ld b, a ld b, a
bit 1, b bit 1, b
jr nz, .asm_100d17 jr nz, .done
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
ld [CurPartyMon], a ld [CurPartyMon], a
@ -2048,7 +2052,7 @@ Function100cb5: ; 100cb5
and a and a
ret ret
.asm_100d17 .done
ld de, SFX_READ_TEXT_2 ld de, SFX_READ_TEXT_2
call PlaySFX call PlaySFX
call WaitSFX call WaitSFX
@ -2529,7 +2533,7 @@ Unknown_100fc0: ; 100fc0
db -1 db -1
Unknown_100feb: ; 100feb Unknown_100feb: ; 100feb
dbwww $, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL dbwww $0, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL
db -1 db -1
Unknown_100ff3: ; 100ff3 Unknown_100ff3: ; 100ff3
@ -6311,7 +6315,7 @@ Function1029cf: ; 1029cf
ld hl, wcd4b ld hl, wcd4b
set 1, [hl] set 1, [hl]
ld de, MenuData3_102a33 ld de, MenuData3_102a33
call InitMenu3 call SetMenuAttributes
ld a, [wcd4a] ld a, [wcd4a]
inc a inc a
ld [wcd4a], a ld [wcd4a], a
@ -6353,7 +6357,9 @@ String_102a26: ; 102a26
MenuData3_102a33: MenuData3_102a33:
db 8, 11 db 8, 11
db 2, 1 db 2, 1
db $80, $00, $20, $01 db $80, $00
dn 2, 0
db A_BUTTON
Function102a3b: ; 102a3b Function102a3b: ; 102a3b
ld a, [wcd30] ld a, [wcd30]
@ -6487,7 +6493,7 @@ Function102b4e: ; 102b4e
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
push af push af
ld de, Unknown_102b73 ld de, Unknown_102b73
call InitMenu3 call SetMenuAttributes
pop af pop af
ld [wMenuCursorY], a ld [wMenuCursorY], a
ld a, [OTPartyCount] ld a, [OTPartyCount]
@ -6504,7 +6510,11 @@ Function102b68: ; 102b68 ; unreferenced
; 102b73 ; 102b73
Unknown_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 Function102b7b: ; 102b7b
xor a xor a
@ -6512,7 +6522,7 @@ Function102b7b: ; 102b7b
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
push af push af
ld de, Unknown_102b94 ld de, Unknown_102b94
call InitMenu3 call SetMenuAttributes
pop af pop af
ld [wMenuCursorY], a ld [wMenuCursorY], a
ld a, [PartyCount] ld a, [PartyCount]
@ -6521,7 +6531,11 @@ Function102b7b: ; 102b7b
; 102b94 ; 102b94
Unknown_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 Function102b9c: ; 102b9c
ld a, [wcd4d] ld a, [wcd4d]
@ -7250,20 +7264,20 @@ endr
; 103112 ; 103112
Unknown_103112: ; 103112 Unknown_103112: ; 103112
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $1, $, $, $, $, $, $, $ db $1, $0, $0, $0, $0, $0, $0, $
db $2, $1, $, $, $, $, $, $ db $2, $1, $0, $0, $0, $0, $0, $
db $3, $2, $1, $, $, $, $, $ db $3, $2, $1, $0, $0, $0, $0, $
db $4, $3, $2, $1, $, $, $, $ db $4, $3, $2, $1, $0, $0, $0, $
db $4, $4, $3, $2, $1, $, $, $ db $4, $4, $3, $2, $1, $0, $0, $
db $4, $4, $4, $3, $2, $1, $, $ db $4, $4, $4, $3, $2, $1, $0, $
db $4, $4, $4, $4, $3, $2, $1, $ db $4, $4, $4, $4, $3, $2, $1, $
db $4, $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 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 $3, $4, $4, $4, $4, $4, $4, $4
db $2, $3, $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, $4
db $, $1, $2, $3, $4, $4, $4, $4 db $0, $1, $2, $3, $4, $4, $4, $4
db $, $, $1, $2, $3, $4, $4, $4 db $0, $0, $1, $2, $3, $4, $4, $4
db $, $, $, $1, $2, $3, $4, $4 db $0, $0, $0, $1, $2, $3, $4, $4
db $, $, $, $, $1, $2, $3, $4 db $0, $0, $0, $0, $1, $2, $3, $4
db $, $, $, $, $, $1, $2, $3 db $0, $0, $0, $0, $0, $1, $2, $3
db $, $, $, $, $, $, $1, $2 db $0, $0, $0, $0, $0, $0, $1, $2
db $, $, $, $, $, $, $, $1 db $0, $0, $0, $0, $0, $0, $0, $1
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
db $, $, $, $, $, $, $, $ db $0, $0, $0, $0, $0, $0, $0, $
; 10327a ; 10327a
Unknown_10327a: ; 10327a Unknown_10327a: ; 10327a
db $, $, $, $ db $0, $0, $0, $
db $, $, $1, $ db $0, $0, $1, $
db $, $, $2, $ db $0, $0, $2, $
db $, $, $3, $ db $0, $0, $3, $
db $, $, $1, $1 db $0, $0, $1, $1
db $, $, $, $ db $0, $0, $0, $
db $, $, $1, $2 db $0, $0, $1, $2
db $, $, $2, $2 db $0, $0, $2, $2
db $, $, $3, $2 db $0, $0, $3, $2
db $, $, $1, $3 db $0, $0, $1, $3
GFX_1032a2: GFX_1032a2:
INCBIN "gfx/unknown/1032a2.2bpp" INCBIN "gfx/unknown/1032a2.2bpp"
Unknown_1032e2: Unknown_1032e2:
db $, $, $ff, $1f db $0, $0, $ff, $1f
db $f4, $1b, $8d, $42 db $f4, $1b, $8d, $42
db $, $, $67, $45 db $0, $0, $67, $45
db $, $, $, $ db $0, $0, $0, $
db $, $, $1f, $13 db $0, $0, $1f, $13
db $99, $1, $ff, $10 db $99, $1, $ff, $10
db $, $, $19, $ db $0, $0, $19, $
db $, $, $, $ db $0, $0, $0, $
; 103302 ; 103302
Function103302: ; 103302 Function103302: ; 103302

57
tilesets/animations.asm
View File

@ -99,7 +99,7 @@ Tileset01Anim: ; 0xfc0a3
TilesetAnimfc0d7: ; 0xfc0d7 TilesetAnimfc0d7: ; 0xfc0d7
dw VTiles2 tile $03, WriteTileToBuffer dw VTiles2 tile $03, WriteTileToBuffer
dw wcf41, ScrollTileRightLeft dw wTileAnimBuffer, ScrollTileRightLeft
dw VTiles2 tile $03, WriteTileFromBuffer dw VTiles2 tile $03, WriteTileFromBuffer
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -113,7 +113,7 @@ TilesetAnimfc0d7: ; 0xfc0d7
TilesetAnimfc103: ; 0xfc103 TilesetAnimfc103: ; 0xfc103
dw VTiles2 tile $14, WriteTileToBuffer dw VTiles2 tile $14, WriteTileToBuffer
dw wcf41, ScrollTileRightLeft dw wTileAnimBuffer, ScrollTileRightLeft
dw VTiles2 tile $14, WriteTileFromBuffer dw VTiles2 tile $14, WriteTileFromBuffer
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -153,32 +153,32 @@ Tileset15Anim: ; 0xfc15f
TilesetAnimfc17f: ; 0xfc17f TilesetAnimfc17f: ; 0xfc17f
dw VTiles2 tile $53, WriteTileToBuffer dw VTiles2 tile $53, WriteTileToBuffer
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw VTiles2 tile $53, WriteTileFromBuffer dw VTiles2 tile $53, WriteTileFromBuffer
dw VTiles2 tile $03, WriteTileToBuffer dw VTiles2 tile $03, WriteTileToBuffer
dw wcf41, ScrollTileRightLeft dw wTileAnimBuffer, ScrollTileRightLeft
dw VTiles2 tile $03, WriteTileFromBuffer dw VTiles2 tile $03, WriteTileFromBuffer
dw VTiles2 tile $53, WriteTileToBuffer dw VTiles2 tile $53, WriteTileToBuffer
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw VTiles2 tile $53, WriteTileFromBuffer dw VTiles2 tile $53, WriteTileFromBuffer
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc1af ; 0xfc1af
TilesetAnimfc1af: ; 0xfc1af TilesetAnimfc1af: ; 0xfc1af
dw VTiles2 tile $54, WriteTileToBuffer dw VTiles2 tile $54, WriteTileToBuffer
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw VTiles2 tile $54, WriteTileFromBuffer dw VTiles2 tile $54, WriteTileFromBuffer
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw VTiles2 tile $03, WriteTileToBuffer dw VTiles2 tile $03, WriteTileToBuffer
dw wcf41, ScrollTileRightLeft dw wTileAnimBuffer, ScrollTileRightLeft
dw VTiles2 tile $03, WriteTileFromBuffer dw VTiles2 tile $03, WriteTileFromBuffer
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw VTiles2 tile $54, WriteTileToBuffer dw VTiles2 tile $54, WriteTileToBuffer
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw VTiles2 tile $54, WriteTileFromBuffer dw VTiles2 tile $54, WriteTileFromBuffer
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc1e7 ; 0xfc1e7
@ -187,7 +187,7 @@ Tileset24Anim: ; 0xfc1e7
Tileset30Anim: ; 0xfc1e7 Tileset30Anim: ; 0xfc1e7
dw VTiles2 tile $14, WriteTileToBuffer dw VTiles2 tile $14, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw wcf41, ScrollTileRightLeft dw wTileAnimBuffer, ScrollTileRightLeft
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $14, WriteTileFromBuffer dw VTiles2 tile $14, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
@ -195,11 +195,11 @@ Tileset30Anim: ; 0xfc1e7
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $40, WriteTileToBuffer dw VTiles2 tile $40, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $40, WriteTileFromBuffer dw VTiles2 tile $40, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
@ -209,7 +209,7 @@ Tileset30Anim: ; 0xfc1e7
Tileset29Anim: ; 0xfc233 Tileset29Anim: ; 0xfc233
dw VTiles2 tile $35, WriteTileToBuffer dw VTiles2 tile $35, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw wcf41, ScrollTileRightLeft dw wTileAnimBuffer, ScrollTileRightLeft
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $35, WriteTileFromBuffer dw VTiles2 tile $35, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
@ -217,11 +217,11 @@ Tileset29Anim: ; 0xfc233
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $31, WriteTileToBuffer dw VTiles2 tile $31, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw wcf41, ScrollTileDown dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $31, WriteTileFromBuffer dw VTiles2 tile $31, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
@ -249,7 +249,7 @@ Tileset23Anim: ; 0xfc27f
TilesetAnimfc2bf: ; 0xfc2bf TilesetAnimfc2bf: ; 0xfc2bf
dw VTiles2 tile $4f, WriteTileToBuffer dw VTiles2 tile $4f, WriteTileToBuffer
dw wcf41, ScrollTileRightLeft dw wTileAnimBuffer, ScrollTileRightLeft
dw VTiles2 tile $4f, WriteTileFromBuffer dw VTiles2 tile $4f, WriteTileFromBuffer
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -430,10 +430,9 @@ AnimateFountain: ; fc387
add a add a
add l add l
ld l, a ld l, a
jr nc, .asm_fc399 jr nc, .okay
inc h inc h
.okay
.asm_fc399
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -860,14 +859,14 @@ AnimateWhirlpoolTile: ; fc678
WriteTileFromBuffer: ; fc696 WriteTileFromBuffer: ; fc696
; Write tiledata at wcf41 to de. ; Write tiledata at wTileAnimBuffer to de.
; wcf41 is loaded to sp for WriteTile. ; wTileAnimBuffer is loaded to sp for WriteTile.
ld hl, [sp+0] ld hl, [sp+0]
ld b, h ld b, h
ld c, l ld c, l
ld hl, wcf41 ld hl, wTileAnimBuffer
ld sp, hl ld sp, hl
ld h, d ld h, d
@ -877,7 +876,7 @@ WriteTileFromBuffer: ; fc696
WriteTileToBuffer: ; fc6a2 WriteTileToBuffer: ; fc6a2
; Write tiledata de to wcf41. ; Write tiledata de to wTileAnimBuffer.
; de is loaded to sp for WriteTile. ; de is loaded to sp for WriteTile.
ld hl, [sp+0] ld hl, [sp+0]
@ -888,7 +887,7 @@ WriteTileToBuffer: ; fc6a2
ld l, e ld l, e
ld sp, hl ld sp, hl
ld hl, wcf41 ld hl, wTileAnimBuffer
; fallthrough ; fallthrough

93
wram.asm
View File

@ -1498,11 +1498,13 @@ AttrMap:: ; cdd9
; bit 0-2: palette id ; bit 0-2: palette id
ds SCREEN_WIDTH * SCREEN_HEIGHT ds SCREEN_WIDTH * SCREEN_HEIGHT
AttrMapEnd:: AttrMapEnd::
ds 1
wcf41:: ds 1
wcf42:: ds 2 wcf42:: ds 2
wcf44:: ds 1 wcf44:: ds 1
wcf45:: ds 12 wcf45::
ds AttrMapEnd - @
wTileAnimBuffer::
ds $10
; addresses dealing with serial comms ; addresses dealing with serial comms
wOtherPlayerLinkMode:: ds 1 wOtherPlayerLinkMode:: ds 1
wOtherPlayerLinkAction:: ds 4 wOtherPlayerLinkAction:: ds 4
@ -1594,46 +1596,47 @@ wMenuData2Flags:: ds 1 ; cf91
; bit 0: Disable B button ; bit 0: Disable B button
wMenuData2_ScrollingMenuHeight:: wMenuData2_ScrollingMenuHeight::
wMenuData2Items:: ds 1 wMenuData2Items::
ds 1 ; cf92
wMenuData2IndicesPointer:: wMenuData2IndicesPointer::
wMenuData2Spacing:: wMenuData2Spacing::
wMenuData2_ScrollingMenuWidth:: wMenuData2_ScrollingMenuWidth::
wcf93:: ds 1 ds 1 ; cf93
wMenuData2_2DMenuItemStringsBank:: wMenuData2_2DMenuItemStringsBank::
wMenuData2_ScrollingMenuSpacing:: wMenuData2_ScrollingMenuSpacing::
wcf94:: ds 1 ds 1 ; cf94
wMenuData2_2DMenuItemStringsAddr:: wMenuData2_2DMenuItemStringsAddr::
wMenuData2DisplayFunctionPointer:: wMenuData2DisplayFunctionPointer::
wMenuData2_ItemsPointerBank:: wMenuData2_ItemsPointerBank::
wcf95:: ds 1 ; bank ds 1 ; cf95
wMenuData2_ItemsPointerAddr:: wMenuData2_ItemsPointerAddr::
wcf96:: ds 1 ; addr lo ds 1 ; cf96
wMenuData2PointerTableAddr:: wMenuData2PointerTableAddr::
wMenuData2_2DMenuFunctionBank:: wMenuData2_2DMenuFunctionBank::
wcf97:: ds 1 ; addr hi ds 1 ; cf97
wMenuData2_2DMenuFunctionAddr:: wMenuData2_2DMenuFunctionAddr::
wMenuData2_ScrollingMenuFunction1:: wMenuData2_ScrollingMenuFunction1::
wcf98:: ds 3 ds 3 ; cf98
wMenuData2_ScrollingMenuFunction2:: wMenuData2_ScrollingMenuFunction2::
wcf9b:: ds 3 ds 3 ; cf9b
wMenuData2_ScrollingMenuFunction3:: wMenuData2_ScrollingMenuFunction3::
wcf9e:: ds 3 ds 3 ; cf9e
wMenuData2End:: wMenuData2End::
wMenuData3:: wMenuData3::
w2DMenuCursorInitY:: ds 1 w2DMenuCursorInitY:: ds 1 ; cfa1
w2DMenuCursorInitX:: ds 1 w2DMenuCursorInitX:: ds 1 ; cfa2
w2DMenuNumRows:: ds 1 w2DMenuNumRows:: ds 1 ; cfa3
w2DMenuNumCols:: ds 1 w2DMenuNumCols:: ds 1 ; cfa4
w2DMenuFlags1:: ds 1 w2DMenuFlags1:: ds 1 ; cfa5
w2DMenuFlags2:: ds 1 w2DMenuFlags2:: ds 1 ; cfa6
w2DMenuCursorOffsets:: ds 1 w2DMenuCursorOffsets:: ds 1 ; cfa7
wMenuJoypadFilter:: ds 1 wMenuJoypadFilter:: ds 1 ; cfa8
wMenuData3End:: wMenuData3End::
wMenuCursorY:: ds 1 wMenuCursorY:: ds 1 ; cfa9
wMenuCursorX:: ds 1 wMenuCursorX:: ds 1 ; cfaa
wCursorOffCharacter:: ds 1 wCursorOffCharacter:: ds 1 ; cfab
wCursorCurrentTile:: ds 2 ; cfac wCursorCurrentTile:: ds 2 ; cfac
ds 3 ds 3
@ -1675,18 +1678,17 @@ FXAnimID::
FXAnimIDLo:: ; cfc2 FXAnimIDLo:: ; cfc2
ds 1 ds 1
FXAnimIDHi:: ; cfc3 FXAnimIDHi:: ; cfc3
ds 1 ds 3
wcfc4:: ds 1
wcfc5:: ds 1
TileAnimationTimer:: ; cfc6 TileAnimationTimer:: ; cfc6
ds 1 ds 1
wcfc7:: ds 1 ; palette backups?
wcfc8:: ds 1 wBGP:: ds 1
wcfc9:: ds 1 wOBP0:: ds 1
wcfca:: ds 2 wOBP1:: ds 1
wNumHits:: ds 2
Options:: ; cfcc Options:: ; cfcc
; bit 0-2: number of frames to delay when printing text ; bit 0-2: number of frames to delay when printing text
@ -3272,11 +3274,34 @@ LYOverridesBackupEnd::
SECTION "Battle Animations", WRAMX [$d300], BANK [5] SECTION "Battle Animations", WRAMX [$d300], BANK [5]
w5_d300:: ds 10 wBattleAnimTileDict:: ds 10
battle_anim_struct: MACRO battle_anim_struct: MACRO
; Placeholder until we can figure out what it all means ; 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 endm
ActiveAnimObjects:: ; d30a ActiveAnimObjects:: ; d30a
@ -3295,7 +3320,7 @@ ActiveAnimObjectsEnd:: ; d3aa
ActiveBGEffects:: ; d3fa ActiveBGEffects:: ; d3fa
ds 4 * 5 ds 4 * 5
w5_d40e:: ds 1 wNumActiveBattleAnims:: ds 1
BattleAnimFlags:: ; d40f BattleAnimFlags:: ; d40f
ds 1 ds 1