thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add macro TX_BCD for printing BCD numbers.

Browse source 
This fixes some more static wram addresses.
This commit is contained in:
yenatch 2014-05-27 11:09:08 -07:00
parent f16f07c5ca
commit ea05c44163
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
macros.asm
View file

@ -131,6 +131,12 @@ TX_RAM: MACRO
dw \1 dw \1
ENDM ENDM
TX_BCD: MACRO
db $2
dw \1
db \2
ENDM
; Predef macro. ; Predef macro.
PREDEF: MACRO PREDEF: MACRO
ld a, (\1 - PredefPointers) / 3 ld a, (\1 - PredefPointers) / 3

17
text.asm
View file

@ -992,13 +992,13 @@ _HiddenItemBagFullText:: ; 894e1 (22:54e1)
_FoundHiddenCoinsText:: ; 8950b (22:550b) _FoundHiddenCoinsText:: ; 8950b (22:550b)
text $52, " found" text $52, " found"
line "@" line "@"
db $2, $a0, $ff, $c2 ; XXX $2 TX_BCD $ffa0, $c2
text " coins!@@" text " coins!@@"
_FoundHiddenCoins2Text:: ; 89523 (22:5523) _FoundHiddenCoins2Text:: ; 89523 (22:5523)
text $52, " found" text $52, " found"
line "@" line "@"
db $2, $a0, $ff, $c2 ; XXX $2 probably coins TX_BCD $ffa0, $c2
text " coins!@@" text " coins!@@"
_DroppedHiddenCoinsText:: ; 8953b (22:553b) _DroppedHiddenCoinsText:: ; 8953b (22:553b)
@ -1091,8 +1091,7 @@ _EnemyMonFaintedText:: ; 0x896c7
_MoneyForWinningText:: ; 896dd (22:56dd) _MoneyForWinningText:: ; 896dd (22:56dd)
text $52, " got ¥@" text $52, " got ¥@"
;XXX $2 TX_BCD wd079, $c3
db $2, $79, $d0, $c3
db $0 db $0
line "for winning!" line "for winning!"
prompt prompt
@ -1549,12 +1548,10 @@ _SafariZoneAngryText:: ; 89d6a (22:5d6a)
prompt prompt
; money related ; money related
; XXX $2 BCD macro
; $2, pointer, byte
_PickUpPayDayMoneyText:: ; 89d80 (22:5d80) _PickUpPayDayMoneyText:: ; 89d80 (22:5d80)
text $52, " picked up" text $52, " picked up"
line "¥@" line "¥@"
db $2, $e5, $cc, $c3 TX_BCD wcce5, $c3
text "!" text "!"
prompt prompt
@ -2468,7 +2465,7 @@ _PokemartTellBuyPriceText:: ; a2619 (28:6619)
text "?" text "?"
line "That will be" line "That will be"
cont "¥@" cont "¥@"
db $2, $9f, $ff, $c3 TX_BCD $ff9f, $c3
text ". OK?" text ". OK?"
done done
@ -2495,7 +2492,7 @@ _PokemonSellingGreetingText:: ; a2690 (28:6690)
_PokemartTellSellPriceText:: ; a26ae (28:66ae) _PokemartTellSellPriceText:: ; a26ae (28:66ae)
text "I can pay you" text "I can pay you"
line "¥@" line "¥@"
db $2, $9f, $ff, $c3 ; XXX TX_BCD $ff9f, $c3
text " for that." text " for that."
done done
@ -2881,7 +2878,7 @@ _PlayedFluteHadEffectText:: ; a6928 (29:6928)
_CoinCaseNumCoinsText:: ; a6940 (29:6940) _CoinCaseNumCoinsText:: ; a6940 (29:6940)
text "Coins" text "Coins"
line "@" line "@"
db $2, $a4, $d5, $c2 ; print BCD number TX_BCD wPlayerCoins, $c2
text " " text " "
prompt prompt

2
text/maps/daycare_1.asm
View file

@ -41,7 +41,7 @@ DayCareMText_8ac67:: ; 8ac67 (22:6c67)
_DayCareMText_56428:: ; 8ac7d (22:6c7d) _DayCareMText_56428:: ; 8ac7d (22:6c7d)
text "You owe me ¥@" text "You owe me ¥@"
db $2, $3f, $cd, $c2 TX_BCD wcd3f, $c2
db $0 db $0
line "for the return" line "for the return"
cont "of this #MON." cont "of this #MON."

1
wram.asm
View file

@ -368,6 +368,7 @@ wTrainerSpriteOffset:: ; cd3d
wTrainerEngageDistance:: ; cd3e wTrainerEngageDistance:: ; cd3e
ds 1 ds 1
wTrainerFacingDirection:: ; cd3f wTrainerFacingDirection:: ; cd3f
wcd3f::
ds 1 ds 1
wTrainerScreenY:: ; cd40 wTrainerScreenY:: ; cd40
ds 1 ds 1