minor fix

implemented 33dannye way of having both Prof.Oak and Chief pics into the bank once I understood the explanation.
Fixed syntax errors in the special moves

data/trainers/special_moves.asm

@@ -28,7 +28,7 @@ SpecialTrainerMoves:
  db 1, 3, PECK
  db 0
 
- db PSYCHIC, 4
+ db PSYCHIC_TR, 4
  db 1, 1, DOUBLESLAP
  db 0
 
@@ -37,31 +37,31 @@ SpecialTrainerMoves:
  db 2, 4, DIG
  db 0
  
- db GREEN1, 7
+ db RIVAL1, 7
  db 1, 4, SWIFT
  db 0
 
- db GREEN1, 8
+ db RIVAL1, 8
  db 1, 4, SWIFT
  db 0
 
- db GREEN1, 9
+ db RIVAL1, 9
  db 1, 4, SWIFT
  db 0
 
- db GREEN2, 1
+ db RIVAL2, 1
  db 1, 3, SWIFT
  db 2, 1, CUT
  db 4, 1, MIST
  db 0
 
- db GREEN2, 2
+ db RIVAL2, 2
  db 1, 3, SWIFT
  db 3, 2, MIST
  db 1, 1, CUT
  db 0
 
- db GREEN2, 2
+ db RIVAL2, 2
  db 1, 3, SWIFT
  db 2, 2, MIST
  db 3, 1, CUT
@@ -77,7 +77,7 @@ SpecialTrainerMoves:
  db 3, 4, RAGE
  db 0
 
- db LTSURGE, 1
+ db LT_SURGE, 1
  db 1, 3, QUICK_ATTACK
  db 3, 2, EMBER
  db 4, 4, SMOKESCREEN

gfx/pics.asm

@@ -323,7 +323,6 @@ WeepinbellPicFront:: INCBIN "gfx/pokemon/front/weepinbell.pic"
 WeepinbellPicBack:: INCBIN "gfx/pokemon/back/weepinbellb.pic"
 VictreebelPicFront:: INCBIN "gfx/pokemon/front/victreebel.pic"
 VictreebelPicBack:: INCBIN "gfx/pokemon/back/victreebelb.pic"
-ProfOakPic:: INCBIN "gfx/trainers/prof.oak.pic"
 
 
 SECTION "Pics 6", ROMX
@@ -352,6 +351,7 @@ TamerPic:: INCBIN "gfx/trainers/tamer.pic"
 BirdKeeperPic:: INCBIN "gfx/trainers/birdkeeper.pic"
 BlackbeltPic:: INCBIN "gfx/trainers/blackbelt.pic"
 Rival1Pic:: INCBIN "gfx/trainers/rival1.pic"
+ProfOakPic:: INCBIN "gfx/trainers/prof.oak.pic" 
 ChiefPic:: INCBIN "gfx/trainers/chief.pic"
 ScientistPic:: INCBIN "gfx/trainers/scientist.pic"
 GiovanniPic:: INCBIN "gfx/trainers/giovanni.pic"

layout.link

@@ -99,7 +99,6 @@ ROMX $12
  "Screen Effects"
  "Maps 8"
 ROMX $13
- "Pics 6"
  "Maps 9"
  "Predefs"
 ROMX $14