diff options
| -rw-r--r-- | engine/battle/core.asm | 6 | ||||
| -rw-r--r-- | engine/battle/effects.asm | 2 | ||||
| -rw-r--r-- | engine/events/hidden_objects/vermilion_gym_trash.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/palettes.asm | 2 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 4 | ||||
| -rw-r--r-- | home/text.asm | 2 | ||||
| -rw-r--r-- | home/uncompress.asm | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c833fc71..8aa27cce 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2375,10 +2375,10 @@ PartyMenuOrRockOrRun: jr nz, .doEnemyMonAnimation ; enemy mon doesn't have substitute ld a, [wEnemyMonMinimized] - and a ; has the enemy mon used Minimise? + and a ; has the enemy mon used Minimize? ld hl, AnimationMinimizeMon jr nz, .doEnemyMonAnimation -; enemy mon is not minimised +; enemy mon is not minimized ld a, [wEnemyMonSpecies] ld [wCurPartySpecies], a ld [wCurSpecies], a @@ -2994,7 +2994,7 @@ SelectEnemyMove: pop hl jr z, .chooseRandomMove ; move disabled, try again and a - jr z, .chooseRandomMove ; move non-existant, try again + jr z, .chooseRandomMove ; move non-existent, try again .done ld [wEnemySelectedMove], a ret diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index 5782a3f0..a3a552e7 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -295,7 +295,7 @@ FreezeBurnParalyzeEffect: ld hl, BurnedText jp PrintText .freeze2 -; hyper beam bits aren't reseted for opponent's side +; hyper beam bits aren't reset for opponent's side ld a, 1 << FRZ ld [wBattleMonStatus], a ld hl, FrozenText diff --git a/engine/events/hidden_objects/vermilion_gym_trash.asm b/engine/events/hidden_objects/vermilion_gym_trash.asm index 28cb15a6..73e50cca 100644 --- a/engine/events/hidden_objects/vermilion_gym_trash.asm +++ b/engine/events/hidden_objects/vermilion_gym_trash.asm @@ -142,7 +142,7 @@ VermilionGymTrashSuccessText2:: text_end ; unused -VermilionGymTrashSuccesPlaySfx: +VermilionGymTrashSuccessPlaySfx: text_asm call WaitForSoundToFinish ld a, SFX_SWITCH diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index f69eeba9..ef532c66 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -213,7 +213,7 @@ SetPal_TrainerCard: srl a push af jr c, .haveBadge -; The player doens't have the badge, so zero the badge's blk data. +; The player doesn't have the badge, so zero the badge's blk data. push bc ld a, [de] ld c, a diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 33556e26..14eb0b28 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -217,11 +217,11 @@ DisplayNamingScreen: .didNotPressED ld a, [wCurrentMenuItem] cp $6 ; case switch row - jr nz, .didNotPressCaseSwtich + jr nz, .didNotPressCaseSwitch ld a, [wTopMenuItemX] cp $1 ; case switch column jr z, .pressedA_changedCase -.didNotPressCaseSwtich +.didNotPressCaseSwitch ld hl, wMenuCursorLocation ld a, [hli] ld h, [hl] diff --git a/home/text.asm b/home/text.asm index 112956da..df5cfe51 100644 --- a/home/text.asm +++ b/home/text.asm @@ -278,7 +278,7 @@ _ContTextNoPause:: ; move both rows of text in the normal text box up one row ; always called twice in a row -; first time, copy the two rows of text to the "in between" rows that are usually emtpy +; first time, copy the two rows of text to the "in between" rows that are usually empty ; second time, copy the bottom row of text into the top row of text ScrollTextUpOneLine:: hlcoord 0, 14 ; top row of text diff --git a/home/uncompress.asm b/home/uncompress.asm index 9e434497..b6cb1e8d 100644 --- a/home/uncompress.asm +++ b/home/uncompress.asm @@ -466,7 +466,7 @@ DecodeNybble1TableFlipped:: dn $e, $6 dn $2, $a -; combines the two loaded chunks with xor (the chunk loaded second is the destination). The source chunk is differeintial decoded beforehand. +; combines the two loaded chunks with xor (the chunk loaded second is the destination). The source chunk is differential decoded beforehand. XorSpriteChunks:: xor a ld [wSpriteCurPosX], a @@ -568,7 +568,7 @@ ResetSpriteBufferPointers:: NybbleReverseTable:: db $0, $8, $4, $c, $2, $a, $6, $e, $1, $9, $5, $d, $3, $b, $7, $f -; combines the two loaded chunks with xor (the chunk loaded second is the destination). Both chunks are differeintial decoded beforehand. +; combines the two loaded chunks with xor (the chunk loaded second is the destination). Both chunks are differential decoded beforehand. UnpackSpriteMode2:: call ResetSpriteBufferPointers ld a, [wSpriteFlipped] |