Fixed trainer encounter Music

Removed special "foreign grunt" picture
Implemented Jessie & James as a trainer class

README.md

@@ -248,7 +248,6 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
    * Change Game Corner prizes (Goldenrod sells Clefary for 800 coins)
    * Add trees for Sitrus Berry (Gold Berry) and Lum Berry (MiracleBerry)
    * Promote the Wise Trio from Sages to Elders
-   * The foreign Rocket Grunt in Cerulean City uses the RBY Rocket sprite
    * Eusine has a shiny Electrode
    * Lawrence has a shiny Charizard
    * Fly to the Rock Tunnel/Power Plant Pokémon Center

audio.asm

@@ -34,7 +34,6 @@ INCLUDE "audio/music/ssaqua.asm"
 INCLUDE "audio/music/newbarktown.asm"
 INCLUDE "audio/music/goldenrodcity.asm"
 INCLUDE "audio/music/vermilioncity.asm"
-INCLUDE "audio/music/titlescreen.asm"
 INCLUDE "audio/music/ruinsofalphinterior.asm"
 INCLUDE "audio/music/lookpokemaniac.asm"
 INCLUDE "audio/music/trainervictory.asm"
@@ -157,6 +156,7 @@ INCLUDE "audio/music/postcredits.asm"
 
 SECTION "Extra Songs 3", ROMX
 
+INCLUDE "audio/music/titlescreen.asm"
 INCLUDE "audio/music/hgss/route47.asm"
 INCLUDE "audio/music/hgss/hoohbattle.asm"
 INCLUDE "audio/music/hgss/lugiabattle.asm"

audio/trainer_encounters.asm

@@ -24,80 +24,87 @@ PlayTrainerEncounterMusic:: ; e900a
 TrainerEncounterMusic: ; e9027
 	db MUSIC_HIKER_ENCOUNTER
 	db MUSIC_YOUNGSTER_ENCOUNTER	; falkner
-	db MUSIC_LASS_ENCOUNTER			; whitney
 	db MUSIC_YOUNGSTER_ENCOUNTER	; bugsy
 	db MUSIC_OFFICER_ENCOUNTER		; morty
-	db MUSIC_OFFICER_ENCOUNTER		; pryce
-	db MUSIC_LASS_ENCOUNTER			; jasmine
+	db MUSIC_LASS_ENCOUNTER			; whitney
 	db MUSIC_OFFICER_ENCOUNTER		; chuck
+	db MUSIC_LASS_ENCOUNTER			; jasmine
+	db MUSIC_OFFICER_ENCOUNTER		; pryce
 	db MUSIC_BEAUTY_ENCOUNTER		; clair
-	db MUSIC_RIVAL_ENCOUNTER		; rival1
-	db MUSIC_HIKER_ENCOUNTER		; pokemon_prof
 	db MUSIC_HIKER_ENCOUNTER		; will
-	db MUSIC_HIKER_ENCOUNTER		; cal
+	db MUSIC_HIKER_ENCOUNTER		; koga
 	db MUSIC_OFFICER_ENCOUNTER		; bruno
 	db MUSIC_HIKER_ENCOUNTER		; karen
-	db MUSIC_HIKER_ENCOUNTER		; koga
 	db MUSIC_OFFICER_ENCOUNTER		; champion
 	db MUSIC_YOUNGSTER_ENCOUNTER	; brock
 	db MUSIC_LASS_ENCOUNTER			; misty
 	db MUSIC_OFFICER_ENCOUNTER		; lt_surge
-	db MUSIC_ROCKET_ENCOUNTER		; scientist
 	db MUSIC_OFFICER_ENCOUNTER		; erika
-	db MUSIC_YOUNGSTER_ENCOUNTER	; youngster
-	db MUSIC_YOUNGSTER_ENCOUNTER	; schoolboy
-	db MUSIC_YOUNGSTER_ENCOUNTER	; bird_keeper
-	db MUSIC_LASS_ENCOUNTER			; lass
 	db MUSIC_LASS_ENCOUNTER			; janine
-	db MUSIC_HIKER_ENCOUNTER		; cooltrainerm
-	db MUSIC_BEAUTY_ENCOUNTER		; cooltrainerf
-	db MUSIC_BEAUTY_ENCOUNTER		; beauty
-	db MUSIC_POKEMANIAC_ENCOUNTER	; pokemaniac
-	db MUSIC_ROCKET_ENCOUNTER		; gruntm
-	db MUSIC_HIKER_ENCOUNTER		; gentleman
-	db MUSIC_BEAUTY_ENCOUNTER		; skier
-	db MUSIC_BEAUTY_ENCOUNTER		; teacher
 	db MUSIC_BEAUTY_ENCOUNTER		; sabrina
+	db MUSIC_OFFICER_ENCOUNTER		; blaine
+	db MUSIC_RIVAL_ENCOUNTER		; blue
+	db MUSIC_HIKER_ENCOUNTER		; red
+	db MUSIC_HIKER_ENCOUNTER		; leaf
+	db MUSIC_RIVAL_ENCOUNTER		; rival1
+	db MUSIC_RIVAL_ENCOUNTER		; rival2
+	db MUSIC_HIKER_ENCOUNTER		; cal
+	db MUSIC_YOUNGSTER_ENCOUNTER	; youngster
 	db MUSIC_YOUNGSTER_ENCOUNTER	; bug_catcher
+	db MUSIC_YOUNGSTER_ENCOUNTER	; camper
+	db MUSIC_LASS_ENCOUNTER			; picnicker
+	db MUSIC_LASS_ENCOUNTER			; twins
 	db MUSIC_HIKER_ENCOUNTER		; fisher
-	db MUSIC_HIKER_ENCOUNTER		; swimmerm
-	db MUSIC_BEAUTY_ENCOUNTER		; swimmerf
-	db MUSIC_HIKER_ENCOUNTER		; sailor
-	db MUSIC_POKEMANIAC_ENCOUNTER	; super_nerd
-	db MUSIC_RIVAL_ENCOUNTER		; rival2
-	db MUSIC_HIKER_ENCOUNTER		; guitarist
+	db MUSIC_YOUNGSTER_ENCOUNTER	; bird_keeper
 	db MUSIC_HIKER_ENCOUNTER		; hiker
-	db MUSIC_HIKER_ENCOUNTER		; biker
-	db MUSIC_OFFICER_ENCOUNTER		; blaine
-	db MUSIC_POKEMANIAC_ENCOUNTER	; burglar
+	db MUSIC_ROCKET_ENCOUNTER		; gruntm
+	db MUSIC_ROCKET_ENCOUNTER		; gruntf
+	db MUSIC_ROCKET_ENCOUNTER		; jessie&james
+	db MUSIC_HIKER_ENCOUNTER		; pokefanm
+	db MUSIC_BEAUTY_ENCOUNTER		; pokefanf
+	db MUSIC_HIKER_ENCOUNTER		; officer
+	db MUSIC_POKEMANIAC_ENCOUNTER	; pokemaniac
+	db MUSIC_POKEMANIAC_ENCOUNTER	; super_nerd
+	db MUSIC_LASS_ENCOUNTER			; lass
+	db MUSIC_BEAUTY_ENCOUNTER		; beauty
 	db MUSIC_HIKER_ENCOUNTER		; firebreather
 	db MUSIC_POKEMANIAC_ENCOUNTER	; juggler
-	db MUSIC_HIKER_ENCOUNTER		; blackbelt_t
-	db MUSIC_ROCKET_ENCOUNTER		; executivem
+	db MUSIC_YOUNGSTER_ENCOUNTER	; schoolboy
+	db MUSIC_LASS_ENCOUNTER			; schoolgirl
 	db MUSIC_YOUNGSTER_ENCOUNTER	; psychic_t
-	db MUSIC_LASS_ENCOUNTER			; picnicker
-	db MUSIC_YOUNGSTER_ENCOUNTER	; camper
-	db MUSIC_ROCKET_ENCOUNTER		; executivef
+	db MUSIC_LASS_ENCOUNTER			; hex_maniac
 	db MUSIC_SAGE_ENCOUNTER			; sage
 	db MUSIC_SAGE_ENCOUNTER			; medium
-	db MUSIC_HIKER_ENCOUNTER		; boarder
-	db MUSIC_HIKER_ENCOUNTER		; pokefanm
 	db MUSIC_KIMONO_ENCOUNTER		; kimono_girl
-	db MUSIC_LASS_ENCOUNTER			; twins
-	db MUSIC_BEAUTY_ENCOUNTER		; pokefanf
-	db MUSIC_HIKER_ENCOUNTER		; red
-	db MUSIC_RIVAL_ENCOUNTER		; blue
-	db MUSIC_HIKER_ENCOUNTER		; officer
-	db MUSIC_ROCKET_ENCOUNTER		; gruntf
-	db MUSIC_HIKER_ENCOUNTER		; mysticalman
 	db MUSIC_SAGE_ENCOUNTER			; elder
-	db MUSIC_ROCKET_ENCOUNTER		; foreigngrunt
+	db MUSIC_HIKER_ENCOUNTER		; gentleman
+	db MUSIC_YOUNGSTER_ENCOUNTER	; rich_boy
+	db MUSIC_LASS_ENCOUNTER			; cowgirl
+	db MUSIC_HIKER_ENCOUNTER		; sailor
+	db MUSIC_HIKER_ENCOUNTER		; swimmerm
+	db MUSIC_BEAUTY_ENCOUNTER		; swimmerf
+	db MUSIC_POKEMANIAC_ENCOUNTER	; burglar
+	db MUSIC_ROCKET_ENCOUNTER		; scientist
+	db MUSIC_HIKER_ENCOUNTER		; boarder
+	db MUSIC_BEAUTY_ENCOUNTER		; skier
+	db MUSIC_HIKER_ENCOUNTER		; blackbelt_t
+	db MUSIC_BEAUTY_ENCOUNTER		; battle_girl
+	db MUSIC_BEAUTY_ENCOUNTER		; teacher
+	db MUSIC_HIKER_ENCOUNTER		; guitarist
+	db MUSIC_HIKER_ENCOUNTER		; biker
+	db MUSIC_HIKER_ENCOUNTER		; cooltrainerm
+	db MUSIC_BEAUTY_ENCOUNTER		; cooltrainerf
+	db MUSIC_ROCKET_ENCOUNTER		; executivem
+	db MUSIC_ROCKET_ENCOUNTER		; executivef
+	db MUSIC_HIKER_ENCOUNTER		; pokemon_prof
+	db MUSIC_HIKER_ENCOUNTER		; game_freak
+	db MUSIC_HIKER_ENCOUNTER		; mysticalman
 	db MUSIC_HIKER_ENCOUNTER		; lorelei
 	db MUSIC_HIKER_ENCOUNTER		; agatha
 	db MUSIC_LASS_ENCOUNTER			; yellow
-	db MUSIC_HIKER_ENCOUNTER		; leaf
 	db MUSIC_POKEMANIAC_ENCOUNTER	; bill
 	db MUSIC_HIKER_ENCOUNTER		; lawrence
-	db MUSIC_HIKER_ENCOUNTER		; game_freak
+	db MUSIC_ROCKET_ENCOUNTER		; giovanni
+	db MUSIC_HIKER_ENCOUNTER		; towertycoon
 	db MUSIC_KIMONO_ENCOUNTER		; valerie
 ; e906e

constants/trainer_constants.asm

@@ -269,7 +269,7 @@ KRIS EQU __enum__
 
 	trainerclass GRUNTF ; 24
 
-	trainerclass FOREIGNGRUNT ; 25
+	trainerclass JESSIE_JAMES ; 25
 
 	trainerclass POKEFANM ; 26
 	const WILLIAM

gfx/pics.asm

@@ -410,6 +410,7 @@ PoliwrathBackpic:    INCBIN "gfx/pics/poliwrath/back.2bpp.lz"
 SwimmermPic:         INCBIN "gfx/trainers/swimmer_m.2bpp.lz"
 NidorinoBackpic:     INCBIN "gfx/pics/nidorino/back.2bpp.lz"
 MysticalmanPic:      INCBIN "gfx/trainers/mysticalman.2bpp.lz"
+ValeriePic:          ; TODO
 CooltrainerfPic:     INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz"
 ElectrodeFrontpic:   INCBIN "gfx/pics/electrode/front.2bpp.lz"
 ; 153fe3
@@ -428,6 +429,8 @@ ScytherBackpic:      INCBIN "gfx/pics/scyther/back.2bpp.lz"
 VileplumeBackpic:    INCBIN "gfx/pics/vileplume/back.2bpp.lz"
 HitmonchanBackpic:   INCBIN "gfx/pics/hitmonchan/back.2bpp.lz"
 JumpluffBackpic:     INCBIN "gfx/pics/jumpluff/back.2bpp.lz"
+TowerTycoonPic:      ; TODO
+GameFreakPic:        ; TODO
 CooltrainermPic:     INCBIN "gfx/trainers/cooltrainer_m.2bpp.lz"
 BlastoiseBackpic:    INCBIN "gfx/pics/blastoise/back.2bpp.lz"
 MisdreavusBackpic:   INCBIN "gfx/pics/misdreavus/back.2bpp.lz"
@@ -741,8 +744,7 @@ RichBoyPic:          INCBIN "gfx/trainers/rich_boy.2bpp.lz"
 CowgirlPic:          INCBIN "gfx/trainers/cowgirl.2bpp.lz"
 HexManiacPic:        INCBIN "gfx/trainers/hex_maniac.2bpp.lz"
 BattleGirlPic:       INCBIN "gfx/trainers/battle_girl.2bpp.lz"
-ForeignGruntPic:     INCBIN "gfx/trainers/foreigngrunt.2bpp.lz"
-GameFreakPic:        INCBIN "gfx/trainers/cooltrainer_m.2bpp.lz" ; TODO
+JessieJamesPic:      INCBIN "gfx/trainers/jessie_james.2bpp.lz"
 LyraPic:             INCBIN "gfx/trainers/lyra.2bpp.lz"
 LoreleiPic:          INCBIN "gfx/trainers/lorelei.2bpp.lz"
 AgathaPic:           INCBIN "gfx/trainers/agatha.2bpp.lz"
@@ -751,8 +753,6 @@ LeafPic:             INCBIN "gfx/trainers/leaf.2bpp.lz"
 BillPic:             INCBIN "gfx/trainers/bill.2bpp.lz"
 LawrencePic:         INCBIN "gfx/trainers/lawrence.2bpp.lz"
 GiovanniPic:         INCBIN "gfx/trainers/giovanni.2bpp.lz"
-TowerTycoonPic:      INCBIN "gfx/trainers/cooltrainer_m.2bpp.lz" ; TODO
-ValeriePic:          INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz" ; TODO
 OmastarFossilPic:    INCBIN "gfx/trainers/omastarfossil.2bpp.lz"
 KabutopsFossilPic:   INCBIN "gfx/trainers/kabutopsfossil.2bpp.lz"
 AerodactylFossilPic: INCBIN "gfx/trainers/aerodactylfossil.2bpp.lz"

gfx/pics/trainer_pic_pointers.asm

@@ -35,7 +35,7 @@
 	add_pic HikerPic
 	add_pic GruntmPic
 	add_pic GruntfPic
-	add_pic ForeignGruntPic
+	add_pic JessieJamesPic
 	add_pic PokefanmPic
 	add_pic PokefanfPic
 	add_pic OfficerPic

gfx/trainers/jessie_james.pal

@@ -0,0 +1,4 @@
+
+	RGB 31, 23, 15
+	RGB 29, 02, 02
+

gfx/trainers/palette_pointers.asm

@@ -48,7 +48,7 @@ BirdKeeperPalette:       INCLUDE "gfx/trainers/bird_keeper.pal"
 HikerPalette:            INCLUDE "gfx/trainers/hiker.pal"
 GruntmPalette:           INCLUDE "gfx/trainers/grunt_m.pal"
 GruntfPalette:           INCLUDE "gfx/trainers/grunt_f.pal"
-ForeignGruntPalette:     INCLUDE "gfx/trainers/foreigngrunt.pal"
+JessieJamesPalette:      INCLUDE "gfx/trainers/jessie_james.pal"
 PokefanmPalette:         INCLUDE "gfx/trainers/pokefan_m.pal"
 PokefanfPalette:         INCLUDE "gfx/trainers/pokefan_f.pal"
 OfficerPalette:          INCLUDE "gfx/trainers/officer.pal"

maps/Route24.asm

@@ -16,7 +16,7 @@ RocketScript_0x1adbfa:
 	waitbutton
 	closetext
 	winlosstext UnknownText_0x1add67, -1
-	loadtrainer FOREIGNGRUNT, 1
+	loadtrainer GRUNTM, 30
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle

misc/battle_tower_47.asm

@@ -116,7 +116,7 @@ BTTrainerClassGenders: ; 11f2f0
 	db MALE   ; HIKER
 	db MALE   ; GRUNTM
 	db FEMALE ; GRUNTF
-	db MALE   ; FOREIGNGRUNT
+	db MALE   ; JESSIE_JAMES
 	db MALE   ; POKEFANM
 	db FEMALE ; POKEFANF
 	db MALE   ; OFFICER

text/trainer_class_names.asm

@@ -34,7 +34,7 @@
 	db "Hiker@"
 	db "Rocket@"
 	db "Rocket@"
-	db "Rocket@"
+	db "Jessie@"
 	db "#fan@"
 	db "#fan@"
 	db "Officer@"

trainers/attributes.asm

@@ -216,7 +216,7 @@ TrainerClassAttributes: ; 3959c
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
 	dw CONTEXT_USE + SWITCH_SOMETIMES
 
-; Foreigngrunt
+; Jessie&James
 	db 0, 0 ; items
 	db 10 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY

trainers/dvs.asm

@@ -63,7 +63,7 @@ TrainerClassDVs: ; 270d6
 	db $AF, $7A ; hiker
 	db $DA, $AA ; gruntm
 	db $7A, $AA ; gruntf
-	db $DA, $AA ; foreigngrunt
+	db $AA, $AA ; jessie&james
 	db $AA, $AA ; pokefanm
 	db $5A, $AA ; pokefanf
 	db $DB, $DB ; officer

trainers/trainer_pointers.asm

@@ -37,7 +37,7 @@ TrainerGroups: ; 0x39999
 	dw HikerGroup
 	dw GruntMGroup
 	dw GruntFGroup
-	dw ForeignGruntGroup
+	dw JessieJamesGroup
 	dw PokefanMGroup
 	dw PokefanFGroup
 	dw OfficerGroup

trainers/trainers.asm

@@ -5729,6 +5729,17 @@ GruntMGroup:
 
 	db $ff ; end
 
+; ================
+
+	; GRUNTM (31)
+	db "Grunt@"
+	db 0 ; normal
+
+	; party
+	db 39, GOLBAT
+
+	db $ff ; end
+
 ; ================
 ; ================================
 
@@ -5810,16 +5821,19 @@ GruntFGroup:
 ; ================================
 
 
-ForeignGruntGroup:
+JessieJamesGroup:
 ; ================================
 ; ================
 
-	; FOREIGNGRUNT (1)
-	db "Grunt@"
+	; JESSIE_JAMES (1)
+	db "& James@"
 	db 0 ; normal
 
 	; party
-	db 39, GOLBAT
+	db 27, WEEZING
+	db 27, ARBOK
+	db 26, VICTREEBEL
+	db 31, MEOWTH
 
 	db $ff ; end