diff options
Diffstat (limited to 'misc')
-rwxr-xr-x | misc/fixed_words.asm | 20 | ||||
-rwxr-xr-x | misc/mobile_12.asm | 4 | ||||
-rw-r--r-- | misc/mobile_22_2.asm | 2 | ||||
-rw-r--r-- | misc/mobile_40.asm | 20 | ||||
-rwxr-xr-x | misc/mobile_41.asm | 6 | ||||
-rw-r--r-- | misc/mobile_45.asm | 262 | ||||
-rwxr-xr-x | misc/mobile_46.asm | 14 | ||||
-rwxr-xr-x | misc/mobile_5b.asm | 4 |
8 files changed, 166 insertions, 166 deletions
diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index 4f56936a8..d1706778a 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -1281,7 +1281,7 @@ Function11c86e: ; 11c86e (47:486e) and a jr z, .asm_11c88a hlcoord 2, 17 - ld de, String_11c8f0 + ld de, MobileString_Prev call PlaceString hlcoord 6, 17 ld c, $3 @@ -1308,7 +1308,7 @@ Function11c86e: ; 11c86e (47:486e) cp [hl] jr nc, .asm_11c8b7 hlcoord 16, 17 - ld de, String_11c8f3 + ld de, MobileString_Next call PlaceString hlcoord 11, 17 ld a, $3 @@ -1332,7 +1332,7 @@ Function11c86e: ; 11c86e (47:486e) ret ; 11c8c7 (47:48c7) -Function11c8c7: ; 11c8c7 +BCD2String: ; 11c8c7 inc a push af and $f @@ -1340,30 +1340,30 @@ Function11c8c7: ; 11c8c7 pop af and $f0 swap a - ld [hQuotient], a + ld [hDividend + 1], a xor a - ld [$ffb5], a + ld [hDividend + 2], a push hl callba Function11a80c pop hl ld a, [wcd63] - add $f6 + add "0" ld [hli], a ld a, [wcd62] - add $f6 + add "0" ld [hli], a ret ; 11c8ec -String_11c8ec: ; 11c8ec +MobileString_Page: ; 11c8ec db "ぺージ@" ; 11c8f0 -String_11c8f0: ; 11c8f0 +MobileString_Prev: ; 11c8f0 db "まえ@" ; 11c8f3 -String_11c8f3: ; 11c8f3 +MobileString_Next: ; 11c8f3 db "つぎ@" ; 11c8f6 diff --git a/misc/mobile_12.asm b/misc/mobile_12.asm index eb601df17..f6e0e00e1 100755 --- a/misc/mobile_12.asm +++ b/misc/mobile_12.asm @@ -49,8 +49,8 @@ InitMobileProfile: ; 4802f (12:402f) call GetMysteryGift_MobileAdapterLayout call ClearBGPalettes hlcoord 0, 0 - ld b, $2 - ld c, $14 + ld b, 2 + ld c, 20 call ClearBox hlcoord 0, 1 ld a, $c diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm index 080c21890..299c6643c 100644 --- a/misc/mobile_22_2.asm +++ b/misc/mobile_22_2.asm @@ -48,7 +48,7 @@ Function8b35d: ; 8b35d Function8b363: ; 8b363 push bc - callba Function10632f + callba Mobile_AlwaysReturnNotCarry pop bc ret ; 8b36c diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 251876458..5d2799f0f 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -1808,7 +1808,7 @@ Function100b12: ; 100b12 ld [wMenuCursorBuffer], a call Function100e72 call Function100b45 - callba Function8e85 + callba InitBattlePartyMenuPals call Function100ed4 ld a, [wMenuCursorBuffer] ld [wd0d2], a @@ -1866,7 +1866,7 @@ MobileMoveSelectionScreen: ; 100b9f call Function100e72 call Function100bc2 push af - callba Function8e85 + callba InitBattlePartyMenuPals call Function100ed4 pop af ret @@ -2159,14 +2159,14 @@ Function100db0: ; 100db0 Function100dc0: ; 100dc0 ld a, [wLinkMode] cp LINK_MOBILE - jr nz, .asm_100dd0 + jr nz, .mobile ld hl, wcd2a bit 3, [hl] - jr z, .asm_100dd0 + jr z, .mobile scf ret -.asm_100dd0 +.mobile xor a ret ; 100dd2 @@ -2597,7 +2597,7 @@ Function10107d: ; 10107d ld bc, NAME_LENGTH call .CopyAllFromOT ld hl, OTPartyMonOT - ld de, wc656 + 1 + ld de, OTName + 1 ld bc, NAME_LENGTH call .CopyAllFromOT ld hl, OTPartyMon1Species @@ -7784,7 +7784,7 @@ MenuData2_103648: ; 103648 ; 103654 Function103654: ; 103654 - callba Function10632f + callba Mobile_AlwaysReturnNotCarry bit 7, c jr nz, .asm_103666 ld hl, wcd2a @@ -7800,7 +7800,7 @@ Function103654: ; 103654 ; 10366e Mobile_SelectThreeMons: ; 10366e - callba Function10632f + callba Mobile_AlwaysReturnNotCarry bit 7, c jr z, .asm_10369b ld hl, UnknownText_0x10375d @@ -8074,7 +8074,7 @@ UnknownText_0x10381e: ; 0x10381e ; 0x103823 Function103823: ; 103823 - callba Function10632f + callba Mobile_AlwaysReturnNotCarry bit 7, c jr nz, .asm_103838 callba Function1008a6 @@ -8126,7 +8126,7 @@ UnknownText_0x103876: ; 0x103876 ; 0x10387b Function10387b: ; 10387b - callba Function10632f + callba Mobile_AlwaysReturnNotCarry bit 7, c ret nz callba Function1008a6 diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index d86146a0d..e27d9a01e 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -766,7 +766,7 @@ MobileFn_106314: mobile ; 106314 ret ; 10632f -Function10632f: ; 10632f +Mobile_AlwaysReturnNotCarry: ; 10632f or a ret @@ -851,7 +851,7 @@ Function106392: ; 106392 ret .asm_1063a2 - call Function10632f + call Mobile_AlwaysReturnNotCarry ld a, c and a jr nz, .asm_1063b4 @@ -937,7 +937,7 @@ Function106403: ; 106403 ret .asm_106426 - call Function10632f + call Mobile_AlwaysReturnNotCarry ld a, c and a jr z, .asm_106435 diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 9dc8a2aab..6e2c165f7 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -78,45 +78,45 @@ Jumptable_114165: ; 114165 ; 11417f Unknown_11417f: ; 11417f - dw String_114199 - dw String_11419f - dw String_1141a7 - dw String_1141b1 - dw String_1141b5 - dw String_1141b9 - dw String_1141c2 - dw String_1141c8 - dw String_1141d6 - dw String_1141e4 - dw String_1141ee - dw String_1141fc - dw String_114209 - -String_114199: ; 114199 + dw .From + dw .Sender + dw .ReplyTo + dw .To + dw .CC + dw .Subject + dw .Date + dw .ContentType + dw .MimeVersion + dw .XMailer + dw .XGameTitle + dw .XGameCode + dw .XGBMailType + +.From: ; 114199 db "FROM:", 0 -String_11419f: ; 11419f +.Sender: ; 11419f db "SENDER:", 0 -String_1141a7: ; 1141a7 +.ReplyTo: ; 1141a7 db "REPLY-TO:", 0 -String_1141b1: ; 1141b1 +.To: ; 1141b1 db "TO:", 0 -String_1141b5: ; 1141b5 +.CC: ; 1141b5 db "CC:", 0 -String_1141b9: ; 1141b9 +.Subject: ; 1141b9 db "SUBJECT:", 0 -String_1141c2: ; 1141c2 +.Date: ; 1141c2 db "DATE:", 0 -String_1141c8: ; 1141c8 +.ContentType: ; 1141c8 db "CONTENT-TYPE:", 0 -String_1141d6: ; 1141d6 +.MimeVersion: ; 1141d6 db "MIME-VERSION:", 0 -String_1141e4: ; 1141e4 +.XMailer: ; 1141e4 db "X-MAILER:", 0 -String_1141ee: ; 1141ee +.XGameTitle: ; 1141ee db "X-GAME-TITLE:", 0 -String_1141fc: ; 1141fc +.XGameCode: ; 1141fc db "X-GAME-CODE:", 0 -String_114209: ; 114209 +.XGBMailType: ; 114209 db "X-GBMAIL-TYPE:", 0 ; 114218 @@ -131,10 +131,10 @@ String_114232: ; 114232 ; 114243 Function114243:: ; 114243 - ld a, $a + ld a, SRAM_ENABLE ld [MBC3SRamEnable], a - ld a, [$ff8c] - push af + ld a, [hFF8C] + push af ; if [wdc02] == 0, this is popped to pc. push de ld a, [wdc02] add a @@ -153,9 +153,9 @@ Function11425c: ; 11425c ld [wdc02], a pop af rept 2 - ld [$ff8c], a + ld [hFF8C], a endr - ld [$4000], a + ld [MBC3SRamBank], a ret ; 114268 @@ -171,8 +171,8 @@ Function114269: ; 114269 ld [wdc03], a ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -370,8 +370,8 @@ Function11433c: ; 11433c pop bc ld a, [wdc03] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a call Function114c0b ld hl, String_114004 .asm_114394 @@ -429,8 +429,8 @@ Function1143b7: ; 1143b7 push af ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, [hli] ld h, [hl] ld l, a @@ -473,7 +473,7 @@ Function1143f3: ; 1143f3 jr nc, .asm_114400 .asm_114407 - ld bc, VBlank5 + lb bc, $4, $0 ld a, $2 ret @@ -486,8 +486,8 @@ Function1143f3: ; 1143f3 Function114412: ; 114412 ld a, c ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld hl, Unknown_11417f ld a, b add a @@ -506,17 +506,17 @@ Function114412: ; 114412 jp z, .asm_1144c2 inc e call z, Function1144c8 - cp $d + cp $d ; CR jr nz, .asm_11442b ld a, [de] inc e call z, Function1144c8 - cp $a + cp $a ; NL jr nz, .asm_11442b ld a, [de] - cp $2e + cp $2e ; . jr z, .asm_1144ae - cp $d + cp $d ; CR jr z, .asm_1144b8 .asm_11444a @@ -527,9 +527,9 @@ Function114412: ; 114412 jr z, .asm_1144c2 inc e call z, Function1144c8 - cp $61 + cp $61 ; "a" jr c, .asm_114462 - cp $7b + cp $7b ; "z" + 1 jr nc, .asm_114462 sub $20 @@ -553,10 +553,10 @@ Function114412: ; 114412 jr .asm_11446e .asm_114476 - ld a, $20 + ld a, $20 ; " " cp b jr z, .asm_114481 - ld a, $a + ld a, $a ; NL cp b jr z, .asm_114481 dec de @@ -572,18 +572,18 @@ Function114412: ; 114412 inc bc inc e call z, Function1144c8 - cp $d + cp $d ; CR jr nz, .asm_114486 ld a, [de] inc bc inc e call z, Function1144c8 - cp $a + cp $a ; NL jr nz, .asm_114486 ld a, [de] - cp $20 + cp $20 ; " " jr z, .asm_114486 - cp $9 + cp $9 ; TAB jr z, .asm_114486 ld d, h ld e, l @@ -596,14 +596,14 @@ Function114412: ; 114412 inc e call z, Function1144c8 ld a, [de] - cp $d + cp $d ; CR jp nz, .asm_11442b .asm_1144b8 inc e call z, Function1144c8 ld a, [de] - cp $a + cp $a ; NL jp nz, .asm_11442b .asm_1144c2 @@ -676,8 +676,8 @@ endr pop hl ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -693,8 +693,8 @@ endr ld hl, wdc06 ld a, [hl] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld hl, wdc09 ld e, [hl] inc hl @@ -753,8 +753,8 @@ Function114576: ; 114576 jr nz, .asm_1145b4 ld a, h ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a push hl push de push bc @@ -771,8 +771,8 @@ Function114576: ; 114576 jr nz, .asm_1145ba ld a, h ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld hl, String_114218 call Function114acf @@ -945,8 +945,8 @@ Function11463c: ; 11463c pop de pop af ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a xor a ld [Carpet], a ld a, $1 @@ -968,8 +968,8 @@ Function1146a4: ; 1146a4 ld hl, wdc03 ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -982,8 +982,8 @@ Function1146a4: ; 1146a4 ld hl, wdc03 ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -1027,8 +1027,8 @@ Function1146fa: ; 1146fa ld hl, wdc03 ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -1041,8 +1041,8 @@ Function1146fa: ; 1146fa ld a, $1 ld [wdc0e], a ld a, [wdc00] - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, $1 ld [RightOrnament], a call Function1147cd @@ -1068,8 +1068,8 @@ Function1146fa: ; 1146fa ld hl, wdc03 ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -1123,8 +1123,8 @@ endr ld hl, wdc03 ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a call Function114a7a and a jr z, .asm_1147cb @@ -1236,8 +1236,8 @@ Function114843: ; 114843 ld a, [wdc00] push af push de - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a call Function114a18 and a jr nz, .asm_11485f @@ -1260,8 +1260,8 @@ Function114867: ; 114867 ld hl, wdc06 ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -1327,8 +1327,8 @@ Function1148c2: ; 1148c2 ld hl, wdc06 ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -1427,8 +1427,8 @@ Function11494d: ; 11494d ld hl, wdc06 ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -1519,8 +1519,8 @@ Function1149cc: ; 1149cc ld hl, wdc06 ld a, [hl] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a push de ld hl, wdc09 ld e, [hl] @@ -1874,8 +1874,8 @@ endr ld hl, wdc06 ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -1913,8 +1913,8 @@ Function114bbc: ; 114bbc jr nz, .asm_114bff ld a, h ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a call Function114c0b ld hl, wdc24 call Function114c5e @@ -1924,8 +1924,8 @@ Function114bbc: ; 114bbc pop hl ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, [hli] ld e, a ld d, [hl] @@ -2136,8 +2136,8 @@ Function114cd9: ; 114cd9 ld [wdc04], a ld a, h ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld hl, wdc24 call Function114d39 ld hl, wdc24 @@ -2155,8 +2155,8 @@ endr pop hl ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, [hli] ld e, a ld a, [hli] @@ -2460,8 +2460,8 @@ Function114ea0: ; 114ea0 ld hl, wdc06 ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, [hli] ld e, a ld a, [hli] @@ -2666,8 +2666,8 @@ Function114f59: ; 114f59 inc hl ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -2745,8 +2745,8 @@ Function115020: ; 115020 ld hl, wdc06 ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, [hli] ld e, a ld a, [hli] @@ -2804,8 +2804,8 @@ Function115062: ; 115062 ld c, a ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -2958,8 +2958,8 @@ Function115136: ; 115136 ld hl, wdc06 ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, [hli] ld e, a ld a, [hli] @@ -3013,8 +3013,8 @@ Function115179: ; 115179 ld hl, wdc06 ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, [hli] ld e, a ld a, [hli] @@ -3133,8 +3133,8 @@ Function115217: ; 115217 ld hl, wdc06 ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, [hli] ld e, a ld a, [hli] @@ -3228,8 +3228,8 @@ Function11528f: ; 11528f inc hl ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, [hli] ld e, a ld a, [hli] @@ -3483,8 +3483,8 @@ Function1153d2: ; 1153d2 .asm_1153f5 ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -3617,8 +3617,8 @@ Function1153d2: ; 1153d2 ld hl, RightOrnament ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -3854,8 +3854,8 @@ Function11560a: ; 11560a ld [wCurrentMapSignpostCount], a ld a, [wdc17] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld hl, wdc1a ld c, [hl] inc hl @@ -3927,8 +3927,8 @@ Function11560a: ; 11560a ld [hl], d pop bc ld a, [wCurrentMapSignpostCount] - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld hl, wCurrMapTriggerCount ld e, [hl] inc hl @@ -4238,8 +4238,8 @@ Function11581e: ; 11581e ld hl, wdc02 ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -4292,8 +4292,8 @@ Function11581e: ; 11581e ld hl, wCurrMapTriggerCount ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -4767,8 +4767,8 @@ Function115b00: ; 115b00 ld hl, wdc02 ld a, [hli] ld [wdc00], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -4856,8 +4856,8 @@ endr ld hl, wCurrMapTriggerCount ld a, [hli] ld [wCurrentMapSignpostCount], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] @@ -5258,8 +5258,8 @@ Function115d80: ; 115d80 ld a, [bc] inc a ld [bc], a - ld [$ff8c], a - ld [$4000], a + ld [hFF8C], a + ld [MBC3SRamBank], a ld a, e ld d, $a0 ld e, $0 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 226f96100..a40829250 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -5453,7 +5453,7 @@ Function11a80c: ; 11a80c ld bc, hQuotient ld hl, Unknown_11a8ba call Function11a88c - ld bc, $ffb5 + ld bc, hPrintNum3 ld hl, Unknown_11a8da call Function11a88c xor a @@ -5461,11 +5461,11 @@ Function11a80c: ; 11a80c ld a, [hDivisor] and $f ld e, a - ld a, [$ffb9] + ld a, [hPrintNum7] and $f call Function11a884 ld e, a - ld a, [$ffbb] + ld a, [hPrintNum9] and $f call Function11a884 ld [wcd62], a @@ -5477,12 +5477,12 @@ Function11a80c: ; 11a80c swap a call Function11a884 ld e, a - ld a, [$ffb9] + ld a, [hPrintNum7] and $f0 swap a call Function11a884 ld e, a - ld a, [$ffbb] + ld a, [hPrintNum9] and $f0 swap a call Function11a884 @@ -5494,11 +5494,11 @@ Function11a80c: ; 11a80c and $f call Function11a884 ld e, a - ld a, [$ffba] + ld a, [hPrintNum8] and $f call Function11a884 ld e, a - ld a, [$ffbc] + ld a, [hPrintNum10] and $f call Function11a884 ld [wcd64], a diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm index 735297e8b..24f2f9189 100755 --- a/misc/mobile_5b.asm +++ b/misc/mobile_5b.asm @@ -2,7 +2,7 @@ Function16c000: ; 16c000 ld a, [hCGB] and a ret z - ld a, [$ffea] + ld a, [hFFEA] and a ret z ld a, [wcfbe] @@ -15,7 +15,7 @@ Function16c000: ; 16c000 call Function16c031 callba Function1000a4 xor a - ld [$ffea], a + ld [hFFEA], a pop af ld [wcfbe], a ret |