Resolve #428: Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff

This commit is contained in:
Remy Oukaour
2017-12-25 13:40:10 -05:00
parent da2b01a36c
commit e34e68095d
71 changed files with 435 additions and 398 deletions

View File

@@ -36,9 +36,9 @@ HallOfFame:: ; 0x8640e
; 0x86455
RedCredits:: ; 86455
ld a, MUSIC_NONE % $100
ld a, LOW(MUSIC_NONE)
ld [MusicFadeID], a
ld a, MUSIC_NONE / $100
ld a, HIGH(MUSIC_NONE)
ld [MusicFadeID + 1], a
ld a, 10
ld [MusicFade], a
@@ -59,9 +59,9 @@ RedCredits:: ; 86455
; 8648e
HallOfFame_FadeOutMusic: ; 8648e
ld a, MUSIC_NONE % $100
ld a, LOW(MUSIC_NONE)
ld [MusicFadeID], a
ld a, MUSIC_NONE / $100
ld a, HIGH(MUSIC_NONE)
ld [MusicFadeID + 1], a
ld a, 10
ld [MusicFade], a

View File

@@ -159,9 +159,9 @@ DayCareStep:: ; 7282
dec hl
inc [hl]
ld a, [hl]
cp 5242880 / $10000
cp HIGH($500000 >> 8)
jr c, .day_care_lady
ld a, 5242880 / $10000
ld a, HIGH($500000 >> 8)
ld [hl], a
.day_care_lady
@@ -181,9 +181,9 @@ DayCareStep:: ; 7282
dec hl
inc [hl]
ld a, [hl]
cp 5242880 / $10000
cp HIGH($500000 >> 8)
jr c, .check_egg
ld a, 5242880 / $10000
ld a, HIGH($500000 >> 8)
ld [hl], a
.check_egg

View File

@@ -127,7 +127,7 @@ CalcMagikarpLength: ; fbbfc
; if bc < 10: [wMagikarpLength] = c + 190
; if bc ≥ $ff00: [wMagikarpLength] = c + 1370
; else: [wMagikarpLength] = z × 100 + (bc x) / y
; else: [wMagikarpLength] = z * 100 + (bc - x) / y
; X, Y, and Z depend on the value of b as follows:

View File

@@ -83,11 +83,11 @@ CheckBalance_MomItem2: ; fd044
.check_have_2300
ld hl, hMoneyTemp
ld [hl], MOM_MONEY / $10000
ld [hl], HIGH(MOM_MONEY >> 8)
inc hl
ld [hl], MOM_MONEY / $100 % $100
ld [hl], HIGH(MOM_MONEY) ; mid
inc hl
ld [hl], MOM_MONEY % $100
ld [hl], LOW(MOM_MONEY)
.loop
ld de, MomItemTriggerBalance
ld bc, wMomsMoney

View File

@@ -32,9 +32,9 @@ LoadPoisonBGPals: ; cbcdd
ld c, $20
.loop
; RGB 28, 21, 31
ld a, (palred 28 + palgreen 21 + palblue 31) % $100
ld a, LOW(palred 28 + palgreen 21 + palblue 31)
ld [hli], a
ld a, (palred 28 + palgreen 21 + palblue 31) / $100
ld a, HIGH(palred 28 + palgreen 21 + palblue 31)
ld [hli], a
dec c
jr nz, .loop

View File

@@ -85,10 +85,10 @@ SpecialReturnShuckle: ; 737e
; OT ID
ld a, [hli]
cp 00518 / $100
cp HIGH(00518)
jr nz, .DontReturn
ld a, [hl]
cp 00518 % $100
cp LOW(00518)
jr nz, .DontReturn
; OT

View File

@@ -59,10 +59,10 @@ SpecialAerodactylChamber: ; 8ae30
call GetSecondaryMapHeaderPointer
ld a, h
cp RuinsOfAlphAerodactylChamber_SecondMapHeader / $100
cp HIGH(RuinsOfAlphAerodactylChamber_SecondMapHeader)
jr nz, .nope
ld a, l
cp RuinsOfAlphAerodactylChamber_SecondMapHeader % $100
cp LOW(RuinsOfAlphAerodactylChamber_SecondMapHeader)
jr nz, .nope
ld de, EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
@@ -87,10 +87,10 @@ SpecialKabutoChamber: ; 8ae4e
call GetSecondaryMapHeaderPointer
ld a, h
cp RuinsOfAlphKabutoChamber_SecondMapHeader / $100
cp HIGH(RuinsOfAlphKabutoChamber_SecondMapHeader)
jr nz, .done
ld a, l
cp RuinsOfAlphKabutoChamber_SecondMapHeader % $100
cp LOW(RuinsOfAlphKabutoChamber_SecondMapHeader)
jr nz, .done
ld de, EVENT_WALL_OPENED_IN_KABUTO_CHAMBER