pret/poketcg
1
0
Fork 0
mirror of https://github.com/pret/poketcg.git synced 2026-10-05 23:40:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use more text symbols

Browse Source
This commit is contained in:
xCrystal
2018-07-03 20:13:45 +02:00
parent 5f7a0d866a
commit 5dd6746bd4
2 changed files with 75 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/constants/text_constants.asm
+49 -49
View File
@@ -21,52 +21,52 @@ done EQUS "db TX_END"
charmap "<", TX_SYMBOL
const_def
txsymbol SPACE
txsymbol FIRE
txsymbol GRASS
txsymbol LIGHTNING
txsymbol WATER
txsymbol FIGHTING
txsymbol PSYCHIC
txsymbol COLORLESS
txsymbol POISONED
txsymbol ASLEEP
txsymbol CONFUSED
txsymbol PARALYZED
txsymbol CURSOR_U
txsymbol POKEMON
txsymbol UNKNOWN_0E
txsymbol CURSOR_R
txsymbol HP
txsymbol Lv
txsymbol E
txsymbol No
txsymbol PLUSPOWER
txsymbol DEFENDER
txsymbol HP_OK
txsymbol HP_NOK
txsymbol BOX_TOP_L
txsymbol BOX_TOP_R
txsymbol BOX_BTM_L
txsymbol BOX_BTM_R
txsymbol BOX_TOP
txsymbol BOX_BOTTOM
txsymbol BOX_LEFT
txsymbol BOX_RIGHT
txsymbol 0
txsymbol 1
txsymbol 2
txsymbol 3
txsymbol 4
txsymbol 5
txsymbol 6
txsymbol 7
txsymbol 8
txsymbol 9
txsymbol DOT
txsymbol PLUS
txsymbol MINUS
txsymbol x
txsymbol SLASH
txsymbol CURSOR_D
txsymbol PRIZE
txsymbol SPACE ; $00
txsymbol FIRE ; $01
txsymbol GRASS ; $02
txsymbol LIGHTNING ; $03
txsymbol WATER ; $04
txsymbol FIGHTING ; $05
txsymbol PSYCHIC ; $06
txsymbol COLORLESS ; $07
txsymbol POISONED ; $08
txsymbol ASLEEP ; $09
txsymbol CONFUSED ; $0a
txsymbol PARALYZED ; $0b
txsymbol CURSOR_U ; $0c
txsymbol POKEMON ; $0d
txsymbol UNKNOWN_0E ; $0e
txsymbol CURSOR_R ; $0f
txsymbol HP ; $10
txsymbol Lv ; $11
txsymbol E ; $12
txsymbol No ; $13
txsymbol PLUSPOWER ; $14
txsymbol DEFENDER ; $15
txsymbol HP_OK ; $16
txsymbol HP_NOK ; $17
txsymbol BOX_TOP_L ; $18
txsymbol BOX_TOP_R ; $19
txsymbol BOX_BTM_L ; $1a
txsymbol BOX_BTM_R ; $1b
txsymbol BOX_TOP ; $1c
txsymbol BOX_BOTTOM ; $1d
txsymbol BOX_LEFT ; $1e
txsymbol BOX_RIGHT ; $1f
txsymbol 0 ; $20
txsymbol 1 ; $21
txsymbol 2 ; $22
txsymbol 3 ; $23
txsymbol 4 ; $24
txsymbol 5 ; $25
txsymbol 6 ; $26
txsymbol 7 ; $27
txsymbol 8 ; $28
txsymbol 9 ; $29
txsymbol DOT ; $2a
txsymbol PLUS ; $2b
txsymbol MINUS ; $2c
txsymbol x ; $2d
txsymbol SLASH ; $2e
txsymbol CURSOR_D ; $2f
txsymbol PRIZE ; $30
src/engine/home.asm
+26 -31
View File
@@ -3463,7 +3463,6 @@ SortCardsInListByID: ; 12ad (0:12ad)
ld l, a
ld e, l
ld d, h
; get ID of card with deck index at [de]
ld a, [de]
call GetCardIDFromDeckIndex_bc
@@ -3471,7 +3470,6 @@ SortCardsInListByID: ; 12ad (0:12ad)
ldh [hTempCardID_ff9b], a
ld a, b
ldh [hTempCardID_ff9b + 1], a ; 0
; hl = [hTempListPtr_ff99] + 1
inc hl
jr .check_list_end
@@ -3484,10 +3482,8 @@ SortCardsInListByID: ; 12ad (0:12ad)
jr nz, .go
ldh a, [hTempCardID_ff9b]
cp c
.go
jr c, .not_lower_id
; this card has the lowest ID of those checked so far
ld e, l
ld d, h
@@ -3495,14 +3491,11 @@ SortCardsInListByID: ; 12ad (0:12ad)
ldh [hTempCardID_ff9b], a
ld a, b
ldh [hTempCardID_ff9b + 1], a
.not_lower_id
inc hl
.check_list_end
bit 7, [hl] ; $ff is the list terminator
jr z, .next_card_in_list
; reached list terminator
ld hl, hTempListPtr_ff99
push hl
@@ -5638,8 +5631,8 @@ DrawRegularTextBox: ; 1e7c (0:1e7c)
DrawRegularTextBoxDMG: ; 1e88 (0:1e88)
call DECoordToBGMap0Address
; top line (border) of the text box
ld a, $1c
lb de, $18, $19
ld a, SYM_BOX_TOP
lb de, SYM_BOX_TOP_L, SYM_BOX_TOP_R
call CopyLine
; fallthrough
@@ -5647,14 +5640,14 @@ ContinueDrawingTextBoxDMGorSGB:
dec c
dec c
.draw_text_box_body_loop
ld a, $0
lb de, $1e, $1f
ld a, SYM_SPACE
lb de, SYM_BOX_LEFT, SYM_BOX_RIGHT
call CopyLine
dec c
jr nz, .draw_text_box_body_loop
; bottom line (border) of the text box
ld a, $1d
lb de, $1a, $1b
ld a, SYM_BOX_BOTTOM
lb de, SYM_BOX_BTM_L, SYM_BOX_BTM_R
; fallthrough
; copies b bytes of data to sp-$1f and to hl, and returns hl += BG_MAP_WIDTH
@@ -5696,8 +5689,8 @@ CopyLine: ; 1ea5 (0:1ea5)
DrawRegularTextBoxCGB:
call DECoordToBGMap0Address
; top line (border) of the text box
ld a, $1c
lb de, $18, $19
ld a, SYM_BOX_TOP
lb de, SYM_BOX_TOP_L, SYM_BOX_TOP_R
call CopyCurrentLineTilesAndAttrCGB
; fallthrough
@@ -5705,8 +5698,8 @@ ContinueDrawingTextBoxCGB:
dec c
dec c
.draw_text_box_body_loop
ld a, $0
lb de, $1e, $1f
ld a, SYM_SPACE
lb de, SYM_BOX_LEFT, SYM_BOX_RIGHT
push hl
call CopyLine
pop hl
@@ -5720,8 +5713,8 @@ ContinueDrawingTextBoxCGB:
dec c
jr nz, .draw_text_box_body_loop
; bottom line (border) of the text box
ld a, $1d
lb de, $1a, $1b
ld a, SYM_BOX_BOTTOM
lb de, SYM_BOX_BTM_L, SYM_BOX_BTM_R
call CopyCurrentLineTilesAndAttrCGB
ret
@@ -6206,24 +6199,24 @@ Func_22ca: ; 22ca (0:22ca)
and $1
jr nz, .asm_22ed
call Func_2325
jr c, .asm_22de
jr c, .tile_already_exists
or a
jr nz, .asm_22e9
jr nz, .done
call GenerateTextTile
.asm_22de
.tile_already_exists
ldh a, [hffb0]
and $2
jr nz, .asm_22e9
jr nz, .done
ldh a, [hffa9]
call PlaceNextTextTile
.asm_22e9
.done
pop bc
pop de
pop hl
ret
.asm_22ed
call Func_235e
jr .asm_22e9
jr .done
; writes a to wCurTextTile and to the tile pointed to by hTextBGMap0Address,
; then increments hTextBGMap0Address and hTextLineCurPos
@@ -7158,7 +7151,7 @@ CopyCardNameAndLevel: ; 29f5 (0:29f5)
; 0x29fa
Func_29fa: ; 29fa (0:29fa)
lb bc, $0f, $00 ; cursor tile, tile behind cursor
lb bc, SYM_CURSOR_R, SYM_SPACE ; cursor tile, tile behind cursor
call SetCursorParametersForTextBox
WaitForButtonAorB: ; 2a00 (0:2a00)
call DoFrame
@@ -7302,7 +7295,7 @@ TwoItemHorizontalMenu: ; 2ad0 (0:2ad0)
lb de, 6, 16 ; x, y
ld a, d
ld [wLeftmostItemCursorX], a
lb bc, $0f, $00 ; cursor tile, tile behind cursor
lb bc, SYM_CURSOR_R, SYM_SPACE ; cursor tile, tile behind cursor
call SetCursorParametersForTextBox
ld a, 1
ld [wCurMenuItem], a
@@ -7335,7 +7328,7 @@ YesOrNoMenuWithText_LeftAligned: ; 2afe (0:2afe)
HandleYesOrNoMenu:
ld a, d
ld [wLeftmostItemCursorX], a
lb bc, $0f, $00 ; cursor tile, tile behind cursor
lb bc, SYM_CURSOR_R, SYM_SPACE ; cursor tile, tile behind cursor
call SetCursorParametersForTextBox
ld a, [wcd9a]
ld [wCurMenuItem], a
@@ -7598,7 +7591,7 @@ Func_2c73: ; 2c73 (0:2c73)
call Func_2c84
Func_2c77: ; 2c77 (0:2c77)
lb bc, $2f, $1d ; cursor tile, tile behind cursor
lb bc, SYM_CURSOR_D, SYM_BOX_BOTTOM ; cursor tile, tile behind cursor
lb de, 18, 17 ; x, y
call SetCursorParametersForTextBox
call WaitForButtonAorB
@@ -8120,8 +8113,10 @@ GetCardPointer: ; 2f7c (0:2f7c)
pop de
ret
; input: hl = card_gfx_index, de = where to load the card gfx to
; bc are supposed to be $30 and TILE_SIZE
; input:
; hl = card_gfx_index
; de = where to load the card gfx to
; bc are supposed to be $30 (number of tiles of a card gfx) and TILE_SIZE respectively
; card_gfx_index = (<Name>CardGfx - CardGraphics) / 8 ; using absolute ROM addresses
; also copies the card's palette to wCardPalette
LoadCardGfx: ; 2fa0 (0:2fa0)