diff options
| -rwxr-xr-x | engine/battle/animations.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 4 | ||||
| -rw-r--r-- | engine/events/hidden_objects/gym_statues.asm | 2 | ||||
| -rwxr-xr-x | scripts/PalletTown.asm | 8 | ||||
| -rwxr-xr-x | wram.asm | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index c9f53961..f19f1f4f 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -425,7 +425,7 @@ ShareMoveAnimations: and a ret z - ; opponent’s turn + ; opponent's turn ld a, [wAnimationID] diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 24ae8dfc..8cb3cd0a 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3255,14 +3255,14 @@ PrintGhostText: ldh a, [hWhoseTurn] and a jr nz, .Ghost - ld a, [wBattleMonStatus] ; player’s turn + ld a, [wBattleMonStatus] ; player's turn and SLP | (1 << FRZ) ret nz ld hl, ScaredText call PrintText xor a ret -.Ghost ; ghost’s turn +.Ghost ; ghost's turn ld hl, GetOutText call PrintText xor a diff --git a/engine/events/hidden_objects/gym_statues.asm b/engine/events/hidden_objects/gym_statues.asm index 1f592f2f..97b01a3a 100644 --- a/engine/events/hidden_objects/gym_statues.asm +++ b/engine/events/hidden_objects/gym_statues.asm @@ -1,6 +1,6 @@ GymStatues: ; if in a gym and have the corresponding badge, a = GymStatueText2_id and jp PrintPredefTextID -; if in a gym and don’t have the corresponding badge, a = GymStatueText1_id and jp PrintPredefTextID +; if in a gym and don't have the corresponding badge, a = GymStatueText1_id and jp PrintPredefTextID ; else ret call EnableAutoTextBoxDrawing ld a, [wSpritePlayerStateData1FacingDirection] diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index 5c4c4de8..5c26fc55 100755 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -31,7 +31,7 @@ PalletTownScript0: call PlaySound ld a, BANK(Music_MeetProfOak) ld c, a - ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music + ld a, MUSIC_MEET_PROF_OAK ; "oak appears" music call PlayMusic ld a, $FC ld [wJoyIgnore], a @@ -76,7 +76,7 @@ PalletTownScript2: predef CalcPositionOfPlayerRelativeToNPC ld hl, hNPCPlayerYDistance dec [hl] - predef FindPathToPlayer ; load Oak’s movement into wNPCMovementDirections2 + predef FindPathToPlayer ; load Oak's movement into wNPCMovementDirections2 ld de, wNPCMovementDirections2 ld a, 1 ; oak ldh [hSpriteIndex], a @@ -205,10 +205,10 @@ PalletTownText5: ; sign by fence text_far _PalletTownText5 text_end -PalletTownText6: ; sign by Red’s house +PalletTownText6: ; sign by Red's house text_far _PalletTownText6 text_end -PalletTownText7: ; sign by Blue’s house +PalletTownText7: ; sign by Blue's house text_far _PalletTownText7 text_end @@ -2295,7 +2295,7 @@ wCurrentTileBlockMapViewPointer:: ds 2 wYCoord:: -; player’s position on the current map +; player's position on the current map ds 1 wXCoord:: |