Skip to content

Commit 7a4ca73

Browse files
Rangi42Rangi42
committed
Rename dt and dd to bigdt and bigdd
This makes their big-endianness obvious and matches `bigdw`
1 parent 7b59860 commit 7a4ca73

File tree

10 files changed

+270
-266
lines changed

10 files changed

+270
-266
lines changed

‎data/battle_tower/parties.asm

Lines changed: 210 additions & 210 deletions
Large diffs are not rendered by default.

‎data/events/odd_eggs.asm

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ OddEggs:
4040
db NO_ITEM
4141
db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
4242
dw 02048 ; OT ID
43-
dt 125 ; Exp
43+
bigdt 125 ; Exp
4444
; Stat exp
4545
bigdw 0
4646
bigdw 0
@@ -66,7 +66,7 @@ OddEggs:
6666
db NO_ITEM
6767
db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
6868
dw 00256 ; OT ID
69-
dt 125 ; Exp
69+
bigdt 125 ; Exp
7070
; Stat exp
7171
bigdw 0
7272
bigdw 0
@@ -92,7 +92,7 @@ OddEggs:
9292
db NO_ITEM
9393
db POUND, CHARM, DIZZY_PUNCH, 0
9494
dw 04096 ; OT ID
95-
dt 125 ; Exp
95+
bigdt 125 ; Exp
9696
; Stat exp
9797
bigdw 0
9898
bigdw 0
@@ -118,7 +118,7 @@ OddEggs:
118118
db NO_ITEM
119119
db POUND, CHARM, DIZZY_PUNCH, 0
120120
dw 00768 ; OT ID
121-
dt 125 ; Exp
121+
bigdt 125 ; Exp
122122
; Stat exp
123123
bigdw 0
124124
bigdw 0
@@ -144,7 +144,7 @@ OddEggs:
144144
db NO_ITEM
145145
db SING, CHARM, DIZZY_PUNCH, 0
146146
dw 04096 ; OT ID
147-
dt 125 ; Exp
147+
bigdt 125 ; Exp
148148
; Stat exp
149149
bigdw 0
150150
bigdw 0
@@ -170,7 +170,7 @@ OddEggs:
170170
db NO_ITEM
171171
db SING, CHARM, DIZZY_PUNCH, 0
172172
dw 00768 ; OT ID
173-
dt 125 ; Exp
173+
bigdt 125 ; Exp
174174
; Stat exp
175175
bigdw 0
176176
bigdw 0
@@ -196,7 +196,7 @@ OddEggs:
196196
db NO_ITEM
197197
db POUND, LICK, DIZZY_PUNCH, 0
198198
dw 03584 ; OT ID
199-
dt 125 ; Exp
199+
bigdt 125 ; Exp
200200
; Stat exp
201201
bigdw 0
202202
bigdw 0
@@ -222,7 +222,7 @@ OddEggs:
222222
db NO_ITEM
223223
db POUND, LICK, DIZZY_PUNCH, 0
224224
dw 00512 ; OT ID
225-
dt 125 ; Exp
225+
bigdt 125 ; Exp
226226
; Stat exp
227227
bigdw 0
228228
bigdw 0
@@ -248,7 +248,7 @@ OddEggs:
248248
db NO_ITEM
249249
db EMBER, DIZZY_PUNCH, 0, 0
250250
dw 02560 ; OT ID
251-
dt 125 ; Exp
251+
bigdt 125 ; Exp
252252
; Stat exp
253253
bigdw 0
254254
bigdw 0
@@ -274,7 +274,7 @@ OddEggs:
274274
db NO_ITEM
275275
db EMBER, DIZZY_PUNCH, 0, 0
276276
dw 00512 ; OT ID
277-
dt 125 ; Exp
277+
bigdt 125 ; Exp
278278
; Stat exp
279279
bigdw 0
280280
bigdw 0
@@ -300,7 +300,7 @@ OddEggs:
300300
db NO_ITEM
301301
db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
302302
dw 03072 ; OT ID
303-
dt 125 ; Exp
303+
bigdt 125 ; Exp
304304
; Stat exp
305305
bigdw 0
306306
bigdw 0
@@ -326,7 +326,7 @@ OddEggs:
326326
db NO_ITEM
327327
db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
328328
dw 00512 ; OT ID
329-
dt 125 ; Exp
329+
bigdt 125 ; Exp
330330
; Stat exp
331331
bigdw 0
332332
bigdw 0
@@ -352,7 +352,7 @@ OddEggs:
352352
db NO_ITEM
353353
db TACKLE, DIZZY_PUNCH, 0, 0
354354
dw 02560 ; OT ID
355-
dt 125 ; Exp
355+
bigdt 125 ; Exp
356356
; Stat exp
357357
bigdw 0
358358
bigdw 0
@@ -378,7 +378,7 @@ OddEggs:
378378
db NO_ITEM
379379
db TACKLE, DIZZY_PUNCH, 0, 0
380380
dw 00256 ; OT ID
381-
dt 125 ; Exp
381+
bigdt 125 ; Exp
382382
; Stat exp
383383
bigdw 0
384384
bigdw 0

‎data/items/mom_phone.asm

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
MACRO momitem
22
; money to trigger, cost, kind, item
3-
dt \1
4-
dt \2
3+
bigdt \1, \2
54
db \3, \4
65
ENDM
76

@@ -26,4 +25,4 @@ MomItems_2:
2625
momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL
2726
.End
2827

29-
dt 0 ; unused
28+
bigdt 0 ; unused

‎engine/events/mom.asm

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -552,26 +552,15 @@ Mom_WithdrawDepositMenuJoypad:
552552
ret
553553

554554
.DigitQuantities:
555-
dt 100000
556-
dt 10000
557-
dt 1000
558-
dt 100
559-
dt 10
560-
dt 1
561-
562-
dt 100000
563-
dt 10000
564-
dt 1000
565-
dt 100
566-
dt 10
567-
dt 1
568-
569-
dt 900000
570-
dt 90000
571-
dt 9000
572-
dt 900
573-
dt 90
574-
dt 9
555+
for x, 5, -1, -1
556+
bigdt 10**x
557+
endr
558+
for x, 5, -1, -1
559+
bigdt 10**x
560+
endr
561+
for x, 5, -1, -1
562+
bigdt 9 * 10**x
563+
endr
575564

576565
MomLeavingText1:
577566
text_far _MomLeavingText1

‎engine/events/mom_phone.asm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ MomItsInYourRoomText:
228228
text_far _MomItsInYourRoomText
229229
text_end
230230

231-
232231
DummyPredef3A_DummyData: ; unreferenced
233232
db 0
234233

‎engine/events/money.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ GiveMoney::
2323
ret
2424

2525
MaxMoney:
26-
dt MAX_MONEY
26+
bigdt MAX_MONEY
2727

2828
TakeMoney::
2929
ld a, 3

‎macros/data.asm

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,25 @@ MACRO dc ; "crumbs"
5555
endr
5656
ENDM
5757

58-
MACRO dt ; three-byte (big-endian)
59-
db LOW((\1) >> 16), HIGH(\1), LOW(\1)
58+
MACRO bigdw ; big-endian word
59+
rept _NARG
60+
db HIGH(\1), LOW(\1)
61+
shift
62+
endr
6063
ENDM
6164

62-
MACRO dd ; four-byte (big-endian)
63-
db HIGH((\1) >> 16), LOW((\1) >> 16), HIGH(\1), LOW(\1)
65+
MACRO bigdt ; big-endian "tribyte"
66+
rept _NARG
67+
db LOW((\1) >> 16), HIGH(\1), LOW(\1)
68+
shift
69+
endr
6470
ENDM
6571

66-
MACRO bigdw ; big-endian word
67-
db HIGH(\1), LOW(\1)
72+
MACRO bigdd ; big-endian "double word"
73+
rept _NARG
74+
db HIGH((\1) >> 16), LOW((\1) >> 16), HIGH(\1), LOW(\1)
75+
shift
76+
endr
6877
ENDM
6978

7079
MACRO dba ; dbw bank, address

‎macros/legacy.asm

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ ENDM
1313

1414
; macros/data.asm
1515

16+
MACRO dt
17+
bigdt \1
18+
ENDM
19+
20+
MACRO dd
21+
bigdd \1
22+
ENDM
23+
1624
MACRO dbbw
1725
db \1, \2
1826
dw \3

‎macros/scripts/events.asm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,21 +229,21 @@ ENDM
229229
MACRO givemoney
230230
db givemoney_command
231231
db \1 ; account
232-
dt \2 ; money
232+
bigdt \2 ; money
233233
ENDM
234234

235235
const takemoney_command ; $23
236236
MACRO takemoney
237237
db takemoney_command
238238
db \1 ; account
239-
dt \2 ; money
239+
bigdt \2 ; money
240240
ENDM
241241

242242
const checkmoney_command ; $24
243243
MACRO checkmoney
244244
db checkmoney_command
245245
db \1 ; account
246-
dt \2 ; money
246+
bigdt \2 ; money
247247
ENDM
248248

249249
const givecoins_command ; $25

‎mobile/mobile_41.asm

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -698,21 +698,21 @@ endr
698698
ret
699699

700700
._9
701-
dd 1000000000
701+
bigdd 10**9
702702
._8
703-
dd 100000000
703+
bigdd 10**8
704704
._7
705-
dd 10000000
705+
bigdd 10**7
706706
._6
707-
dd 1000000
707+
bigdd 10**6
708708
._5
709-
dd 100000
709+
bigdd 10**5
710710
._4
711-
dd 10000
711+
bigdd 10**4
712712
._3
713-
dd 1000
713+
bigdd 10**3
714714
._2
715-
dd 100
715+
bigdd 10**2
716716

717717
.Function1062b2:
718718
ld c, $0

0 commit comments

Comments
 (0)