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

35 files changed, 171 insertions, 171 deletions

diff --git a/engine/breeding.asm b/engine/breeding.asm
index 967694612..8977ae175 100755
--- a/engine/breeding.asm
+++ b/engine/breeding.asm
@@ -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
diff --git a/engine/card_flip.asm b/engine/card_flip.asm
index c0c4639ad..ef48283de 100755
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -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
diff --git a/engine/color.asm b/engine/color.asm
index 132466d29..23f953ebe 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -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
diff --git a/engine/credits.asm b/engine/credits.asm
index 0fe7685a6..70729ed3b 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -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
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm
index 52b07331e..4f79dc6be 100755
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -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
diff --git a/engine/debug.asm b/engine/debug.asm
index 588de7a64..0ca639aaa 100755
--- a/engine/debug.asm
+++ b/engine/debug.asm
@@ -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
diff --git a/engine/events_2.asm b/engine/events_2.asm
index 12476bd31..cab6b8bd0 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -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
diff --git a/engine/experience.asm b/engine/experience.asm
index c33aaf02a..c2c030e4c 100644
--- a/engine/experience.asm
+++ b/engine/experience.asm
@@ -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
diff --git a/engine/init_hof_credits.asm b/engine/init_hof_credits.asm
index 0f55a10ab..81def1af3 100644
--- a/engine/init_hof_credits.asm
+++ b/engine/init_hof_credits.asm
@@ -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
diff --git a/engine/init_map.asm b/engine/init_map.asm
index d73a5acf5..b7c405b5f 100644
--- a/engine/init_map.asm
+++ b/engine/init_map.asm
@@ -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
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index c73535459..ec53549f8 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -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
diff --git a/engine/item_effects.asm b/engine/item_effects.asm
index 4db1f3b7d..90dfdc7e0 100644
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -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
diff --git a/engine/items.asm b/engine/items.asm
index b0bffb6d6..dcaf10356 100755
--- a/engine/items.asm
+++ b/engine/items.asm
@@ -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
diff --git a/engine/link.asm b/engine/link.asm
index a2aec3a10..bb3e98b3e 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -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
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index c37e6d2cf..bfeefa467 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -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]
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index 4ee283e3e..90728e84c 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -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
diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm
index a8bad8935..9e097e6d4 100755
--- a/engine/mystery_gift.asm
+++ b/engine/mystery_gift.asm
@@ -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
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index 484bbe753..3c4bfff5b 100755
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -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
diff --git a/engine/odd_eggs.asm b/engine/odd_eggs.asm
index 5d67358f0..4cbeb34dc 100644
--- a/engine/odd_eggs.asm
+++ b/engine/odd_eggs.asm
@@ -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
diff --git a/engine/overworld.asm b/engine/overworld.asm
index a505ecd66..a1b4545a9 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -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
diff --git a/engine/party_menu.asm b/engine/party_menu.asm
index e89fdab19..0415e29e4 100644
--- a/engine/party_menu.asm
+++ b/engine/party_menu.asm
@@ -587,10 +587,10 @@ PlacePartyMonMobileBattleSelection: ; 50307
 
 
 PartyMenuCheckEgg: ; 50389
-	ld a, PartySpecies % $100
+	ld a, LOW(PartySpecies)
 	add b
 	ld e, a
-	ld a, PartySpecies / $100
+	ld a, HIGH(PartySpecies)
 	adc 0
 	ld d, a
 	ld a, [de]
diff --git a/engine/player_step.asm b/engine/player_step.asm
index bdd6d9907..b55584ab1 100755
--- a/engine/player_step.asm
+++ b/engine/player_step.asm
@@ -156,7 +156,7 @@ UpdateOverworldMap: ; d536 (3:5536)
 	ld a, [wBGMapAnchor + 1]
 	inc a
 	and $3
-	or VBGMap0 / $100
+	or HIGH(VBGMap0)
 	ld [wBGMapAnchor + 1], a
 .not_overflowed
 	ld hl, wMetatileStandingY
@@ -187,7 +187,7 @@ UpdateOverworldMap: ; d536 (3:5536)
 	ld a, [wBGMapAnchor + 1]
 	dec a
 	and $3
-	or VBGMap0 / $100
+	or HIGH(VBGMap0)
 	ld [wBGMapAnchor + 1], a
 .not_underflowed
 	ld hl, wMetatileStandingY
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index 2529e3b0e..96959205b 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -35,9 +35,9 @@ PokeGear: ; 90b8d (24:4b8d)
 	pop af
 	ld [Options], a
 	call ClearBGPalettes
-	xor a
+	xor a ; LOW(VBGMap0)
 	ld [hBGMapAddress], a
-	ld a, VBGMap0 / $100
+	ld a, HIGH(VBGMap0)
 	ld [hBGMapAddress + 1], a
 	ld a, $90
 	ld [hWY], a
@@ -243,18 +243,18 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	ld a, [wcf65]
 	and a
 	jr nz, .kanto_0
-	xor a
+	xor a ; LOW(VBGMap0)
 	ld [hBGMapAddress], a
-	ld a, VBGMap0 / $100
+	ld a, HIGH(VBGMap0)
 	ld [hBGMapAddress + 1], a
 	call .UpdateBGMap
 	ld a, $90
 	jr .finish
 
 .kanto_0
-	xor a
+	xor a ; LOW(VBGMap1)
 	ld [hBGMapAddress], a
-	ld a, VBGMap1 / $100
+	ld a, HIGH(VBGMap1)
 	ld [hBGMapAddress + 1], a
 	call .UpdateBGMap
 	xor a
@@ -2161,9 +2161,9 @@ _FlyMap: ; 91af3
 	call ClearBGPalettes
 	ld a, $90
 	ld [hWY], a
-	xor a
+	xor a ; LOW(VBGMap0)
 	ld [hBGMapAddress], a
-	ld a, VBGMap0 / $100
+	ld a, HIGH(VBGMap0)
 	ld [hBGMapAddress + 1], a
 	ld a, [wTownMapPlayerIconLandmark]
 	ld e, a
@@ -3003,9 +3003,9 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 	call ClearBGPalettes
 	ld a, $90
 	ld [hWY], a
-	xor a
+	xor a ; LOW(VBGMap0)
 	ld [hBGMapAddress], a
-	ld a, VBGMap0 / $100
+	ld a, HIGH(VBGMap0)
 	ld [hBGMapAddress + 1], a
 	ld a, [wTownMapPlayerIconLandmark]
 	ld e, a
diff --git a/engine/printer_serial.asm b/engine/printer_serial.asm
index 6909a38b2..06891db5b 100755
--- a/engine/printer_serial.asm
+++ b/engine/printer_serial.asm
@@ -109,9 +109,9 @@ Printer_StartTransmittingTilemap: ; 84099 (21:4099)
 	call Printer_CopyPacket
 	; prepare to send 40 tiles
 	call Printer_Convert2RowsTo2bpp
-	ld a, (40 tiles) % $100
+	ld a, LOW(40 tiles)
 	ld [wPrinterSendByteCounter], a
-	ld a, (40 tiles) / $100
+	ld a, HIGH(40 tiles)
 	ld [wPrinterSendByteCounter + 1], a
 	; compute the checksum
 	call Printer_ComputeChecksum
@@ -142,9 +142,9 @@ Printer_SignalSendHeader: ; 840de (21:40de)
 	call Printer_CopyPacket
 	; prepare to send 1 tile
 	call Printer_StageHeaderForSend
-	ld a, 4 % $100
+	ld a, LOW(4)
 	ld [wPrinterSendByteCounter], a
-	ld a, 4 / $100
+	ld a, HIGH(4)
 	ld [wPrinterSendByteCounter + 1], a
 	; compute the checksum
 	call Printer_ComputeChecksum
diff --git a/engine/printnum.asm b/engine/printnum.asm
index 7b814a042..d1d7e7ad3 100755
--- a/engine/printnum.asm
+++ b/engine/printnum.asm
@@ -80,51 +80,51 @@ _PrintNum:: ; c4c7
 	jr z, .six
 
 .seven
-	ld a, 1000000 / $10000 % $100
+	ld a, HIGH(1000000 >> 8)
 	ld [hPrintNum5], a
-	ld a, 1000000 / $100 % $100
+	ld a, HIGH(1000000) ; mid
 	ld [hPrintNum6], a
-	ld a, 1000000 % $100
+	ld a, LOW(1000000)
 	ld [hPrintNum7], a
 	call .PrintDigit
 	call .AdvancePointer
 
 .six
-	ld a, 100000 / $10000 % $100
+	ld a, HIGH(100000 >> 8)
 	ld [hPrintNum5], a
-	ld a, 100000 / $100 % $100
+	ld a, HIGH(100000) ; mid
 	ld [hPrintNum6], a
-	ld a, 100000 % $100
+	ld a, LOW(100000)
 	ld [hPrintNum7], a
 	call .PrintDigit
 	call .AdvancePointer
 
 .five
-	xor a
+	xor a ; HIGH(10000 >> 8)
 	ld [hPrintNum5], a
-	ld a, 10000 / $100
+	ld a, HIGH(10000) ; mid
 	ld [hPrintNum6], a
-	ld a, 10000 % $100
+	ld a, LOW(10000)
 	ld [hPrintNum7], a
 	call .PrintDigit
 	call .AdvancePointer
 
 .four
-	xor a
+	xor a ; HIGH(1000 >> 8)
 	ld [hPrintNum5], a
-	ld a, 1000 / $100
+	ld a, HIGH(1000) ; mid
 	ld [hPrintNum6], a
-	ld a, 1000 % $100
+	ld a, LOW(1000)
 	ld [hPrintNum7], a
 	call .PrintDigit
 	call .AdvancePointer
 
 .three
-	xor a
+	xor a ; HIGH(100 >> 8)
 	ld [hPrintNum5], a
-	xor a
+	xor a ; HIGH(100) ; mid
 	ld [hPrintNum6], a
-	ld a, 100
+	ld a, LOW(100)
 	ld [hPrintNum7], a
 	call .PrintDigit
 	call .AdvancePointer
diff --git a/engine/routines/loadpushoam.asm b/engine/routines/loadpushoam.asm
index 6fcccbcae..6af0ddf6d 100644
--- a/engine/routines/loadpushoam.asm
+++ b/engine/routines/loadpushoam.asm
@@ -11,7 +11,7 @@ LoadPushOAM:: ; 4031
 	ret
 
 .PushOAM: ; 403f
-	ld a, Sprites / $100
+	ld a, HIGH(Sprites)
 	ld [rDMA], a
 	ld a, (SpritesEnd - Sprites) / 4 ; 40
 .pushoam_loop
diff --git a/engine/routines/phonering_copytilemapatonce.asm b/engine/routines/phonering_copytilemapatonce.asm
index 2ffa688a9..1780136d1 100644
--- a/engine/routines/phonering_copytilemapatonce.asm
+++ b/engine/routines/phonering_copytilemapatonce.asm
@@ -50,7 +50,7 @@ PhoneRing_CopyTilemapAtOnce: ; 4d188
 	ld a, SCREEN_HEIGHT
 	ld [hTilesPerCycle], a
 	ld b, 1 << 1 ; not in v/hblank
-	ld c, rSTAT % $100
+	ld c, LOW(rSTAT)
 
 .loop
 rept SCREEN_WIDTH / 2
diff --git a/engine/routines/savemenu_copytilemapatonce.asm b/engine/routines/savemenu_copytilemapatonce.asm
index de7cbaa8f..0adce91c6 100644
--- a/engine/routines/savemenu_copytilemapatonce.asm
+++ b/engine/routines/savemenu_copytilemapatonce.asm
@@ -47,7 +47,7 @@ SaveMenu_CopyTilemapAtOnce: ; 4cf45 (13:4f45)
 	ld a, SCREEN_HEIGHT
 	ld [hTilesPerCycle], a
 	ld b, 1 << 1
-	ld c, rSTAT % $100
+	ld c, LOW(rSTAT)
 
 .loop
 rept SCREEN_WIDTH / 2
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index db5a2735f..4ab673652 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -471,10 +471,10 @@ Slots_LoadReelState: ; 929f6 (24:69f6)
 
 Slot_CheckCoinCaseFull: ; 92a04 (24:6a04)
 	ld a, d
-	cp MAX_COINS / $100
+	cp HIGH(MAX_COINS)
 	jr c, .not_full
 	ld a, e
-	cp MAX_COINS % $100
+	cp LOW(MAX_COINS)
 	jr c, .not_full
 	scf
 	ret
@@ -771,10 +771,10 @@ Function92bbe: ; 92bbe
 	push hl
 	srl a
 	srl a
-	add .Unknown_92bce % $100
+	add LOW(.Unknown_92bce)
 	ld l, a
 	ld a, 0
-	adc .Unknown_92bce / $100
+	adc HIGH(.Unknown_92bce)
 	ld h, a
 	ld a, [hl]
 	pop hl
diff --git a/engine/specials.asm b/engine/specials.asm
index 95f7cdf03..82b42d8c1 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -617,9 +617,9 @@ SpecialGameboyCheck: ; c478
 
 
 Special_FadeOutMusic: ; c48f
-	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, $2
 	ld [MusicFade], a
diff --git a/engine/sprites.asm b/engine/sprites.asm
index afccc114a..755ee0835 100755
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -23,7 +23,7 @@ PlaySpriteAnimations: ; 8cf69
 	push bc
 	push af
 
-	ld a, Sprites % $100
+	ld a, LOW(Sprites)
 	ld [wCurrSpriteOAMAddr], a
 	call DoNextFrameForAllSprites
 
@@ -60,11 +60,11 @@ DoNextFrameForAllSprites: ; 8cf7a
 
 	ld a, [wCurrSpriteOAMAddr]
 	ld l, a
-	ld h, Sprites / $100
+	ld h, HIGH(Sprites)
 
 .loop2 ; Clear (Sprites + [wCurrSpriteOAMAddr] --> SpritesEnd)
 	ld a, l
-	cp SpritesEnd % $100
+	cp LOW(SpritesEnd)
 	jr nc, .done
 	xor a
 	ld [hli], a
@@ -100,11 +100,11 @@ DoNextFrameForFirst16Sprites: ; 8cfa8 (23:4fa8)
 
 	ld a, [wCurrSpriteOAMAddr]
 	ld l, a
-	ld h, (Sprites + $40) / $100
+	ld h, HIGH(Sprites + 16 * 4)
 
 .loop2 ; Clear (Sprites + [wCurrSpriteOAMAddr] --> Sprites + $40)
 	ld a, l
-	cp (Sprites + 16 * 4) % $100
+	cp LOW(Sprites + 16 * 4)
 	jr nc, .done
 	xor a
 	ld [hli], a
@@ -253,7 +253,7 @@ UpdateAnimFrame: ; 8d04c
 	push bc
 	ld a, [wCurrSpriteOAMAddr]
 	ld e, a
-	ld d, Sprites / $100
+	ld d, HIGH(Sprites)
 	ld a, [hli]
 	ld c, a ; number of objects
 .loop
@@ -302,7 +302,7 @@ UpdateAnimFrame: ; 8d04c
 	inc de
 	ld a, e
 	ld [wCurrSpriteOAMAddr], a
-	cp SpritesEnd % $100
+	cp LOW(SpritesEnd)
 	jr nc, .reached_the_end
 	dec c
 	jr nz, .loop
diff --git a/engine/start_battle.asm b/engine/start_battle.asm
index d23fe1f15..8d510b72e 100644
--- a/engine/start_battle.asm
+++ b/engine/start_battle.asm
@@ -191,7 +191,7 @@ ClearBattleRAM: ; 2ef18
 	call ClearWindowData
 
 	ld hl, hBGMapAddress
-	xor a
+	xor a ; LOW(VBGMap0)
 	ld [hli], a
-	ld [hl], VBGMap0 / $100
+	ld [hl], HIGH(VBGMap0)
 	ret
diff --git a/engine/timeset.asm b/engine/timeset.asm
index 417517005..e68f5930a 100755
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -9,9 +9,9 @@ InitClock: ; 90672 (24:4672)
 	ld [wSpriteUpdatesEnabled], a
 	ld a, $10
 	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, 8
 	call DelayFrames
diff --git a/engine/trade_animation.asm b/engine/trade_animation.asm
index 711ba4d19..fa631ae4e 100755
--- a/engine/trade_animation.asm
+++ b/engine/trade_animation.asm
@@ -627,7 +627,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: ; 292f6
 	push af
 	call ClearBGPalettes
 	call WaitTop
-	ld a, VBGMap1 / $100
+	ld a, HIGH(VBGMap1)
 	ld [hBGMapAddress + 1], a
 	call ClearTileMap
 	hlcoord 0, 0
@@ -657,7 +657,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: ; 292f6
 	call ByteFill
 	call WaitBGMap
 	call WaitTop
-	ld a, VBGMap0 / $100
+	ld a, HIGH(VBGMap0)
 	ld [hBGMapAddress + 1], a
 	call ClearTileMap
 	ret
@@ -776,7 +776,7 @@ TradeAnim_TextboxScrollStart: ; 293de
 
 TradeAnim_ScrollOutRight: ; 293ea
 	call WaitTop
-	ld a, VBGMap1 / $100
+	ld a, HIGH(VBGMap1)
 	ld [hBGMapAddress + 1], a
 	call WaitBGMap
 	ld a, $7
@@ -785,7 +785,7 @@ TradeAnim_ScrollOutRight: ; 293ea
 	ld [hWY], a
 	call DelayFrame
 	call WaitTop
-	ld a, VBGMap0 / $100
+	ld a, HIGH(VBGMap0)
 	ld [hBGMapAddress + 1], a
 	call ClearTileMap
 	call TradeAnim_IncrementJumptableIndex
@@ -802,14 +802,14 @@ TradeAnim_ScrollOutRight2: ; 2940c
 	ret
 
 .done
-	ld a, VBGMap1 / $100
+	ld a, HIGH(VBGMap1)
 	ld [hBGMapAddress + 1], a
 	call WaitBGMap
 	ld a, $7
 	ld [hWX], a
 	ld a, $90
 	ld [hWY], a
-	ld a, VBGMap0 / $100
+	ld a, HIGH(VBGMap0)
 	ld [hBGMapAddress + 1], a
 	call TradeAnim_AdvanceScriptPointer
 	ret
@@ -1009,7 +1009,7 @@ ShowOTTrademonStats: ; 29549
 TrademonStats_MonTemplate: ; 29573
 	call WaitTop
 	call TradeAnim_BlankTileMap
-	ld a, VBGMap1 / $100
+	ld a, HIGH(VBGMap1)
 	ld [hBGMapAddress + 1], a
 	hlcoord 3, 0
 	ld b, $6
@@ -1032,7 +1032,7 @@ TrademonStats_MonTemplate: ; 29573
 TrademonStats_Egg: ; 295a1
 	call WaitTop
 	call TradeAnim_BlankTileMap
-	ld a, VBGMap1 / $100
+	ld a, HIGH(VBGMap1)
 	ld [hBGMapAddress + 1], a
 	hlcoord 3, 0
 	ld b, 6
@@ -1055,7 +1055,7 @@ TrademonStats_Egg: ; 295a1
 TrademonStats_WaitBGMap: ; 295d8
 	call WaitBGMap
 	call WaitTop
-	ld a, VBGMap0 / $100
+	ld a, HIGH(VBGMap0)
 	ld [hBGMapAddress + 1], a
 	ret
 
diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm
index fadf7d4a6..13a624d7f 100755
--- a/engine/warp_connection.asm
+++ b/engine/warp_connection.asm
@@ -233,9 +233,9 @@ LoadMapTimeOfDay: ; 104750
 	ret
 
 .ClearBGMap: ; 104770 (41:4770)
-	ld a, VBGMap0 / $100
+	ld a, HIGH(VBGMap0)
 	ld [wBGMapAnchor + 1], a
-	xor a
+	xor a ; LOW(VBGMap0)
 	ld [wBGMapAnchor], a
 	ld [hSCY], a
 	ld [hSCX], a