misc QoL features

made exp all texts faster, as well as traded mon exp text
attempt to make spinners faster
added fasters text speed (0/1/4 delay)
added running by pressing the b button using code from the wiki (credit goes to Luna)

Makefile

@@ -12,8 +12,8 @@ gfx/sprites.o \
 gfx/tilesets.o
 
 carminered_obj := $(rom_obj:.o=_red.o)
-#pokeblue_obj := $(rom_obj:.o=_blue.o)
-#pokeblue_debug_obj := $(rom_obj:.o=_blue_debug.o)
+pokeblue_obj := $(rom_obj:.o=_blue.o)
+pokeblue_debug_obj := $(rom_obj:.o=_blue_debug.o)
 
 ### Build tools
 

constants/misc_constants.asm

@@ -9,9 +9,9 @@ TRUE EQU 1
  const FLAG_TEST ; 2
 
 ; wOptions
-TEXT_DELAY_FAST EQU %001 ; 1
-TEXT_DELAY_MEDIUM EQU %011 ; 3
-TEXT_DELAY_SLOW EQU %101 ; 5
+TEXT_DELAY_FAST EQU %000 ; 0
+TEXT_DELAY_MEDIUM EQU %001 ; 1
+TEXT_DELAY_SLOW EQU %100 ; 4
 
  const_def 6
  const BIT_BATTLE_SHIFT ; 6

data/pokemon/evos_moves.asm

@@ -1671,7 +1671,7 @@ GolduckEvosMoves:
 ; Learnset
  db 33, DREAM_EATER
  db 37, WATERFALL
- db 42, ROAR
+ db 42, MIRROR_MOVE
  db 47, NIGHT_SHADE
  db 52, HYDRO_PUMP
  db 0

data/text/text_2.asm

@@ -1234,18 +1234,16 @@ _GainedText::
  text_end
 
 _WithExpAllText::
- text "with EXP.ALL,"
- cont "@"
+ text "shared @"
  text_end
 
 _BoostedText::
- text "a boosted"
- cont "@"
+ text "boosted @"
  text_end
 
 _ExpPointsText::
  text_decimal wExpAmountGained, 2, 4
- text " EXP. Points!"
+ text " EXP!"
  prompt
 
 _GrewLevelText::

data/trainers/parties.asm

@@ -336,7 +336,7 @@ SwimmerData:
  db 32, TENTACOOL, POLIWHIRL, BLASTOISE, 0
  db 33, PSYDUCK, GOLDUCK, 0
  db 39, SEEL, HORSEA, DEWGONG, SEADRA, 0
- db 40, SHELLDER, PSYDUCK, GYARADOS, 0
+ db 40, SHELLDER, STARYU, GYARADOS, 0
  db 39, GOLDUCK, SEAKING, POLIWHIRL, KINGLER, 0
  db 41, WARTORTLE, LAPRAS, 0
  db 37, TENTACOOL, SLOWPOKE, PSYDUCK, SHELLDER, STARYU, KRABBY, 0
@@ -396,7 +396,7 @@ BeautyData:
  db 38, SLOWBRO, 0
  db 34, EXEGGCUTE, BUTTERFREE, PERSIAN, 0
 ; NOW FOR SAFFRON GYM
- db 40, CLEFAIRY, CLEFAIRY, CLEFAIRY, CLEFABLE, 0
+ db 40, CLEFAIRY, VULPIX, PSYDUCK, CLEFABLE, 0
 ; Route 19
  db 40, SEAKING, SEAKING, SEAKING, 0
  db 41, SEADRA, TENTACRUEL, 0
@@ -405,7 +405,7 @@ BeautyData:
 
 PsychicData:
 ; Saffron Gym
- db 42, NINETALES, HYPNO, 0
+ db 42, NINETALES, GOLDUCK, 0
  db 45, GENGAR, 0
 ; REPRUPOSED FOR ROUTE 21
  db 47, SLOWBRO, JYNX, PORYGON, HYPNO, 0

data/trainers/special_moves.asm

@@ -36,6 +36,10 @@ SpecialTrainerMoves:
  db 4, 3, STRENGTH
  db 0
 
+ db BEAUTY, 11
+ db 3, 3, SCREECH
+ db 0
+
  db TAMER, 5
  db 6, 1, SUBMISSION
  db 0

engine/menus/main_menu.asm

@@ -583,7 +583,7 @@ DisplayOptionMenu:
 
 TextSpeedOptionText:
  db "TEXT SPEED"
- next " FAST MEDIUM SLOW@"
+ next " SUPER NORMAL SLOW@"
 
 BattleAnimationOptionText:
  db "BATTLE ANIMATION"

engine/overworld/spinners.asm

@@ -20,7 +20,7 @@ LoadSpinnerArrowTiles::
  ld de, $18
  add hl, de
 .asm_45001
- ld a, $4
+ ld a, $1 ; according to jojobear13 changing this from $4 to $1 makes spinners faster
  ld bc, $0
 .asm_45006
  push af

home/overworld.asm

@@ -283,7 +283,22 @@ OverworldLoopLessDelay::
  bit 6, a ; jumping a ledge?
  jr nz, .normalPlayerSpriteAdvancement
  call DoBikeSpeedup
+ call DoBikeSpeedup
+ call DoBikeSpeedup
+ jr .notRunning
 .normalPlayerSpriteAdvancement
+ ; surf at 2x walking speed
+ ld a, [wWalkBikeSurfState]
+ cp $02
+ jr z, .surfFaster
+ ; Holding B makes you run at 2x walking speed
+ ld a, [hJoyHeld]
+ and B_BUTTON
+ jr z, .notRunning
+.surfFaster
+ call DoBikeSpeedup
+.notRunning
+ ;original .normalPlayerSpriteAdvancement continues here
  call AdvancePlayerSprite
  ld a, [wWalkCounter]
  and a