summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2016-03-01 22:31:21 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2016-03-01 22:31:21 -0500
commit599e6e8d16571235f2054aa38f39e66181da3796 (patch)
tree9d3670e3329a17f076ea95fc721fd7501354a984 /main.asm
parente044b8ec08fee4a5d4f9cd942551ff94f2577b76 (diff)
Battle animation annotations
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/main.asm b/main.asm
index 1440d7933..90b6ef046 100644
--- a/main.asm
+++ b/main.asm
@@ -3799,7 +3799,7 @@ BikeFunction: ; d0b3
ld hl, Script_GetOffBike
ld de, Script_GetOffBike_Register
call .CheckIfRegistered
- ld a, $3
+ ld a, BANK(Script_GetOffBike)
jr .done
.CantGetOffBike
@@ -6275,7 +6275,7 @@ ShowLinkBattleParticipants: ; 2ee18
call ClearSprites
ret
-FindFirstAliveMon: ; 2ee2f
+FindFirstAliveMonAndStartBattle: ; 2ee2f
xor a
ld [hMapAnims], a
call DelayFrame
@@ -10522,8 +10522,8 @@ Function8c7c9: ; unreferenced
INCLUDE "event/field_moves.asm"
INCLUDE "event/magnet_train.asm"
-Function8cf4f: ; 8cf4f
- call Function3238
+BattleStart_LoadEDTile: ; 8cf4f
+ call CGBOnly_LoadEDTile
ret
INCLUDE "engine/sprites.asm"