aboutsummaryrefslogtreecommitdiffstats
path: root/yellow
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-03-17 18:22:37 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-03-17 18:22:37 -0400
commit29b6c60cb7801a4b240f398dd85938f020190234 (patch)
tree5715b7675a9576513b7e716886bbef27703d7c4e /yellow
parentSplit bank3 up. (diff)
downloadpokeyellow-29b6c60cb7801a4b240f398dd85938f020190234.tar.gz
pokeyellow-29b6c60cb7801a4b240f398dd85938f020190234.tar.xz
pokeyellow-29b6c60cb7801a4b240f398dd85938f020190234.zip
Replaced some wram labels before committing, need to commit now.
Diffstat (limited to 'yellow')
-rwxr-xr-xyellow/main.asm27
1 files changed, 2 insertions, 25 deletions
diff --git a/yellow/main.asm b/yellow/main.asm
index e3602d65..d39c431b 100755
--- a/yellow/main.asm
+++ b/yellow/main.asm
@@ -809,31 +809,8 @@ PKMNLeaguePC: ; 75dfe (1d:5dfe)
SECTION "bank1E",ROMX,BANK[$1E]
- dr $78000,$78757
-AnimationTileset2: ; 78757 (1e:4757)
- dr $78757,$78c17
-SlotMachineTiles2: ; 78c17 (1e:4c17)
- dr $78c17,$78e98
-Func_78e98: ; 78e98 (1e:4e98)
- dr $78e98,$79349
-AnimationSlideMonOff: ; 79349 (1e:5349)
- dr $79349,$79353
-AnimationSlideEnemyMonOff: ; 79353 (1e:5353)
- dr $79353,$7966e
-AnimationMinimizeMon: ; 7966e (1e:566e)
- dr $7966e,$797af
-AnimationSubstitute: ; 797af (1e:57af)
- dr $797af,$79816
-HideSubstituteShowMonAnim: ; 79816 (1e:5816)
- dr $79816,$798b2
-ReshowSubstituteAnim: ; 798b2 (1e:58b2)
- dr $798b2,$798c8
-AnimationTransformMon: ; 798c8 (1e:58c8)
- dr $798c8,$798d4
-ChangeMonPic: ; 798d4 (1e:58d4)
- dr $798d4,$79929
-Func_79929: ; 79929 (1e:5929)
- dr $79929,$7a037
+INCLUDE "engine/battle/animations_.asm"
+
AnimCut: ; 7a037 (1e:6037)
dr $7a037,$7a0fb
AnimateBoulderDust: ; 7a0fb (1e:60fb)