Merge remote-tracking branch 'danny/master'

This commit is contained in:
yenatch 2014-06-06 16:03:47 -07:00
commit 35493bef27
19 changed files with 306 additions and 330 deletions

View file

@ -243,7 +243,7 @@ Credits: ; 7418e (1d:418e)
call CopyVideoData
FuncCoord 4, 8
ld hl, Coord
ld de, UnnamedText_74229 ; $4229
ld de, TheEndTextString
call PlaceString
FuncCoord 4, 9
ld hl, Coord
@ -251,7 +251,8 @@ Credits: ; 7418e (1d:418e)
call PlaceString
jp Func_740ba
UnnamedText_74229: ; 74229 (1d:4229)
TheEndTextString: ; 74229 (1d:4229)
; "T H E E N D"
db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@"
db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@"

File diff suppressed because it is too large Load diff

View file

@ -6213,7 +6213,7 @@ Func_3ec32: ; 3ec32 (f:6c32)
.asm_3ec4d
call DelayFrame
ld a, $30
call Predef ; indirect jump to Func_7096d (7096d (1c:496d))
call Predef ; indirect jump to BattleTransition (7096d (1c:496d))
callab Func_3ee58
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba

View file

@ -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