diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/credits.asm | 4 | ||||
| -rw-r--r-- | engine/diploma.asm | 2 | ||||
| -rw-r--r-- | engine/events.asm | 6 | ||||
| -rw-r--r-- | engine/events_2.asm | 2 | ||||
| -rw-r--r-- | engine/pack.asm | 6 | ||||
| -rw-r--r-- | engine/predef.asm | 2 |
6 files changed, 12 insertions, 10 deletions
diff --git a/engine/credits.asm b/engine/credits.asm index 449fc0ac0..524b97fb2 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -187,7 +187,7 @@ Function109847:: ; 109847 ld [hLCDStatCustom], a call GetCreditsPalette - call Function32f9 + call SetPalettes ld a, [hVBlank] push af ld a, $5 @@ -447,7 +447,7 @@ endr xor a ld [wcf64], a ; frame call GetCreditsPalette - call Function32f9 ; update hw pal registers + call SetPalettes ; update hw pal registers jr .loop .clear diff --git a/engine/diploma.asm b/engine/diploma.asm index 420bff7f1..f14ac383d 100644 --- a/engine/diploma.asm +++ b/engine/diploma.asm @@ -33,7 +33,7 @@ Function1dd709: ; 1dd709 call WaitBGMap ld b, $8 call GetSGBLayout - call Function32f9 + call SetPalettes call DelayFrame ret ; 1dd760 diff --git a/engine/events.asm b/engine/events.asm index ae28e0c38..881f81af2 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -1021,12 +1021,14 @@ Function96bd3: ; 96bd3 ; 96bd7 Function96bd7: ; 96bd7 - ld a, [wdca1] + ld a, [RepelStepsLeft] and a ret z + dec a - ld [wdca1], a + ld [RepelStepsLeft], a ret nz + ld a, BANK(RepelWoreOffScript) ld hl, RepelWoreOffScript call CallScript diff --git a/engine/events_2.asm b/engine/events_2.asm index 019894298..ea4dff31e 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -278,7 +278,7 @@ Function97db5: ; 97db5 call GetMapHeaderPhoneServiceNybble and a jr nz, .NoCall - ld hl, wdca1 + 1 + ld hl, wdca2 ld a, [hli] ld d, a ld e, [hl] diff --git a/engine/pack.asm b/engine/pack.asm index 84413e1cb..f09e7d715 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -594,7 +594,7 @@ Function103fd: ; 103fd callba WritePartyMenuTilemap callba PrintPartyMenuText call WaitBGMap - call Function32f9 + call SetPalettes call DelayFrame callba PartyMenuSelect jr c, .asm_10475 @@ -1112,7 +1112,7 @@ Function107bb: ; 107bb ld a, [InputType] or a jr z, .asm_107ca - callba Function1de28f + callba Start_DudeAutoInput_RightA .asm_107ca call Function107d7 @@ -1507,7 +1507,7 @@ Function10a40: ; 10a40 call WaitBGMap ld b, $14 call GetSGBLayout - call Function32f9 + call SetPalettes call DelayFrame ret ; 10a4f diff --git a/engine/predef.asm b/engine/predef.asm index 9ee46bf47..3e6e807c9 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -50,7 +50,7 @@ PredefPointers:: ; 856b add_predef PrintMoveDesc add_predef UpdatePlayerHUD add_predef FillBox - add_predef Function3d873 + add_predef CheckPlayerPartyForFitPkmn add_predef UpdateEnemyHUD add_predef StartBattle add_predef FillInExpBar |