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

@@ -116,13 +116,13 @@ Function170139: ; 170139
ld a, c
ld [de], a
inc de
ld a, PartyMons % $100
ld a, LOW(PartyMons)
ld [wcd49], a
ld a, PartyMons / $100
ld a, HIGH(PartyMons)
ld [wcd4a], a
ld a, PartyMonNicknames % $100
ld a, LOW(PartyMonNicknames)
ld [wcd4b], a
ld a, PartyMonNicknames / $100
ld a, HIGH(PartyMonNicknames)
ld [wcd4c], a
ld a, 3
.CopyLoop:
@@ -355,9 +355,9 @@ ReadBTTrainerParty: ; 1702b7
ld hl, wBT_OTTempTrainerClass
ld a, [hli]
ld [OtherTrainerClass], a
ld a, OTPartyMonNicknames % $100
ld a, LOW(OTPartyMonNicknames)
ld [BGMapBuffer], a
ld a, OTPartyMonNicknames / $100
ld a, HIGH(OTPartyMonNicknames)
ld [BGMapBuffer + 1], a
; Copy Pkmn into Memory from the address in hl

View File

@@ -3015,26 +3015,26 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba
ld a, [rSVBK]
push af
ld hl, $c648
ld a, w5_d800 % $100
ld a, LOW(w5_d800)
ld [wcd2d], a
ld [hli], a
ld a, w5_d800 / $100
ld a, HIGH(w5_d800)
ld [wcd2e], a
ld [hl], a
ld a, SortedPokemon % $100
ld a, LOW(SortedPokemon)
ld [wcd2f], a
ld a, SortedPokemon / $100
ld a, HIGH(SortedPokemon)
ld [wcd30], a
ld a, $c6a8 % $100
ld a, LOW($c6a8)
ld [wcd31], a
ld a, $c6a8 / $100
ld a, HIGH($c6a8)
ld [wcd32], a
ld a, $c64a % $100
ld a, LOW($c64a)
ld [wcd33], a
ld a, $c64a / $100
ld a, HIGH($c64a)
ld [wcd34], a
ld hl, EZChat_SortedWords

View File

@@ -39,9 +39,9 @@ InitMobileProfile: ; 4802f (12:402f)
.asm_4808a
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

View File

@@ -2736,9 +2736,9 @@ LoadSelectedPartiesForColosseum: ; 1010f2
.ContinueCopy:
; Copy, via wc608...
ld a, wc608 % $100
ld a, LOW(wc608)
ld [StringBuffer2], a
ld a, wc608 / $100
ld a, HIGH(wc608)
ld [StringBuffer2 + 1], a
; ... bc bytes...
ld a, c
@@ -7237,9 +7237,9 @@ Function1030cd: ; 1030cd
add a
add a
add Unknown_10327a % $100
add LOW(Unknown_10327a)
ld l, a
ld a, Unknown_10327a / $100
ld a, HIGH(Unknown_10327a)
adc 0
ld h, a

View File

@@ -1297,7 +1297,7 @@ MobileTradeAnim_DisplayReceivedMon:
MobileTradeAnim_DisplayEggData
call WaitTop
call MobileTradeAnim_ClearTilemap
ld a, VBGMap1 / $100
ld a, HIGH(VBGMap1)
ld [hBGMapAddress + 1], a
hlcoord 5, 0
ld b, 6
@@ -1320,7 +1320,7 @@ MobileTradeAnim_DisplayEggData
Function108a33: ; 108a33
call WaitTop
call MobileTradeAnim_ClearTilemap
ld a, VBGMap1 / $100
ld a, HIGH(VBGMap1)
ld [hBGMapAddress + 1], a
hlcoord 5, 0
ld b, 6
@@ -1340,7 +1340,7 @@ Function108a33: ; 108a33
MobileTradeAnim_LoadMonTemplate: ; 108a5b
call WaitTop
call MobileTradeAnim_ClearTilemap
ld a, VBGMap1 / $100
ld a, HIGH(VBGMap1)
ld [hBGMapAddress + 1], a
hlcoord 4, 0
ld b, 6
@@ -1363,7 +1363,7 @@ MobileTradeAnim_LoadMonTemplate: ; 108a5b
MobileTradeAnim_MonDisplay_UpdateBGMap: ; 108a87
call WaitBGMap
call WaitTop
ld a, VBGMap0 / $100
ld a, HIGH(VBGMap0)
ld [hBGMapAddress + 1], a
ret
; 108a92

View File

@@ -1,4 +1,3 @@
SECTION "bank45", ROMX
charmap " ", $20 ; revert to ascii
@@ -7613,9 +7612,9 @@ Function117c4a:
ld c, 8
.loop
push hl
ld a, $7fff % $100
ld a, LOW(palred 31 + palgreen 31 + palblue 31)
ld [hli], a
ld a, $7fff / $100
ld a, HIGH(palred 31 + palgreen 31 + palblue 31)
ld [hl], a
pop hl
add hl, de

View File

@@ -1901,17 +1901,17 @@ Function118f68:
and a
jr z, .asm_118fba
ld hl, $c346
ld a, $c608 % $100
ld a, LOW($c608)
ld [hli], a
ld a, $c608 / $100
ld a, HIGH($c608)
ld [hli], a
ld a, [wcd4b]
ld [hli], a
ld a, [wcd4c]
ld [hli], a
ld a, $c708 % $100
ld a, LOW($c708)
ld [hli], a
ld a, $c708 / $100
ld a, HIGH($c708)
ld [hli], a
ld a, $60
ld [hli], a
@@ -2530,17 +2530,17 @@ Function1193a0:
ld [wcd3c], a
call BattleTowerRoomMenu2
ld hl, $c346
ld a, wd000 % $100
ld a, LOW(wd000)
ld [hli], a
ld a, wd000 / $100
ld a, HIGH(wd000)
ld [hli], a
ld a, [wcd3b]
ld [hli], a
xor a
ld [hli], a
ld a, $c708 % $100
ld a, LOW($c708)
ld [hli], a
ld a, $c708 / $100
ld a, HIGH($c708)
ld [hli], a
ld a, $60
ld [hli], a
@@ -3358,17 +3358,17 @@ Function1198f7:
ld hl, $c608 + 2
call Function119940
ld hl, w3_d800
ld a, $c608 % $100
ld a, LOW($c608)
ld [hli], a
ld a, $c608 / $100
ld a, HIGH($c608)
ld [hli], a
ld a, $f6
ld [hli], a
xor a
ld [hli], a
ld a, $c708 % $100
ld a, LOW($c708)
ld [hli], a
ld a, $c708 / $100
ld a, HIGH($c708)
ld [hli], a
ld a, [wcd51]
ld [hli], a
@@ -3794,10 +3794,10 @@ Function119b6b: ; 119b6b
cp $d
jr nz, .asm_119b93
ld a, l
cp (w3_d869) % $100
cp LOW(w3_d869)
jr nz, .asm_119be3
ld a, h
cp (w3_d869) / $100
cp HIGH(w3_d869)
jr nz, .asm_119be3
ld a, $5
call GetSRAMBank
@@ -5497,9 +5497,9 @@ Function11a90f: ; 11a90f
.asm_11a94f
xor a
ld [$c31f], a
ld a, $c320 % $100
ld a, LOW($c320)
ld [$c31b], a
ld a, $c320 / $100
ld a, HIGH($c320)
ld [$c31c], a
hlcoord 1, 14
ld a, l
@@ -7456,29 +7456,29 @@ Function11b6b4: ; 11b6b4
ld a, [wcd31]
ld [$c709], a
ld a, $c708 % $100
ld a, LOW($c708) ; Species
ld [wMobileMonSpeciesPointerBuffer], a
ld a, $c708 / $100
ld a, HIGH($c708)
ld [wMobileMonSpeciesPointerBuffer + 1], a
ld a, $c60d % $100 ; Partymon Struct
ld a, LOW($c60d) ; Partymon Struct
ld [wMobileMonStructurePointerBuffer], a
ld a, $c60d / $100
ld a, HIGH($c60d)
ld [wMobileMonStructurePointerBuffer + 1], a
ld a, $c63d % $100 ; OT
ld a, LOW($c63d) ; OT
ld [wMobileMonOTNamePointerBuffer], a
ld a, $c63d / $100
ld a, HIGH($c63d)
ld [wMobileMonOTNamePointerBuffer + 1], a
ld a, $c642 % $100 ; Nickname
ld a, LOW($c642) ; Nickname
ld [wMobileMonNicknamePointerBuffer], a
ld a, $c642 / $100
ld a, HIGH($c642)
ld [wMobileMonNicknamePointerBuffer + 1], a
ld a, $c647 % $100 ; ???
ld a, LOW($c647) ; Mail
ld [wMobileMonMailPointerBuffer], a
ld a, $c647 / $100
ld a, HIGH($c647)
ld [wMobileMonMailPointerBuffer + 1], a
ld a, $46
@@ -7762,29 +7762,29 @@ Function11b93b: ; 11b93b
call CopyBytes
call CloseSRAM
ld a, $c608 % $100
ld a, LOW($c608)
ld [wMobileMonSpeciesPointerBuffer], a
ld a, $c608 / $100
ld a, HIGH($c608)
ld [wMobileMonSpeciesPointerBuffer + 1], a
ld a, $c611 % $100
ld a, LOW($c611)
ld [wMobileMonStructurePointerBuffer], a
ld a, $c611 / $100
ld a, HIGH($c611)
ld [wMobileMonStructurePointerBuffer + 1], a
ld a, $c641 % $100
ld a, LOW($c641)
ld [wMobileMonOTNamePointerBuffer], a
ld a, $c641 / $100
ld a, HIGH($c641)
ld [wMobileMonOTNamePointerBuffer + 1], a
ld a, $c646 % $100
ld a, LOW($c646)
ld [wMobileMonNicknamePointerBuffer], a
ld a, $c646 / $100
ld a, HIGH($c646)
ld [wMobileMonNicknamePointerBuffer + 1], a
ld a, $c64b % $100
ld a, LOW($c64b)
ld [wMobileMonMailPointerBuffer], a
ld a, $c64b / $100
ld a, HIGH($c64b)
ld [wMobileMonMailPointerBuffer + 1], a
call AddMobileMonToParty
farcall SaveAfterLinkTrade