pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

More WRAM cleanup

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-09 19:41:03 -05:00
parent 880fb511e1
commit cd2a748128
34 changed files with 1043 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
battle/anim_commands.asm
View File

@@ -57,7 +57,7 @@ _PlayBattleAnim: ; cc0e4
BattleAnimRunScript: ; cc11c
ld a, [FXAnimIDHi]
ld a, [FXAnimID + 1]
and a
jr nz, .hi_byte
@@ -86,9 +86,9 @@ BattleAnimRunScript: ; cc11c
ld de, ANIM_MISS
add hl, de
ld a, l
ld [FXAnimIDLo], a
ld [FXAnimID], a
ld a, h
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
.hi_byte
call WaitSFX
@@ -112,11 +112,11 @@ RunBattleAnimScript: ; cc163
call BattleAnimRequestPals
; Speed up Rollout's animation.
ld a, [FXAnimIDHi]
ld a, [FXAnimID + 1]
or a
jr nz, .not_rollout
ld a, [FXAnimIDLo]
ld a, [FXAnimID]
cp ROLLOUT
jr nz, .not_rollout
@@ -1393,7 +1393,7 @@ ClearBattleAnims: ; cc8d3
or b
jr nz, .loop
ld hl, FXAnimIDLo
ld hl, FXAnimID
ld e, [hl]
inc hl
ld d, [hl]

4
battle/bg_effects.asm
View File

@@ -1538,10 +1538,10 @@ Tackle_BGEffect25_2d_two:
Functionc88a5: ; c88a5 (32:48a5)
push af
ld a, [FXAnimIDHi] ; FXAnimIDHi
ld a, [FXAnimID + 1] ; FXAnimID + 1
or a
jr nz, .not_rollout
ld a, [FXAnimIDLo] ; FXAnimID
ld a, [FXAnimID] ; FXAnimID
cp ROLLOUT
jr z, .rollout
.not_rollout

32
battle/core.asm
View File

@@ -633,7 +633,7 @@ ParsePlayerAction: ; 3c434
xor a
ld [wMoveSelectionMenuType], a
inc a ; POUND
ld [FXAnimIDLo], a
ld [FXAnimID], a
call MoveSelectionScreen
push af
call Call_LoadTempTileMapToTileMap
@@ -1305,7 +1305,7 @@ HandleWrap: ; 3c874
ld a, [de]
ld [wd265], a
ld [FXAnimIDLo], a
ld [FXAnimID], a
call GetMoveName
dec [hl]
jr z, .release_from_bounds
@@ -1318,7 +1318,7 @@ HandleWrap: ; 3c874
call SwitchTurnCore
xor a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
predef PlayBattleAnim
call SwitchTurnCore
@@ -4213,7 +4213,7 @@ SendOutPlayerMon: ; 3db5f
call GetMonBackpic
xor a
ld [hGraphicStartTile], a
ld [wd0d2], a
ld [wBattleMenuCursorBuffer], a
ld [CurMoveNum], a
ld [TypeModifier], a
ld [wPlayerMoveStruct + MOVE_ANIM], a
@@ -4551,11 +4551,11 @@ ItemRecoveryAnim: ; 3ddc8
push bc
call EmptyBattleTextBox
ld a, RECOVER
ld [FXAnimIDLo], a
ld [FXAnimID], a
call SwitchTurnCore
xor a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
predef PlayBattleAnim
call SwitchTurnCore
pop bc
@@ -5130,7 +5130,7 @@ BattleMenu: ; 3e139
.next
ld a, $1
ld [hBGMapMode], a
ld a, [wd0d2]
ld a, [wBattleMenuCursorBuffer]
cp $1
jp z, BattleMenu_Fight
cp $3
@@ -6415,7 +6415,7 @@ LoadEnemyMon: ; 3e8eb
callab CalcMagikarpLength
; We're clear if the length is < 1536
ld a, [MagikarpLength]
ld a, [wMagikarpLength]
cp a, $06 ; $600 = 1536
jr nz, .CheckMagikarpArea
@@ -6424,7 +6424,7 @@ LoadEnemyMon: ; 3e8eb
cp a, $0c ; / $100
jr c, .CheckMagikarpArea
; Try again if > 1614
ld a, [MagikarpLength + 1]
ld a, [wMagikarpLength + 1]
cp a, $50
jr nc, .GenerateDVs
@@ -6433,7 +6433,7 @@ LoadEnemyMon: ; 3e8eb
cp a, $32 ; / $100
jr c, .CheckMagikarpArea
; Try again if > 1598
ld a, [MagikarpLength + 1]
ld a, [wMagikarpLength + 1]
cp a, $40
jr nc, .GenerateDVs
@@ -6458,7 +6458,7 @@ LoadEnemyMon: ; 3e8eb
cp a, $64 ; / $100
jr c, .Happiness
; Floor at length 1024
ld a, [MagikarpLength]
ld a, [wMagikarpLength]
cp a, 1024 >> 8
jr c, .GenerateDVs ; try again
@@ -6588,7 +6588,7 @@ LoadEnemyMon: ; 3e8eb
ld [hli], a
ld [hl], a
; Make sure the predef knows this isn't a partymon
ld [MagikarpLength], a
ld [wEvolutionOldSpecies], a
; Fill moves based on level
predef FillMoves
@@ -7285,9 +7285,9 @@ Call_PlayBattleAnim_OnlyIfVisible: ; 3ee0f
Call_PlayBattleAnim: ; 3ee17
ld a, e
ld [FXAnimIDLo], a
ld [FXAnimID], a
ld a, d
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
call WaitBGMap
predef_jump PlayBattleAnim
; 3ee27
@@ -8405,7 +8405,7 @@ BattleIntro: ; 3f4dd
call LoadTrainerOrWildMonPic
xor a
ld [TempBattleMonSpecies], a
ld [wd0d2], a
ld [wBattleMenuCursorBuffer], a
xor a
ld [hMapAnims], a
callba PlayBattleMusic
@@ -8670,7 +8670,7 @@ CleanUpBattleRAM: ; 3f6d0
ld [wPartyMenuCursor], a
ld [wKeyItemsPocketCursor], a
ld [wItemsPocketCursor], a
ld [wd0d2], a
ld [wBattleMenuCursorBuffer], a
ld [CurMoveNum], a
ld [wBallsPocketCursor], a
ld [wLastPocket], a

24
battle/effect_commands.asm
View File

@@ -2103,7 +2103,7 @@ BattleCommand_LowerSub: ; 34eee
xor a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
inc a
ld [wKickCounter], a
ld a, SUBSTITUTE
@@ -2280,7 +2280,7 @@ BattleCommand_RaiseSub: ; 35004
xor a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
ld a, $2
ld [wKickCounter], a
ld a, SUBSTITUTE
@@ -2645,7 +2645,7 @@ BattleCommand_CheckDestinyBond: ; 351c0
call BattleCommand_SwitchTurn
xor a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
inc a
ld [wKickCounter], a
ld a, DESTINY_BOND
@@ -4738,9 +4738,9 @@ FarPlayBattleAnimation: ; 35d00
PlayFXAnimID: ; 35d08
ld a, e
ld [FXAnimIDLo], a
ld [FXAnimID], a
ld a, d
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
ld c, 3
call DelayFrames
@@ -7882,7 +7882,7 @@ BattleCommand_Substitute: ; 36e7c
xor a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
ld [wKickCounter], a
ld a, SUBSTITUTE
call LoadAnim
@@ -9862,14 +9862,14 @@ AnimateCurrentMove: ; 37e01
PlayDamageAnim: ; 37e19
xor a
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
and a
ret z
ld [FXAnimIDLo], a
ld [FXAnimID], a
ld a, [hBattleTurn]
and a
@@ -9888,7 +9888,7 @@ PlayDamageAnim: ; 37e19
LoadMoveAnim: ; 37e36
xor a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
@@ -9901,7 +9901,7 @@ LoadMoveAnim: ; 37e36
LoadAnim: ; 37e44
ld [FXAnimIDLo], a
ld [FXAnimID], a
; fallthrough
; 37e47
@@ -9922,9 +9922,9 @@ PlayUserBattleAnim: ; 37e47
PlayOpponentBattleAnim: ; 37e54
ld a, e
ld [FXAnimIDLo], a
ld [FXAnimID], a
ld a, d
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
xor a
ld [wNumHits], a

4
battle/effects/transform.asm
View File

@@ -11,7 +11,7 @@ BattleCommand_Transform: ; 371cd
jp nz, BattleEffect_ButItFailed
xor a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
ld a, $1
ld [wKickCounter], a
ld a, BATTLE_VARS_SUBSTATUS4
@@ -129,7 +129,7 @@ BattleCommand_Transform: ; 371cd
.after_anim
xor a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld [FXAnimID + 1], a
ld a, $2
ld [wKickCounter], a
pop af

10
battle/magikarp_length.asm
View File

@@ -1,5 +1,5 @@
CalcMagikarpLength: ; fbbfc
; Return Magikarp's length (in mm) at MagikarpLength (big endian).
; Return Magikarp's length (in mm) at wMagikarpLength (big endian).
;
; input:
; de: EnemyMonDVs
@@ -16,9 +16,9 @@ CalcMagikarpLength: ; fbbfc
; bc = rrc(dv[0]) ++ rrc(dv[1]) ^ rrc(id)
; if bc < 10: [MagikarpLength] = c + 190
; if bc >= $ff00: [MagikarpLength] = c + 1370
; else: [MagikarpLength] = z * 100 + (bc - x) / y
; if bc < 10: [wMagikarpLength] = c + 190
; if bc >= $ff00: [wMagikarpLength] = c + 1370
; else: [wMagikarpLength] = z * 100 + (bc - x) / y
; X, Y, and Z depend on the value of b as follows:
@@ -165,7 +165,7 @@ CalcMagikarpLength: ; fbbfc
.ok
ld e, a
ld hl, MagikarpLength
ld hl, wMagikarpLength
ld [hl], d
inc hl
ld [hl], e

8
battle/menu.asm
View File

@@ -1,11 +1,11 @@
LoadBattleMenu: ; 24ef2
ld hl, BattleMenuDataHeader
call LoadMenuDataHeader
ld a, [wd0d2]
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
call InterpretBattleMenu
ld a, [wMenuCursorBuffer]
ld [wd0d2], a
ld [wBattleMenuCursorBuffer], a
call ExitMenu
ret
; 24f0b
@@ -23,11 +23,11 @@ ContestBattleMenu: ; 24f13
; 24f19
Function24f19: ; 24f19
ld a, [wd0d2]
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
call _2DMenu
ld a, [wMenuCursorBuffer]
ld [wd0d2], a
ld [wBattleMenuCursorBuffer], a
call ExitMenu
ret
; 24f2c

4
battle/objects/engine.asm
View File

@@ -249,10 +249,10 @@ InitBattleAnimBuffer: ; ccaaa
.check_kinesis_softboiled_milkdrink
sub d
push af
ld a, [FXAnimIDHi]
ld a, [FXAnimID + 1]
or a
jr nz, .no_sub
ld a, [FXAnimIDLo]
ld a, [FXAnimID]
cp KINESIS
jr z, .kinesis
cp SOFTBOILED