diff options
| author | JimB16 <f1@jimb.de> | 2015-09-10 01:28:06 +0200 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-09-10 01:28:06 +0200 |
| commit | 8ccdd4d6c05e6a6ca645011b170828851e82cc60 (patch) | |
| tree | 6f06d84f06b64cb88fec77f2cf9c6785a2dca725 /main.asm | |
| parent | a7cb2a5e9baedeb077f898df4269291dee72be70 (diff) | |
| parent | 2e74d969f700f7eda40a84a75dfe8b4183d09683 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1887,10 +1887,9 @@ CheckNickErrors:: ; 669f ; 66cf .textcommands ; 66cf -; table definining which characters -; are actually text commands +; table defining which characters are actually text commands ; format: -; >= < + ; ≥ < db $00, $05 db $14, $19 db $1d, $26 @@ -36819,7 +36818,7 @@ endr ld hl, TrainerClassAttributes + 3 ; If we have a battle in BattleTower just load the Attributes of the first TrainerClass (Falkner) - ; so we have always the same AI, regardless of the loaded cass of trainer + ; so we have always the same AI, regardless of the loaded class of trainer ld a, [InBattleTowerBattle] bit 0, a jr nz, .asm_4412f @@ -83115,7 +83114,7 @@ StringOptions: ; e4241 GetOptionPointer: ; e42d6 - ld a, [wcf63] ;load the cusror position to a + ld a, [wcf63] ;load the cursor position to a ld e, a ;copy it to de ld d, 0 ld hl, .Pointers |