diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-01 21:54:11 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-01 21:54:11 -0500 |
| commit | 92a8c491c3a8c39a7c51b300d759f93aa5157447 (patch) | |
| tree | 2b0fca0ca289327e65b3b4339f1523f6060c4437 /event | |
| parent | ffbf2c0f5d28c05c14f67a3cfb123d37157c2ef9 (diff) | |
Break up engine/sprites.asm; address yenatch's comments
Diffstat (limited to 'event')
| -rwxr-xr-x | event/celebi.asm | 2 | ||||
| -rwxr-xr-x | event/field_moves.asm | 12 | ||||
| -rwxr-xr-x | event/magnet_train.asm | 2 | ||||
| -rwxr-xr-x | event/sweet_scent.asm | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/event/celebi.asm b/event/celebi.asm index 0c7327447..e829a1494 100755 --- a/event/celebi.asm +++ b/event/celebi.asm @@ -67,7 +67,7 @@ endr ; 49912 LoadCelebiGFX: ; 49912 - callba Function8cf53 + callba ClearSpriteAnims ld de, SpecialCelebiLeafGFX ld hl, VTiles1 lb bc, BANK(SpecialCelebiLeafGFX), 4 diff --git a/event/field_moves.asm b/event/field_moves.asm index 47915814b..cb31d26c6 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -20,7 +20,7 @@ BlindingFlash: ; 8c7e1 ; 8c80a ShakeHeadbuttTree: ; 8c80a - callba Function8cf53 + callba ClearSpriteAnims ld de, CutGrassGFX ld hl, VTiles1 lb bc, BANK(CutGrassGFX), 4 @@ -35,7 +35,7 @@ ShakeHeadbuttTree: ; 8c80a ld hl, $3 add hl, bc ld [hl], $84 - ld a, $90 + ld a, 36 * 4 ld [wc3b5], a callba DoNextFrameForAllSprites call GetHeadbuttTreeRelativeLocation @@ -50,7 +50,7 @@ ShakeHeadbuttTree: ; 8c80a and a jr z, .done dec [hl] - ld a, $90 + ld a, 36 * 4 ld [wc3b5], a callba DoNextFrameForAllSprites call DelayFrame @@ -61,7 +61,7 @@ ShakeHeadbuttTree: ; 8c80a call WaitBGMap xor a ld [hBGMapMode], a - callba Function8cf53 + callba ClearSpriteAnims ld hl, Sprites + 36 * 4 ld bc, SpritesEnd - (Sprites + 36 * 4) xor a @@ -136,7 +136,7 @@ OWCutAnimation: ; 8c940 ; 8c96d .LoadCutGFX: ; 8c96d - callab Function8cf53 ; pointless to farcall + callab ClearSpriteAnims ; pointless to farcall ld de, CutGrassGFX ld hl, VTiles1 lb bc, BANK(CutGrassGFX), 4 @@ -411,7 +411,7 @@ endr ret Function8cb9b: ; 8cb9b (23:4b9b) - callab Function8cf53 + callab ClearSpriteAnims ld de, CutGrassGFX ld hl, VTiles1 tile $00 lb bc, BANK(CutGrassGFX), 4 diff --git a/event/magnet_train.asm b/event/magnet_train.asm index dfc12b85a..624e76084 100755 --- a/event/magnet_train.asm +++ b/event/magnet_train.asm @@ -117,7 +117,7 @@ Function8ccc9: ; 8ccc9 call ClearBGPalettes call ClearSprites call DisableLCD - callab Function8cf53 + callab ClearSpriteAnims call SetMagnetTrainPals call DrawMagnetTrain ld a, $90 diff --git a/event/sweet_scent.asm b/event/sweet_scent.asm index 5493d8841..73dae7dc7 100755 --- a/event/sweet_scent.asm +++ b/event/sweet_scent.asm @@ -16,7 +16,7 @@ UnknownScript_0x506c8: ; 0x506c8 iffalse UnknownScript_0x506e9 checkflag ENGINE_BUG_CONTEST_TIMER iftrue UnknownScript_0x506e5 - setup_random_encounter + randomwildmon startbattle returnafterbattle end |