diff options
Diffstat (limited to 'event')
| -rwxr-xr-x | event/halloffame.asm | 8 | ||||
| -rwxr-xr-x | event/happiness_egg.asm | 10 | ||||
| -rw-r--r-- | event/magikarp.asm | 2 | ||||
| -rwxr-xr-x | event/mom_phone.asm | 6 | ||||
| -rw-r--r-- | event/poisonstep_pals.asm | 4 | ||||
| -rwxr-xr-x | event/special.asm | 4 | ||||
| -rw-r--r-- | event/unown.asm | 8 |
7 files changed, 21 insertions, 21 deletions
diff --git a/event/halloffame.asm b/event/halloffame.asm index 3fadb233a..5fa1dc270 100755 --- a/event/halloffame.asm +++ b/event/halloffame.asm @@ -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 diff --git a/event/happiness_egg.asm b/event/happiness_egg.asm index 0c9b5a4df..a1ade1364 100755 --- a/event/happiness_egg.asm +++ b/event/happiness_egg.asm @@ -159,9 +159,9 @@ DayCareStep:: ; 7282 dec hl inc [hl] ld a, [hl] - cp 5242880 / $10000 + cp HIGH(MAX_DAY_CARE_EXP >> 8) jr c, .day_care_lady - ld a, 5242880 / $10000 + ld a, HIGH(MAX_DAY_CARE_EXP >> 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(MAX_DAY_CARE_EXP >> 8) jr c, .check_egg - ld a, 5242880 / $10000 + ld a, HIGH(MAX_DAY_CARE_EXP >> 8) ld [hl], a .check_egg @@ -199,7 +199,7 @@ DayCareStep:: ; 7282 callfar CheckBreedmonCompatibility ld a, [wd265] cp 230 - ld b, -1 + 32 percent + ld b, 32 percent - 1 jr nc, .okay ld a, [wd265] cp 170 diff --git a/event/magikarp.asm b/event/magikarp.asm index 4dab89816..02c4b10cd 100644 --- a/event/magikarp.asm +++ b/event/magikarp.asm @@ -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: diff --git a/event/mom_phone.asm b/event/mom_phone.asm index 35021dd42..bef7d5688 100755 --- a/event/mom_phone.asm +++ b/event/mom_phone.asm @@ -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 diff --git a/event/poisonstep_pals.asm b/event/poisonstep_pals.asm index 8930d4c5d..088be8848 100644 --- a/event/poisonstep_pals.asm +++ b/event/poisonstep_pals.asm @@ -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 diff --git a/event/special.asm b/event/special.asm index 8937698f5..d28d0de64 100755 --- a/event/special.asm +++ b/event/special.asm @@ -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 diff --git a/event/unown.asm b/event/unown.asm index 1be858bd6..6c0e972f8 100644 --- a/event/unown.asm +++ b/event/unown.asm @@ -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 |