diff options
| author | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
| commit | 973721491c38aa3014f5b28982227a618d2f6b59 (patch) | |
| tree | e01415064e6da53a471d75b2eb0113846650322b /home/battle.asm | |
| parent | a3c6931fa8edd09fcea678fd8d2e9988951380de (diff) | |
| parent | 0b5471f385d3cc66bb4ae7aa4191ce3af9f50cac (diff) | |
Merge remote-tracking branch 'kanzure/master' into gfx-script
Diffstat (limited to 'home/battle.asm')
| -rw-r--r-- | home/battle.asm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/home/battle.asm b/home/battle.asm index 758c15ae1..9b89e673c 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -91,7 +91,7 @@ UpdateBattleMonInParty:: ; 399c ld a, [CurBattleMon] -Function399f:: ; 399f +UpdateBattleMon:: ; 399f ld hl, PartyMon1Level call GetPartyLocation @@ -153,8 +153,9 @@ GetBattleVarAddr:: ; 39e7 ld hl, .battlevarpairs ld c, a ld b, 0 +rept 2 add hl, bc - add hl, bc +endr ld a, [hli] ld h, [hl] @@ -174,8 +175,9 @@ GetBattleVarAddr:: ; 39e7 ld b, 0 ld hl, .vars +rept 2 add hl, bc - add hl, bc +endr ld a, [hli] ld h, [hl] @@ -260,7 +262,7 @@ GetBattleVarAddr:: ; 39e7 ; 3a90 -Function3a90:: ; 3a90 +FarJumpText:: ; 3a90 inc hl ld a, [hROMBank] push af @@ -310,7 +312,7 @@ BattleTextBox:: ; 3ac3 push hl call SpeechTextBox call MobileTextBorder - call Function1ad2 + call DrawOnMap call Function321c pop hl call PrintTextBoxText |