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

Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

Browse Source 
# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm
This commit is contained in:
Remy Oukaour
2018-01-14 22:56:36 -05:00
parent 8e1e583640 2c789b64b1
commit 5c28d05bb4
249 changed files with 1382 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
engine/battle_anims/anim_commands.asm
View File

@@ -1,6 +1,6 @@
; Battle animation command interpreter.
PlayBattleAnim: ; cc0d6
Predef_PlayBattleAnim: ; cc0d6
ld a, [rSVBK]
push af
@@ -167,7 +167,7 @@ BattleAnimRestoreHuds: ; cc1bb
ld [rSVBK], a
ld hl, UpdateBattleHuds
ld a, BANK(UpdatePlayerHUD)
ld a, BANK(Predef_UpdatePlayerHUD)
rst FarCall ; Why not "call UpdateBattleHuds"?
pop af
@@ -232,8 +232,7 @@ ClearActorHud: ; cc207
ret
; cc220
Functioncc220: ; cc220
; Appears to be unused.
Unreferenced_Functioncc220: ; cc220
xor a
ld [hBGMapMode], a
ld a, LOW(vBGMap0 tile $28)
@@ -929,18 +928,18 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
ld a, [TempBattleMonSpecies] ; TempBattleMonSpecies
ld [CurPartySpecies], a ; CurPartySpecies
ld hl, BattleMonDVs ; BattleMonDVs
predef GetUnownLetter
predef Predef_GetUnownLetter
ld de, vTiles0 tile $00
predef GetMonFrontpic
predef Predef_GetMonFrontpic
jr .done
.player
ld a, [TempEnemyMonSpecies] ; TempEnemyMonSpecies
ld [CurPartySpecies], a ; CurPartySpecies
ld hl, EnemyMonDVs ; EnemyMonDVs
predef GetUnownLetter
predef Predef_GetUnownLetter
ld de, vTiles0 tile $00
predef GetMonBackpic
predef Predef_GetMonBackpic
.done
pop af
@@ -1156,16 +1155,16 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776)
jr z, .player
ld hl, BattleMonDVs
predef GetUnownLetter
predef Predef_GetUnownLetter
ld de, vTiles2 tile $00
predef GetMonFrontpic
predef Predef_GetMonFrontpic
jr .done
.player
ld hl, EnemyMonDVs
predef GetUnownLetter
predef Predef_GetUnownLetter
ld de, vTiles2 tile $31
predef GetMonBackpic
predef Predef_GetMonBackpic
.done
pop af