diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events_2.asm | 22 | ||||
| -rw-r--r-- | engine/map_objects.asm | 22 | ||||
| -rw-r--r-- | engine/pack.asm | 2 | ||||
| -rw-r--r-- | engine/radio2.asm | 2 |
4 files changed, 24 insertions, 24 deletions
diff --git a/engine/events_2.asm b/engine/events_2.asm index 42bae51fc..5acc72346 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -109,7 +109,7 @@ RandomEncounter:: ; 97cc0 call CanUseSweetScent jr nc, .nope ld hl, StatusFlags2 - bit 2, [hl] + bit 2, [hl] ; bug contest jr nz, .bug_contest callba TryWildEncounter jr nz, .nope @@ -153,11 +153,11 @@ CanUseSweetScent:: ; 97cfd bit 5, [hl] jr nz, .no ld a, [wPermission] - cp $4 + cp CAVE jr z, .ice_check - cp $7 + cp DUNGEON jr z, .ice_check - callba Function149dd + callba CheckGrassCollision jr nc, .no .ice_check @@ -237,9 +237,9 @@ ChooseWildEncounter_BugContest:: ; 97d31 TryWildEncounter_BugContest: ; 97d64 ld a, [StandingTile] call CheckSuperTallGrassTile - ld b, $66 + ld b, 40 percent jr z, .ok - ld b, $33 + ld b, 20 percent .ok callba ApplyMusicEffectOnEncounterRate @@ -473,11 +473,11 @@ endr ; 97e94 Table97e94: ; 97e94 - dbw BANK(Function97eb7), Function97eb7 - dbw BANK(Function97eb8), Function97eb8 - dbw BANK(Function97f42), Function97f42 - dbw BANK(Function97ef9), Function97ef9 - dbw BANK(Function97ebc), Function97ebc + dba Function97eb7 + dba Function97eb8 + dba Function97f42 + dba Function97ef9 + dba Function97ebc ; 97ea3 Function97ea3: ; 97ea3 diff --git a/engine/map_objects.asm b/engine/map_objects.asm index c7d799e7f..69c6321f5 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2928,7 +2928,7 @@ Function56cd: ; 56cd sub $20 .ok3 - ld [$ffbd], a + ld [hUsedSpriteIndex], a ld a, [wd14d] ld e, a ld hl, OBJECT_SPRITE_Y_OFFSET @@ -2960,7 +2960,7 @@ Function56cd: ; 56cd sub $20 .ok6 - ld [$ffbe], a + ld [hUsedSpriteTile], a ld hl, OBJECT_PALETTE add hl, bc bit 7, [hl] @@ -2978,14 +2978,14 @@ Function56cd: ; 56cd .loop ld a, [$ffbf] ld d, a - ld a, [$ffbe] + ld a, [hUsedSpriteTile] add e dec a cp $12 jr nc, .ok9 ld b, a .next - ld a, [$ffbd] + ld a, [hUsedSpriteIndex] add d dec a cp $14 @@ -3336,7 +3336,7 @@ RefreshMapAppearDisappear:: ; 5920 bit 0, a ret z xor a - ld [$ffbd], a + ld [hUsedSpriteIndex], a ld a, [hOAMUpdate] push af ld a, 1 @@ -3356,7 +3356,7 @@ Function593a: ; 593a ld b, $70 .ok - ld a, [$ffbd] + ld a, [hUsedSpriteIndex] cp b ret nc ld l, a @@ -3596,11 +3596,11 @@ Function5a0d: ; 5a0d ld h, [hl] ld l, a - ld a, [$ffbd] + ld a, [hUsedSpriteIndex] ld c, a ld b, Sprites / $100 ld a, [hli] - ld [$ffbe], a + ld [hUsedSpriteTile], a add c cp SpritesEnd % $100 jr nc, .full @@ -3645,13 +3645,13 @@ Function5a0d: ; 5a0d ld [bc], a inc c - ld a, [$ffbe] + ld a, [hUsedSpriteTile] dec a - ld [$ffbe], a + ld [hUsedSpriteTile], a jr nz, .addsprite ld a, c - ld [$ffbd], a + ld [hUsedSpriteIndex], a .done xor a diff --git a/engine/pack.asm b/engine/pack.asm index ecdb35c74..a414ecf49 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1408,7 +1408,7 @@ Function10955: ; 10955 ld a, BANK(PackMenuGFX) call FarCopyBytes hlcoord 0, 1 - ld bc, $00dc + lb bc, 0, 220 ld a, $24 call ByteFill hlcoord 5, 1 diff --git a/engine/radio2.asm b/engine/radio2.asm index b843315d4..039631130 100644 --- a/engine/radio2.asm +++ b/engine/radio2.asm @@ -385,7 +385,7 @@ NoRadioName: ; 918a9 (24:58a9) xor a ld [hBGMapMode], a ; $ff00+$d4 hlcoord 1, 8 - ld bc, $312 + lb bc, 3, 18 call ClearBox hlcoord 0, 12 ld bc, $412 |