diff options
| author | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
| commit | 7aef59841489ea449b9a34d424c681a4b48b88ab (patch) | |
| tree | 72d46f1cc076564f62b11f5379960cd745a7fc9a /engine/trainer_card.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/trainer_card.asm')
| -rwxr-xr-x | engine/trainer_card.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 4898d657a..b6fac7f7c 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -118,7 +118,7 @@ TrainerCard_Page1_Joypad: ; 251d7 (9:51d7) ld [wJumptableIndex], a ret -.KantoCheck +.KantoCheck: ; unreferenced ld a, [KantoBadges] and a @@ -164,7 +164,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221) ld [wJumptableIndex], a ret -.KantoCheck +.KantoCheck: ; unreferenced ld a, [KantoBadges] and a @@ -173,7 +173,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221) ld [wJumptableIndex], a ret -.Quit +.Quit: ld a, $6 ld [wJumptableIndex], a ret @@ -289,11 +289,11 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a) call ClearBox ret -.Dex_PlayTime +.Dex_PlayTime: db "#DEX" next "PLAY TIME@@" -.Badges +.Badges: db " BADGES▶@" .StatusTilemap: ; 25366 @@ -540,7 +540,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448) ; 254a7 (9:54a7) -.facing1: ; 254a7 +.facing1 ; 254a7 ; y, x, tile, OAM attributes db 0, 0, 0, 0 db 0, 8, 1, 0 @@ -548,7 +548,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448) db 8, 8, 3, 0 db -1 -.facing2: ; 254b8 +.facing2 ; 254b8 db 0, 0, 1, X_FLIP db 0, 8, 0, X_FLIP db 8, 0, 3, X_FLIP |