Replace hardware_constants.asm with the community-standard hardware.inc 5.0 (#1186)
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
; Battle animation command interpreter.
|
||||
|
||||
PlayBattleAnim:
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
|
||||
ld a, BANK(wActiveAnimObjects)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
call _PlayBattleAnim
|
||||
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ret
|
||||
|
||||
_PlayBattleAnim:
|
||||
@@ -25,8 +25,8 @@ _PlayBattleAnim:
|
||||
call BattleAnimDelayFrame
|
||||
|
||||
ld c, VBLANK_CUTSCENE
|
||||
ldh a, [rKEY1]
|
||||
bit KEY1_DBLSPEED, a
|
||||
ldh a, [rSPD]
|
||||
bit B_SPD_DOUBLE, a
|
||||
jr nz, .got_speed
|
||||
ld c, VBLANK_CUTSCENE_CGB
|
||||
|
||||
@@ -154,10 +154,10 @@ BattleAnimRestoreHuds:
|
||||
call BattleAnimDelayFrame
|
||||
call WaitTop
|
||||
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wCurBattleMon) ; aka BANK(wTempMon), BANK(wPartyMon1), and several others
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
; this block should just be "call UpdateBattleHuds"
|
||||
ld hl, UpdateBattleHuds
|
||||
@@ -165,7 +165,7 @@ BattleAnimRestoreHuds:
|
||||
rst FarCall
|
||||
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
ld a, $1
|
||||
ldh [hBGMapMode], a
|
||||
@@ -224,9 +224,9 @@ PlaceWindowOverBattleTextbox: ; unreferenced
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
; bgcoord hBGMapAddress, 0, 20
|
||||
ld a, LOW(vBGMap0 + 20 * BG_MAP_WIDTH)
|
||||
ld a, LOW(vBGMap0 + 20 * TILEMAP_WIDTH)
|
||||
ldh [hBGMapAddress], a
|
||||
ld a, HIGH(vBGMap0 + 20 * BG_MAP_WIDTH)
|
||||
ld a, HIGH(vBGMap0 + 20 * TILEMAP_WIDTH)
|
||||
ldh [hBGMapAddress + 1], a
|
||||
call WaitBGMap2
|
||||
ld a, (SCREEN_HEIGHT - TEXTBOX_HEIGHT) * TILE_WIDTH
|
||||
@@ -246,13 +246,13 @@ BattleAnim_ClearOAM:
|
||||
|
||||
; Instead of deleting the sprites, make them all use PAL_BATTLE_OB_ENEMY
|
||||
ld hl, wShadowOAMSprite00Attributes
|
||||
ld c, NUM_SPRITE_OAM_STRUCTS
|
||||
ld c, OAM_COUNT
|
||||
.loop
|
||||
ld a, [hl]
|
||||
and ~(PALETTE_MASK | VRAM_BANK_1) ; zeros out the palette bits
|
||||
and ~(OAM_PALETTE | OAM_BANK1) ; zeros out the palette bits
|
||||
assert PAL_BATTLE_OB_ENEMY == 0
|
||||
ld [hli], a
|
||||
rept SPRITEOAMSTRUCT_LENGTH - 1
|
||||
rept OBJ_SIZE - 1
|
||||
inc hl
|
||||
endr
|
||||
dec c
|
||||
@@ -676,7 +676,7 @@ BattleAnimCmd_5GFX:
|
||||
ld [wBattleAnimGFXTempTileID], a
|
||||
.loop
|
||||
ld a, [wBattleAnimGFXTempTileID]
|
||||
cp (vTiles1 - vTiles0) / LEN_2BPP_TILE - BATTLEANIM_BASE_TILE
|
||||
cp (vTiles1 - vTiles0) / TILE_SIZE - BATTLEANIM_BASE_TILE
|
||||
vc_hook Reduce_move_anim_flashing_PRESENT
|
||||
ret nc
|
||||
call GetBattleAnimByte
|
||||
@@ -897,10 +897,10 @@ BattleAnimCmd_E7:
|
||||
ret
|
||||
|
||||
BattleAnimCmd_Transform:
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wCurPartySpecies)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
ld a, [wCurPartySpecies]
|
||||
push af
|
||||
@@ -930,7 +930,7 @@ BattleAnimCmd_Transform:
|
||||
ld [wCurPartySpecies], a
|
||||
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ret
|
||||
|
||||
BattleAnimCmd_UpdateActorPic:
|
||||
@@ -953,10 +953,10 @@ BattleAnimCmd_UpdateActorPic:
|
||||
ret
|
||||
|
||||
BattleAnimCmd_RaiseSub:
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, 1 ; unnecessary bankswitch?
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
xor a ; BANK(sScratch)
|
||||
call OpenSRAM
|
||||
@@ -1018,7 +1018,7 @@ GetSubstitutePic: ; used only for BANK(GetSubstitutePic)
|
||||
call CloseSRAM
|
||||
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ret
|
||||
|
||||
.CopyTile:
|
||||
@@ -1028,10 +1028,10 @@ GetSubstitutePic: ; used only for BANK(GetSubstitutePic)
|
||||
ret
|
||||
|
||||
BattleAnimCmd_MinimizeOpp:
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, 1 ; unnecessary bankswitch?
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
xor a ; BANK(sScratch)
|
||||
call OpenSRAM
|
||||
@@ -1040,7 +1040,7 @@ BattleAnimCmd_MinimizeOpp:
|
||||
call CloseSRAM
|
||||
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ret
|
||||
|
||||
GetMinimizePic:
|
||||
@@ -1084,10 +1084,10 @@ MinimizePic:
|
||||
INCBIN "gfx/battle/minimize.2bpp"
|
||||
|
||||
BattleAnimCmd_Minimize:
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, 1 ; unnecessary bankswitch?
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
xor a ; BANK(sScratch)
|
||||
call OpenSRAM
|
||||
@@ -1097,14 +1097,14 @@ BattleAnimCmd_Minimize:
|
||||
call CloseSRAM
|
||||
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ret
|
||||
|
||||
BattleAnimCmd_DropSub:
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wCurPartySpecies)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
ld a, [wCurPartySpecies]
|
||||
push af
|
||||
@@ -1123,14 +1123,14 @@ BattleAnimCmd_DropSub:
|
||||
ld [wCurPartySpecies], a
|
||||
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ret
|
||||
|
||||
BattleAnimCmd_BeatUp:
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wCurPartySpecies)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
ld a, [wCurPartySpecies]
|
||||
push af
|
||||
@@ -1161,7 +1161,7 @@ BattleAnimCmd_BeatUp:
|
||||
call GetSGBLayout
|
||||
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ret
|
||||
|
||||
BattleAnimCmd_OAMOn:
|
||||
@@ -1238,10 +1238,10 @@ rept 4
|
||||
add hl, de
|
||||
endr
|
||||
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wEnemyMon) ; wBattleMon is in WRAM0, but wEnemyMon is in WRAMX
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
ldh a, [hBattleTurn]
|
||||
and a
|
||||
@@ -1300,7 +1300,7 @@ endr
|
||||
|
||||
.done
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ret
|
||||
|
||||
.CryData:
|
||||
@@ -1408,10 +1408,10 @@ BattleAnim_SetBGPals:
|
||||
ldh a, [hCGB]
|
||||
and a
|
||||
ret z
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wBGPals1)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ld hl, wBGPals2
|
||||
ld de, wBGPals1
|
||||
ldh a, [rBGP]
|
||||
@@ -1425,7 +1425,7 @@ BattleAnim_SetBGPals:
|
||||
ld c, 2
|
||||
call CopyPals
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ld a, TRUE
|
||||
ldh [hCGBPalUpdate], a
|
||||
ret
|
||||
@@ -1435,10 +1435,10 @@ BattleAnim_SetOBPals:
|
||||
ldh a, [hCGB]
|
||||
and a
|
||||
ret z
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wOBPals1)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ld hl, wOBPals2 palette PAL_BATTLE_OB_GRAY
|
||||
ld de, wOBPals1 palette PAL_BATTLE_OB_GRAY
|
||||
ldh a, [rOBP0]
|
||||
@@ -1446,7 +1446,7 @@ BattleAnim_SetOBPals:
|
||||
ld c, 2
|
||||
call CopyPals
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ld a, TRUE
|
||||
ldh [hCGBPalUpdate], a
|
||||
ret
|
||||
|
Reference in New Issue
Block a user