pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Prepare to merge

Browse Source
This commit is contained in:
PikalaxALT
2016-01-18 00:39:01 -05:00
parent 7cc2571529
commit 8bf255b9f8
14 changed files with 301 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
home/audio.asm
View File

@@ -506,18 +506,18 @@ Function3d9f:: ; 3d9f
; Places a BCD number at the
; upper center of the screen.
; Unreferenced.
ld a, $20
ld [Sprites + $98], a
ld [Sprites + $9c], a
ld a, $50
ld [Sprites + $99], a
ld a, $58
ld [Sprites + $9d], a
ld a, 4 * 8
ld [Sprites + 38 * 4], a
ld [Sprites + 39 * 4], a
ld a, 10 * 8
ld [Sprites + 38 * 4 + 1], a
ld a, 11 * 8
ld [Sprites + 39 * 4 + 1], a
xor a
ld [Sprites + $9b], a
ld [Sprites + $9f], a
ld [Sprites + 38 * 4 + 3], a
ld [Sprites + 39 * 4 + 3], a
ld a, [wc296]
cp $64
cp 100
jr nc, .max
add 1
daa
@@ -525,17 +525,17 @@ Function3d9f:: ; 3d9f
swap a
and $f
add "0"
ld [Sprites + $9a], a
ld [Sprites + 38 * 4 + 2], a
ld a, b
and $f
add "0"
ld [Sprites + $9e], a
ld [Sprites + 39 * 4 + 2], a
ret
.max
ld a, "9"
ld [Sprites + $9a], a
ld [Sprites + $9e], a
ld [Sprites + 38 * 4 + 2], a
ld [Sprites + 39 * 4 + 2], a
ret
; 3dde

4
home/text.asm
View File

@@ -399,7 +399,7 @@ PlaceEnemysName:: ; 121b
cp RIVAL2
jr z, .rival
ld de, OTName
ld de, OTClassName
call PlaceString
ld h, b
ld l, c
@@ -416,7 +416,7 @@ PlaceEnemysName:: ; 121b
jr PlaceCommandCharacter
.linkbattle
ld de, OTName
ld de, OTClassName
jr PlaceCommandCharacter