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

@@ -719,7 +719,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
call PlayMusic
call EnableLCD
hlcoord 7, 4
ld b, VBGMap0 / $100
ld b, HIGH(VBGMap0)
ld c, $31 ; Egg tiles start here
ld a, EGG
call Hatch_UpdateFrontpicBGMapCenter
@@ -768,7 +768,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
call ClearSprites
call Hatch_InitShellFragments
hlcoord 6, 3
ld b, VBGMap0 / $100
ld b, HIGH(VBGMap0)
ld c, $00 ; Hatchling tiles start here
ld a, [wJumptableIndex]
call Hatch_UpdateFrontpicBGMapCenter

View File

@@ -644,10 +644,10 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
ld a, e
and $1c ; get level
srl a
add .Jumptable % $100
add LOW(.Jumptable)
ld l, a
ld a, 0
adc .Jumptable / $100
adc HIGH(.Jumptable)
ld h, a
ld a, [hli]
ld h, [hl]
@@ -1185,14 +1185,14 @@ CardFlip_CheckWinCondition: ; e0637
.IsCoinCaseFull: ; e0833
ld a, [Coins]
cp MAX_COINS / $100
cp HIGH(MAX_COINS)
jr c, .less
jr z, .check_low
jr .more
.check_low
ld a, [Coins + 1]
cp MAX_COINS % $100
cp LOW(MAX_COINS)
jr c, .less
.more

View File

@@ -523,10 +523,10 @@ LoadPalette_White_Col1_Col2_Black:
ld a, $5
ld [rSVBK], a
ld a, (palred 31 + palgreen 31 + palblue 31) % $100
ld a, LOW(palred 31 + palgreen 31 + palblue 31)
ld [de], a
inc de
ld a, (palred 31 + palgreen 31 + palblue 31) / $100
ld a, HIGH(palred 31 + palgreen 31 + palblue 31)
ld [de], a
inc de
@@ -912,9 +912,9 @@ InitCGBPals::
ld [rBGPI], a
ld c, 4 * 8
.bgpals_loop
ld a, (palred 31 + palgreen 31 + palblue 31) % $100
ld a, LOW(palred 31 + palgreen 31 + palblue 31)
ld [rBGPD], a
ld a, (palred 31 + palgreen 31 + palblue 31) / $100
ld a, HIGH(palred 31 + palgreen 31 + palblue 31)
ld [rBGPD], a
dec c
jr nz, .bgpals_loop
@@ -922,9 +922,9 @@ InitCGBPals::
ld [rOBPI], a
ld c, 4 * 8
.obpals_loop
ld a, (palred 31 + palgreen 31 + palblue 31) % $100
ld a, LOW(palred 31 + palgreen 31 + palblue 31)
ld [rOBPD], a
ld a, (palred 31 + palgreen 31 + palblue 31) / $100
ld a, HIGH(palred 31 + palgreen 31 + palblue 31)
ld [rOBPD], a
dec c
jr nz, .obpals_loop
@@ -943,9 +943,9 @@ InitCGBPals::
.LoadWhitePals:
ld c, 4 * 16
.loop
ld a, (palred 31 + palgreen 31 + palblue 31) % $100
ld a, LOW(palred 31 + palgreen 31 + palblue 31)
ld [hli], a
ld a, (palred 31 + palgreen 31 + palblue 31) / $100
ld a, HIGH(palred 31 + palgreen 31 + palblue 31)
ld [hli], a
dec c
jr nz, .loop
@@ -1070,7 +1070,7 @@ SGBBorder_PushBGPals:
ld [rBGP], a
ld hl, PredefPals
ld de, VTiles1
ld bc, $1000
ld bc, $100 tiles
call CopyData
call DrawDefaultTiles
ld a, $e3

View File

@@ -193,9 +193,9 @@ Credits_UpdateGFXRequestPath: ; 109964 (42:5964)
ld [Requested2bppSource], a
ld a, h
ld [Requested2bppSource + 1], a
ld a, VTiles2 % $100
ld a, LOW(VTiles2)
ld [Requested2bppDest], a
ld a, VTiles2 / $100
ld a, HIGH(VTiles2)
ld [Requested2bppDest + 1], a
jr Credits_RequestGFX
@@ -374,9 +374,9 @@ ParseCredits: ; 1099aa
set 7, [hl]
ld a, 32
ld [MusicFade], a
ld a, MUSIC_POST_CREDITS % $100
ld a, LOW(MUSIC_POST_CREDITS)
ld [MusicFadeID], a
ld a, MUSIC_POST_CREDITS / $100
ld a, HIGH(MUSIC_POST_CREDITS)
ld [MusicFadeID + 1], a
ret
@@ -523,20 +523,20 @@ GetCreditsPalette: ; 109b2c
; Update the first three colors in both palette buffers.
push af
push hl
add UnknBGPals % $100
add LOW(UnknBGPals)
ld e, a
ld a, 0
adc UnknBGPals / $100
adc HIGH(UnknBGPals)
ld d, a
ld bc, 24
call CopyBytes
pop hl
pop af
add BGPals % $100
add LOW(BGPals)
ld e, a
ld a, 0
adc BGPals / $100
adc HIGH(BGPals)
ld d, a
ld bc, 24
call CopyBytes

View File

@@ -3,9 +3,9 @@ Copyright_GFPresents: ; e4579
call PlayMusic
call ClearBGPalettes
call ClearTileMap
ld a, VBGMap0 / $100
ld a, HIGH(VBGMap0)
ld [hBGMapAddress + 1], a
xor a
xor a ; LOW(VBGMap0)
ld [hBGMapAddress], a
ld [hJoyDown], a
ld [hSCX], a
@@ -1922,9 +1922,9 @@ Intro_RustleGrass: ; e546d (39:546d)
ld [Requested2bppSource], a
ld a, [hli]
ld [Requested2bppSource + 1], a
ld a, (VTiles2 tile $09) % $100
ld a, LOW(VTiles2 tile $09)
ld [Requested2bppDest], a
ld a, (VTiles2 tile $09) / $100
ld a, HIGH(VTiles2 tile $09)
ld [Requested2bppDest + 1], a
ld a, 4
ld [Requested2bppSize], a

View File

@@ -1069,7 +1069,7 @@ TilesetColorTest:
ld hl, VTiles1
lb bc, BANK(DebugColorTestGFX), 1
call Request2bpp
ld a, VBGMap1 / $100
ld a, HIGH(VBGMap1)
ld [hBGMapAddress + 1], a
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT

View File

@@ -300,7 +300,7 @@ DoBikeStep:: ; 97db3
; If we've taken at least 1024 steps, have the bike
; shop owner try to call us.
ld a, d
cp 1024 >> 8
cp HIGH(1024)
jr c, .NoCall
; If a call has already been queued, don't overwrite

View File

@@ -6,7 +6,7 @@ CalcLevel: ; 50e1b
.next_level
inc d
ld a, d
cp (MAX_LEVEL + 1) % $100
cp MAX_LEVEL + 1
jr z, .got_level
call CalcExpAtLevel
push hl

View File

@@ -46,9 +46,9 @@ InitDisplayForRedCredits: ; 4e8c2
ld hl, UnknBGPals
ld c, 4 tiles
.load_white_palettes
ld a, (palred 31 + palgreen 31 + palblue 31) % $100
ld a, LOW(palred 31 + palgreen 31 + palblue 31)
ld [hli], a
ld a, (palred 31 + palgreen 31 + palblue 31) / $100
ld a, HIGH(palred 31 + palgreen 31 + palblue 31)
ld [hli], a
dec c
jr nz, .load_white_palettes

View File

@@ -27,7 +27,7 @@ ReanchorBGMap_NoOAMUpdate:: ; 6454
ld a, $90
ld [hWY], a
call OverworldTextModeSwitch
ld a, VBGMap1 / $100
ld a, HIGH(VBGMap1)
call .LoadBGMapAddrIntoHRAM
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall LoadOW_BGPal7
@@ -38,11 +38,11 @@ ReanchorBGMap_NoOAMUpdate:: ; 6454
ld [hBGMapMode], a
ld [hWY], a
farcall HDMATransfer_FillBGMap0WithBlack ; no need to farcall
ld a, VBGMap0 / $100
ld a, HIGH(VBGMap0)
call .LoadBGMapAddrIntoHRAM
xor a
xor a ; LOW(VBGMap0)
ld [wBGMapAnchor], a
ld a, VBGMap0 / $100
ld a, HIGH(VBGMap0)
ld [wBGMapAnchor + 1], a
xor a
ld [hSCX], a
@@ -86,13 +86,13 @@ HDMATransfer_FillBGMap0WithBlack: ; 64db
ld hl, wDecompressScratch
ld bc, wScratchAttrMap - wDecompressScratch
call ByteFill
ld a, wDecompressScratch / $100
ld a, HIGH(wDecompressScratch)
ld [rHDMA1], a
ld a, wDecompressScratch % $100
ld a, LOW(wDecompressScratch)
ld [rHDMA2], a
ld a, (VBGMap0 % $8000) / $100
ld a, HIGH(VBGMap0 % $8000)
ld [rHDMA3], a
ld a, (VBGMap0 % $8000) % $100
ld a, LOW(VBGMap0 % $8000)
ld [rHDMA4], a
ld a, $3f
ld [hDMATransfer], a

View File

@@ -199,24 +199,24 @@ _ResetWRAM: ; 5bae
ld [Coins], a
ld [Coins + 1], a
IF START_MONEY / $10000
ld a, START_MONEY / $10000
IF START_MONEY >= $10000
ld a, HIGH(START_MONEY >> 8)
ENDC
ld [Money], a
ld a, START_MONEY / $100 % $100
ld a, HIGH(START_MONEY) ; mid
ld [Money + 1], a
ld a, START_MONEY % $100
ld a, LOW(START_MONEY)
ld [Money + 2], a
xor a
ld [wWhichMomItem], a
ld hl, MomItemTriggerBalance
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)
call InitializeNPCNames
@@ -372,9 +372,9 @@ Continue: ; 5d65
.Check2Pass:
ld a, $8
ld [MusicFade], a
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
call ClearBGPalettes
call Continue_MobileAdapterMenu
@@ -426,9 +426,9 @@ Continue_MobileAdapterMenu: ; 5df0
ret nz
ld a, 5
ld [MusicFade], a
ld a, MUSIC_MOBILE_ADAPTER_MENU % $100
ld a, LOW(MUSIC_MOBILE_ADAPTER_MENU)
ld [MusicFadeID], a
ld a, MUSIC_MOBILE_ADAPTER_MENU / $100
ld a, HIGH(MUSIC_MOBILE_ADAPTER_MENU)
ld [MusicFadeID + 1], a
ld c, 20
call DelayFrames
@@ -437,9 +437,9 @@ Continue_MobileAdapterMenu: ; 5df0
farcall _SaveData
ld a, 8
ld [MusicFade], a
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 c, 35
call DelayFrames
@@ -1405,9 +1405,9 @@ GameInit:: ; 642e
call ClearWindowData
call ClearBGPalettes
call ClearTileMap
ld a, VBGMap0 / $100
ld a, HIGH(VBGMap0)
ld [hBGMapAddress + 1], a
xor a
xor a ; LOW(VBGMap0)
ld [hBGMapAddress], a
ld [hJoyDown], a
ld [hSCX], a

View File

@@ -861,7 +861,7 @@ HeavyBallMultiplier:
.compare
ld c, a
cp 1024 >> 8 ; 102.4 kg
cp HIGH(1024) ; 102.4 kg
jr c, .lightmon
ld hl, .WeightsTable
@@ -892,10 +892,10 @@ HeavyBallMultiplier:
.WeightsTable:
; weight factor, boost
db 2048 >> 8, 0
db 3072 >> 8, 20
db 4096 >> 8, 30
db 65280 >> 8, 40
db HIGH(2048), 0
db HIGH(3072), 20
db HIGH(4096), 30
db HIGH(65280), 40
LureBallMultiplier:
; multiply catch rate by 3 if this is a fishing rod battle

View File

@@ -124,28 +124,28 @@ _CheckItem:: ; d244
DoesHLEqualNumItems: ; d27b
ld a, l
cp NumItems % $100
cp LOW(NumItems)
ret nz
ld a, h
cp NumItems / $100
cp HIGH(NumItems)
ret
GetPocketCapacity: ; d283
ld c, MAX_ITEMS
ld a, e
cp NumItems % $100
cp LOW(NumItems)
jr nz, .not_bag
ld a, d
cp NumItems / $100
cp HIGH(NumItems)
ret z
.not_bag
ld c, MAX_PC_ITEMS
ld a, e
cp PCItems % $100
cp LOW(PCItems)
jr nz, .not_pc
ld a, d
cp PCItems / $100
cp HIGH(PCItems)
ret z
.not_pc

View File

@@ -162,9 +162,9 @@ TimeCapsule: ; 2805d
ld [de], a
ld hl, wTimeCapsulePartyMon1Species
call Function2868a
ld a, OTPartyMonOT % $100
ld a, LOW(OTPartyMonOT)
ld [wUnusedD102], a
ld a, OTPartyMonOT / $100
ld a, HIGH(OTPartyMonOT)
ld [wUnusedD102 + 1], a
ld de, MUSIC_NONE
call PlayMusic
@@ -333,10 +333,10 @@ Gen2ToGen2LinkComms: ; 28177
push bc
ld bc, MAIL_MSG_LENGTH + 1
call CopyBytes
ld a, (MAIL_STRUCT_LENGTH - (MAIL_MSG_LENGTH + 1)) % $100
ld a, LOW(MAIL_STRUCT_LENGTH - (MAIL_MSG_LENGTH + 1))
add e
ld e, a
ld a, (MAIL_STRUCT_LENGTH - (MAIL_MSG_LENGTH + 1)) / $100
ld a, HIGH(MAIL_STRUCT_LENGTH - (MAIL_MSG_LENGTH + 1))
adc d
ld d, a
pop bc
@@ -346,10 +346,10 @@ Gen2ToGen2LinkComms: ; 28177
ld b, PARTY_LENGTH
.copy_author_loop
push bc
ld a, (MAIL_MSG_LENGTH + 1) % $100
ld a, LOW(MAIL_MSG_LENGTH + 1)
add e
ld e, a
ld a, (MAIL_MSG_LENGTH + 1) / $100
ld a, HIGH(MAIL_MSG_LENGTH + 1)
adc d
ld d, a
ld bc, MAIL_STRUCT_LENGTH - (MAIL_MSG_LENGTH + 1)
@@ -403,9 +403,9 @@ Gen2ToGen2LinkComms: ; 28177
ld de, OTPartyMons
ld bc, OTPartyDataEnd - OTPartyMons
call CopyBytes
ld a, OTPartyMonOT % $100
ld a, LOW(OTPartyMonOT)
ld [wUnusedD102], a
ld a, OTPartyMonOT / $100
ld a, HIGH(OTPartyMonOT)
ld [wUnusedD102 + 1], a
ld de, MUSIC_NONE
call PlayMusic

View File

@@ -2812,7 +2812,7 @@ _UpdateSprites:: ; 5920
.fill
ld a, [VramState]
bit 1, a
ld b, SpritesEnd % $100
ld b, LOW(SpritesEnd)
jr z, .ok
ld b, 28 * 4
.ok
@@ -2820,7 +2820,7 @@ _UpdateSprites:: ; 5920
cp b
ret nc
ld l, a
ld h, Sprites / $100
ld h, HIGH(Sprites)
ld de, 4
ld a, b
ld c, SCREEN_HEIGHT_PX + 16
@@ -3032,11 +3032,11 @@ PRIORITY_HIGH EQU $30
ld l, a
ld a, [hUsedSpriteIndex]
ld c, a
ld b, Sprites / $100
ld b, HIGH(Sprites)
ld a, [hli]
ld [hUsedSpriteTile], a
add c
cp SpritesEnd % $100
cp LOW(SpritesEnd)
jr nc, .full
.addsprite
ld a, [hFFC0]

View File

@@ -1570,18 +1570,18 @@ CalcPkmnStatC: ; e17b
.no_overflow_4
ld a, [hQuotient + 1]
cp (1000 / $100) + 1
cp HIGH(MAX_STAT_VALUE + 1) + 1
jr nc, .max_stat
cp 1000 / $100
cp HIGH(MAX_STAT_VALUE + 1)
jr c, .stat_value_okay
ld a, [hQuotient + 2]
cp 1000 % $100
cp LOW(MAX_STAT_VALUE + 1)
jr c, .stat_value_okay
.max_stat
ld a, MAX_STAT_VALUE / $100
ld a, HIGH(MAX_STAT_VALUE)
ld [hMultiplicand + 1], a
ld a, MAX_STAT_VALUE % $100
ld a, LOW(MAX_STAT_VALUE)
ld [hMultiplicand + 2], a
.stat_value_okay
@@ -1702,9 +1702,9 @@ GivePoke:: ; e277
ld hl, PartyMon1ID
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
ld a, 01001 / $100
ld a, HIGH(01001)
ld [hli], a
ld [hl], 01001 % $100
ld [hl], LOW(01001)
pop bc
farcall SetGiftPartyMonCaughtData
jr .skip_nickname

View File

@@ -264,7 +264,7 @@ Function104a95: ; 104a95 (41:4a95)
ld a, [rLY]
cp $90
jr c, .ly_loop
ld c, rRP % $100
ld c, LOW(rRP)
ld a, $c0
ld [$ff00+c], a
ld b, 240 ; This might have been intended as a 4-second timeout buffer.
@@ -274,7 +274,7 @@ Function104a95: ; 104a95 (41:4a95)
call MysteryGift_ReadJoypad
ld b, $2
ld c, rRP % $100
ld c, LOW(rRP)
; Delay frame
.ly_loop2
ld a, [$ff00+c]
@@ -715,7 +715,7 @@ Function104ddd: ; 104ddd (41:4ddd)
.loop
call MysteryGift_ReadJoypad
ld b, $2
ld c, rRP % $100
ld c, LOW(rRP)
ld a, [hMGJoypadReleased]
bit B_BUTTON_F, a
jr z, .next
@@ -731,7 +731,7 @@ Function104ddd: ; 104ddd (41:4ddd)
jr nz, .loop
Function104dfe: ; 104dfe (41:4dfe)
ld c, rRP % $100
ld c, LOW(rRP)
ld d, $0
ld e, d
call Function104db7
@@ -771,7 +771,7 @@ Function104e3a: ; 104e3a (41:4e3a)
Function104e46: ; 104e46 (41:4e46)
ld a, $2
ld [hPrintNum9], a
ld c, rRP % $100
ld c, LOW(rRP)
ld d, $0
ld e, d
ld d, $3d
@@ -812,7 +812,7 @@ Function104e93: ; 104e93 (41:4e93)
ld [hPrintNum6], a
push hl
push bc
ld c, rRP % $100
ld c, LOW(rRP)
ld d, $3d
call Function104dd1
ld hl, hPrintNum2
@@ -844,7 +844,7 @@ Function104e93: ; 104e93 (41:4e93)
ret
Function104ed6: ; 104ed6 (41:4ed6)
ld c, rRP % $100
ld c, LOW(rRP)
ld d, $5
call Function104dd1
ld d, $5
@@ -981,7 +981,7 @@ Function104f57: ; 104f57 (41:4f57)
ret
Function104faf: ; 104faf (41:4faf)
ld c, rRP % $100
ld c, LOW(rRP)
ld d, $0
call Function104db7
jp z, Function104f42

View File

@@ -235,10 +235,10 @@ NamingScreen: ; 116c1
pop de
ld b, SPRITE_ANIM_INDEX_RED_WALK
ld a, d
cp KrisSpriteGFX / $100
cp HIGH(KrisSpriteGFX)
jr nz, .not_kris
ld a, e
cp KrisSpriteGFX % $100
cp LOW(KrisSpriteGFX)
jr nz, .not_kris
ld b, SPRITE_ANIM_INDEX_BLUE_WALK
.not_kris

View File

@@ -15,10 +15,10 @@ GiveOddEgg: ; 1fb4b6
; Break on $ffff.
ld a, d
cp $ffff / $100
cp HIGH($ffff)
jr nz, .not_done
ld a, e
cp $ffff % $100
cp LOW($ffff)
jr z, .done
.not_done
@@ -60,14 +60,14 @@ GiveOddEgg: ; 1fb4b6
ld [wMobileMonSpeciesBuffer], a
; load pointer to (wMobileMonSpeciesBuffer - 1) in wMobileMonSpeciesPointerBuffer
ld a, (wMobileMonSpeciesBuffer - 1) % $100
ld a, LOW(wMobileMonSpeciesBuffer - 1)
ld [wMobileMonSpeciesPointerBuffer], a
ld a, (wMobileMonSpeciesBuffer - 1) / $100
ld a, HIGH(wMobileMonSpeciesBuffer - 1)
ld [wMobileMonSpeciesPointerBuffer + 1], a
; load pointer to OddEggSpecies in wMobileMonStructurePointerBuffer
ld a, OddEggSpecies % $100
ld a, LOW(OddEggSpecies)
ld [wMobileMonStructurePointerBuffer], a
ld a, OddEggSpecies / $100
ld a, HIGH(OddEggSpecies)
ld [wMobileMonStructurePointerBuffer + 1], a
; load Odd Egg Name in wTempOddEggNickname
@@ -77,14 +77,14 @@ GiveOddEgg: ; 1fb4b6
call CopyBytes
; load pointer to wTempOddEggNickname in wMobileMonOTNamePointerBuffer
ld a, wTempOddEggNickname % $100
ld a, LOW(wTempOddEggNickname)
ld [wMobileMonOTNamePointerBuffer], a
ld a, wTempOddEggNickname / $100
ld a, HIGH(wTempOddEggNickname)
ld [wMobileMonOTNamePointerBuffer + 1], a
; load pointer to wOddEggName in wMobileMonNicknamePointerBuffer
ld a, wOddEggName % $100
ld a, LOW(wOddEggName)
ld [wMobileMonNicknamePointerBuffer], a
ld a, wOddEggName / $100
ld a, HIGH(wOddEggName)
ld [wMobileMonNicknamePointerBuffer + 1], a
farcall AddMobileMonToParty
ret

View File

@@ -663,10 +663,10 @@ rept 4
add hl, hl
endr
ld a, l
add VTiles0 % $100
add LOW(VTiles0)
ld l, a
ld a, h
adc VTiles0 / $100
adc HIGH(VTiles0)
ld h, a
ret
; 14418

Some files were not shown because too many files have changed in this diff Show More