summaryrefslogtreecommitdiff
path: root/engine/predefs.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-06-06 16:03:47 -0700
committeryenatch <yenatch@gmail.com>2014-06-06 16:03:47 -0700
commit35493bef27ba0425860a0f419c64371b824b6981 (patch)
treeb57de4968c66fc768f404e3dd03849b1fd64eace /engine/predefs.asm
parent80f7845a0771c1666288f22dba2c3c8e6a308f26 (diff)
parent32de1b269468f48d073a8e6d52843877baff0ba4 (diff)
Merge remote-tracking branch 'danny/master'
Diffstat (limited to 'engine/predefs.asm')
-rwxr-xr-xengine/predefs.asm5
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/predefs.asm b/engine/predefs.asm
index 2f4e68df..e0df874f 100755
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -113,11 +113,12 @@ MoveAnimationPredef: ; 4fe91 (13:7e91)
dbw BANK(Func_5a5f),Func_5a5f
dbw BANK(DrawBadges), DrawBadges
dbw BANK(Func_410f3),Func_410f3
- dbw BANK(Func_7096d),Func_7096d
+ dbw BANK(BattleTransition),BattleTransition
dbw BANK(Func_79dda),Func_79dda
dbw BANK(PlayIntro),PlayIntro
dbw BANK(Func_79869),Func_79869
- dbw BANK(Func_70b5d),Func_70b5d
+ db BANK(BattleTransition_FlashScreen_)
+ dw BattleTransition_FlashScreen_
dbw BANK(Func_c586),Func_c586
dbw BANK(StatusScreen),StatusScreen ; 37 0x12953
dbw BANK(StatusScreen2),StatusScreen2 ; 38