diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 18:21:53 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 19:42:56 -0500 |
| commit | 32ed487a476e01759d3d9dbc818d8566ae2c9cb7 (patch) | |
| tree | 669e90b56d36f17efff5f673235193f5298c0ceb /engine/pic_animation.asm | |
| parent | 6ff2cb20e67db2054486fc5dc48eb9263298d4ad (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
Diffstat (limited to 'engine/pic_animation.asm')
| -rw-r--r-- | engine/pic_animation.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index e4ddb403a..8781c2fd0 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -267,7 +267,7 @@ PokeAnim_CryNoWait: ; d0188 PokeAnim_StereoCry: ; d0196 ld a, $f - ld [CryTracks], a + ld [wCryTracks], a ld a, [wPokeAnimSpecies] call PlayStereoCry2 ld a, [wPokeAnimSceneIndex] @@ -291,7 +291,7 @@ PokeAnim_DeinitFrames: ; d01a9 ; d01c6 AnimateMon_CheckIfPokemon: ; d01c6 - ld a, [CurPartySpecies] + ld a, [wCurPartySpecies] cp EGG jr z, .fail call IsAPokemon @@ -326,7 +326,7 @@ PokeAnim_InitPicAttributes: ; d01d6 ld [wPokeAnimPointer], a ld a, b ld [wPokeAnimPointer + 1], a -; hl contains TileMap coords +; hl contains tilemap coords ld a, l ld [wPokeAnimCoord], a ld a, h @@ -335,13 +335,13 @@ PokeAnim_InitPicAttributes: ; d01d6 ld a, d ld [wPokeAnimGraphicStartTile], a - ld a, BANK(CurPartySpecies) - ld hl, CurPartySpecies + ld a, BANK(wCurPartySpecies) + ld hl, wCurPartySpecies call GetFarWRAMByte ld [wPokeAnimSpecies], a - ld a, BANK(UnownLetter) - ld hl, UnownLetter + ld a, BANK(wUnownLetter) + ld hl, wUnownLetter call GetFarWRAMByte ld [wPokeAnimUnownLetter], a @@ -938,7 +938,7 @@ PokeAnim_GetAttrMapCoord: ; d0551 ld a, [hli] ld h, [hl] ld l, a - ld de, AttrMap - TileMap + ld de, wAttrMap - wTileMap add hl, de ret ; d055c @@ -1001,12 +1001,12 @@ GetMonAnimPointer: ; d055c PokeAnim_GetFrontpicDims: ; d05b4 ld a, [rSVBK] push af - ld a, BANK(CurPartySpecies) + ld a, BANK(wCurPartySpecies) ld [rSVBK], a - ld a, [CurPartySpecies] - ld [CurSpecies], a + ld a, [wCurPartySpecies] + ld [wCurSpecies], a call GetBaseData - ld a, [BasePicSize] + ld a, [wBasePicSize] and $f ld c, a pop af @@ -1136,6 +1136,6 @@ HOF_AnimateFrontpic: ; d066e xor a ld [wBoxAlignment], a inc a - ld [CurPartySpecies], a + ld [wCurPartySpecies], a ret ; d0695 |