diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
| commit | dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch) | |
| tree | 3618582f76f4183b6bc22c5d4743b6d171d11128 /engine/battle/d.asm | |
| parent | 1185d69819af3493fe8ace9f576fee4b420db55e (diff) | |
| parent | 2ed65d9c3e3ba60939ebe2928ffddc06a90b1876 (diff) | |
Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
constants/misc_constants.asm
engine/battle/core.asm
engine/menu/pokedex.asm
engine/town_map.asm
home.asm
hram.asm
Diffstat (limited to 'engine/battle/d.asm')
| -rwxr-xr-x | engine/battle/d.asm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engine/battle/d.asm b/engine/battle/d.asm index d23c9114..94a07eb6 100755 --- a/engine/battle/d.asm +++ b/engine/battle/d.asm @@ -1,21 +1,23 @@ -Func_372d6: ; 372d6 (d:72d6) +; display "[player] VS [enemy]" text box with pokeballs representing their parties next to the names +DisplayLinkBattleVersusTextBox: ; 372d6 (d:72d6) call LoadTextBoxTilePatterns hlCoord 3, 4 ld b, $7 ld c, $c call TextBoxBorder hlCoord 4, 5 - ld de, wPlayerName ; wd158 + ld de, wPlayerName call PlaceString hlCoord 4, 10 - ld de, W_GRASSRATE ; W_GRASSRATE + ld de, W_GRASSRATE ; enemy name call PlaceString +; place bold "VS" tiles between the names hlCoord 9, 8 ld a, $69 ld [hli], a ld [hl], $6a xor a - ld [wcfcb], a + ld [wUpdateSpritesEnabled], a callab SetupPlayerAndEnemyPokeballs - ld c, $96 + ld c, 150 jp DelayFrames |