Changes for hall of fame and credits.

8 files changed, 113 insertions, 105 deletions

diff --git a/Makefile b/Makefile
index 643b8946..759990fa 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ data/maps/map_data.o \
 data/pokemon/dex_entries.o \
 data/pokemon/egg_moves.o \
 data/pokemon/evos_attacks.o \
+engine/movie/credits.o \
 engine/overworld/events.o \
 gfx/sprites.o \
 gfx/tilesets.o
diff --git a/data/credits_strings.asm b/data/credits_strings.asm
index d863b56c..09c0dcd7 100644
--- a/data/credits_strings.asm
+++ b/data/credits_strings.asm
@@ -1,88 +1,88 @@
-CreditsStrings: ; used for BANK(CreditsStrings)
+CreditsStrings:: ; used for BANK(CreditsStrings)
 
-Credits_SatoshiTajiri:       db "   SATOSHI TAJIRI@"         ; "たじり　さとし@"
-Credits_JunichiMasuda:       db "   JUNICHI MASUDA@"         ; "ますだ　じゅんいち@"
-Credits_TetsuyaWatanabe:     db "  TETSUYA WATANABE@"        ; "わたなべ　てつや@"
-Credits_ShigekiMorimoto:     db "  SHIGEKI MORIMOTO@"        ; "もりもと　しげき@"
-Credits_SousukeTamada:       db "   SOUSUKE TAMADA@"         ; "たまだ　そうすけ@"
-Credits_TakenoriOota:        db "   TAKENORI OOTA@"          ; "おおた　たけのり@"
-Credits_KenSugimori:         db "    KEN SUGIMORI@"          ; "すぎもり　けん@"
-Credits_MotofumiFujiwara:    db " MOTOFUMI FUJIWARA@"        ; "ふじわら　もとふみ@"
-Credits_AtsukoNishida:       db "   ATSUKO NISHIDA@"         ; "にしだ　あつこ@"
-Credits_MuneoSaito:          db "    MUNEO SAITO@"           ; "さいとう　むねお@"
-Credits_SatoshiOota:         db "    SATOSHI OOTA@"          ; "おおた　さとし@"
-Credits_RenaYoshikawa:       db "   RENA YOSHIKAWA@"         ; "よしかわ　れな@"
-Credits_JunOkutani:          db "    JUN OKUTANI@"           ; "おくたに　じゅん@"
-Credits_HironobuYoshida:     db "  HIRONOBU YOSHIDA@"        ; "よしだ　ひろのぶ@"
-Credits_AsukaIwashita:       db "   ASUKA IWASHITA@"         ; "いわした　あすか@"
-Credits_GoIchinose:          db "    GO ICHINOSE@"           ; "いちのせ　ごう@"
-Credits_MorikazuAoki:        db "   MORIKAZU AOKI@"          ; "あおき　もりかず@"
-Credits_KohjiNishino:        db "   KOHJI NISHINO@"          ; "にしの　こうじ@"
-Credits_KenjiMatsushima:     db "  KENJI MATSUSHIMA@"        ; "まつしま　けんじ@"
-Credits_ToshinobuMatsumiya:  db "TOSHINOBU MATSUMIYA@"       ; "まつみや　としのぶ@"
-Credits_SatoruIwata:         db "    SATORU IWATA@"          ; "いわた　さとる@"
-Credits_NobuhiroSeya:        db "   NOBUHIRO SEYA@"          ; "せや　のぶひろ@"
-Credits_KazuhitoSekine:      db "  KAZUHITO SEKINE@"         ; "せきね　かずひと@"
-Credits_TetsujiOota:         db "    TETSUJI OOTA@"          ; "おおた　てつじ@"
-Credits_NclSuperMarioClub:   db "NCL SUPER MARIO CLUB@"      ; "スーパーマりオクラブ@"
-Credits_Sarugakucho:         db "    SARUGAKUCHO@"           ; "さるがくちょう@"
-Credits_AkitoMori:           db "     AKITO MORI@"           ; "もり　あきと@"
-Credits_TakahiroHarada:      db "  TAKAHIRO HARADA@"         ; "はらだ　たかひろ@"
-Credits_TohruHashimoto:      db "  TOHRU HASHIMOTO@"         ; "はしもと　とおる@"
-Credits_NoboruMatsumoto:     db "  NOBORU MATSUMOTO@"        ; "まつもと　のぼる@"
-Credits_TakehiroIzushi:      db "  TAKEHIRO IZUSHI@"         ; "いずし　たけひろ@"
-Credits_TakashiKawaguchi:    db " TAKASHI KAWAGUCHI@"        ; "かわぐち　たかし@"
-Credits_TsunekazuIshihara:   db " TSUNEKAZU ISHIHARA@"       ; "いしはら　つねかず@"
-Credits_HiroshiYamauchi:     db "  HIROSHI YAMAUCHI@"        ; "やまうち　ひろし@"
-Credits_KenjiSaiki:          db "    KENJI SAIKI@"           ; "さいき　けんじ@"
-Credits_AtsushiTada:         db "    ATSUSHI TADA@"          ; "ただ　あつし@"
-Credits_NaokoKawakami:       db "   NAOKO KAWAKAMI@"         ; "かわかみ　なおこ@"
-Credits_HiroyukiZinnai:      db "  HIROYUKI ZINNAI@"         ; "じんない　ひろゆき@"
-Credits_KunimiKawamura:      db "  KUNIMI KAWAMURA@"         ; "かわむら　くにみ@"
-Credits_GailTilden:          db "    GAIL TILDEN@"
-Credits_HiroNakamura:        db "   HIRO NAKAMURA@"
-Credits_JeffKalles:          db "    JEFF KALLES@"
-Credits_WilliamGiese:        db "   WILLIAM GIESE@"
-Credits_NobOgasawara:        db "   NOB OGASAWARA@"
-Credits_RandyShoemake:       db "   RANDY SHOEMAKE@"
-Credits_KathyHuguenard:      db "  KATHY HUGUENARD@"
-Credits_JoelSimon:           db "     JOEL SIMON@"
-Credits_TerukiMurakawa:      db "  TERUKI MURAKAWA@"
-Credits_KazuyoshiOsawa:      db "  KAZUYOSHI OSAWA@"
-Credits_KimikoNakamichi:     db "  KIMIKO NAKAMICHI@"
-Credits_End:                 db "END@"                       ; "おしまい@"
-Credits_Staff:               db "      #MON"                 ; "ポケットモンスター"
+Credits_SatoshiTajiri::       db "   SATOSHI TAJIRI@"         ; "たじり　さとし@"
+Credits_JunichiMasuda::       db "   JUNICHI MASUDA@"         ; "ますだ　じゅんいち@"
+Credits_TetsuyaWatanabe::     db "  TETSUYA WATANABE@"        ; "わたなべ　てつや@"
+Credits_ShigekiMorimoto::     db "  SHIGEKI MORIMOTO@"        ; "もりもと　しげき@"
+Credits_SousukeTamada::       db "   SOUSUKE TAMADA@"         ; "たまだ　そうすけ@"
+Credits_TakenoriOota::        db "   TAKENORI OOTA@"          ; "おおた　たけのり@"
+Credits_KenSugimori::         db "    KEN SUGIMORI@"          ; "すぎもり　けん@"
+Credits_MotofumiFujiwara::    db " MOTOFUMI FUJIWARA@"        ; "ふじわら　もとふみ@"
+Credits_AtsukoNishida::       db "   ATSUKO NISHIDA@"         ; "にしだ　あつこ@"
+Credits_MuneoSaito::          db "    MUNEO SAITO@"           ; "さいとう　むねお@"
+Credits_SatoshiOota::         db "    SATOSHI OOTA@"          ; "おおた　さとし@"
+Credits_RenaYoshikawa::       db "   RENA YOSHIKAWA@"         ; "よしかわ　れな@"
+Credits_JunOkutani::          db "    JUN OKUTANI@"           ; "おくたに　じゅん@"
+Credits_HironobuYoshida::     db "  HIRONOBU YOSHIDA@"        ; "よしだ　ひろのぶ@"
+Credits_AsukaIwashita::       db "   ASUKA IWASHITA@"         ; "いわした　あすか@"
+Credits_GoIchinose::          db "    GO ICHINOSE@"           ; "いちのせ　ごう@"
+Credits_MorikazuAoki::        db "   MORIKAZU AOKI@"          ; "あおき　もりかず@"
+Credits_KohjiNishino::        db "   KOHJI NISHINO@"          ; "にしの　こうじ@"
+Credits_KenjiMatsushima::     db "  KENJI MATSUSHIMA@"        ; "まつしま　けんじ@"
+Credits_ToshinobuMatsumiya::  db "TOSHINOBU MATSUMIYA@"       ; "まつみや　としのぶ@"
+Credits_SatoruIwata::         db "    SATORU IWATA@"          ; "いわた　さとる@"
+Credits_NobuhiroSeya::        db "   NOBUHIRO SEYA@"          ; "せや　のぶひろ@"
+Credits_KazuhitoSekine::      db "  KAZUHITO SEKINE@"         ; "せきね　かずひと@"
+Credits_TetsujiOota::         db "    TETSUJI OOTA@"          ; "おおた　てつじ@"
+Credits_NclSuperMarioClub::   db "NCL SUPER MARIO CLUB@"      ; "スーパーマりオクラブ@"
+Credits_Sarugakucho::         db "    SARUGAKUCHO@"           ; "さるがくちょう@"
+Credits_AkitoMori::           db "     AKITO MORI@"           ; "もり　あきと@"
+Credits_TakahiroHarada::      db "  TAKAHIRO HARADA@"         ; "はらだ　たかひろ@"
+Credits_TohruHashimoto::      db "  TOHRU HASHIMOTO@"         ; "はしもと　とおる@"
+Credits_NoboruMatsumoto::     db "  NOBORU MATSUMOTO@"        ; "まつもと　のぼる@"
+Credits_TakehiroIzushi::      db "  TAKEHIRO IZUSHI@"         ; "いずし　たけひろ@"
+Credits_TakashiKawaguchi::    db " TAKASHI KAWAGUCHI@"        ; "かわぐち　たかし@"
+Credits_TsunekazuIshihara::   db " TSUNEKAZU ISHIHARA@"       ; "いしはら　つねかず@"
+Credits_HiroshiYamauchi::     db "  HIROSHI YAMAUCHI@"        ; "やまうち　ひろし@"
+Credits_KenjiSaiki::          db "    KENJI SAIKI@"           ; "さいき　けんじ@"
+Credits_AtsushiTada::         db "    ATSUSHI TADA@"          ; "ただ　あつし@"
+Credits_NaokoKawakami::       db "   NAOKO KAWAKAMI@"         ; "かわかみ　なおこ@"
+Credits_HiroyukiZinnai::      db "  HIROYUKI ZINNAI@"         ; "じんない　ひろゆき@"
+Credits_KunimiKawamura::      db "  KUNIMI KAWAMURA@"         ; "かわむら　くにみ@"
+Credits_GailTilden::          db "    GAIL TILDEN@"
+Credits_HiroNakamura::        db "   HIRO NAKAMURA@"
+Credits_JeffKalles::          db "    JEFF KALLES@"
+Credits_WilliamGiese::        db "   WILLIAM GIESE@"
+Credits_NobOgasawara::        db "   NOB OGASAWARA@"
+Credits_RandyShoemake::       db "   RANDY SHOEMAKE@"
+Credits_KathyHuguenard::      db "  KATHY HUGUENARD@"
+Credits_JoelSimon::           db "     JOEL SIMON@"
+Credits_TerukiMurakawa::      db "  TERUKI MURAKAWA@"
+Credits_KazuyoshiOsawa::      db "  KAZUYOSHI OSAWA@"
+Credits_KimikoNakamichi::     db "  KIMIKO NAKAMICHI@"
+Credits_End::                 db "END@"                       ; "おしまい@"
+Credits_Staff::               db "      #MON"                 ; "ポケットモンスター"
                            IF DEF(_GOLD)
                            next "    GOLD VERSION"
                            ELIF DEF(_SILVER)
                            next "   SILVER VERSION"
                            ENDC
                            next "       STAFF@"
-Credits_Director:            db "      DIRECTOR@"            ; "エグゼクティブ　ディレクター@"
-Credits_SubDirector:         db "    SUB DIRECTOR@"
-Credits_Programmers:         db "    PROGRAMMERS@"           ; "プログラム@"
-Credits_GraphicsDirector:    db " GRAPHICS DIRECTOR@"        ; "グラフィック　ディレクター@"
-Credits_MonsterDesign:       db "   MONSTER DESIGN@"         ; "#　デザイン@"
-Credits_GraphicsDesign:      db "  GRAPHICS DESIGN@"         ; "グラフィック　デザイン@"
-Credits_Music:               db "       MUSIC@"              ; "おんがく@"
-Credits_SoundEffects:        db "   SOUND EFFECTS@"          ; "サウンド　エフェクト@"
-Credits_GameDesign:          db "    GAME DESIGN@"           ; "ゲームデザイン@"
-Credits_GameScenario:        db "   GAME SCENARIO@"          ; "シナりオ@"
-Credits_ToolProgramming:     db "  TOOL PROGRAMMING@"        ; "ツール　プログラム@"
-Credits_ParametricDesign:    db " PARAMETRIC DESIGN@"        ; "パラメーター　せってい@"
-Credits_ScriptDesign:        db "   SCRIPT DESIGN@"          ; "スクりプト　せってい@"
-Credits_MapDataDesign:       db "  MAP DATA DESIGN@"         ; "マップデータ　せってい@"
-Credits_MapDesign:           db "     MAP DESIGN@"           ; "マップ　デザイン@"
-Credits_ProductTesting:      db "  PRODUCT TESTING@"         ; "デバッグプレイ@"
-Credits_SpecialThanks:       db "   SPECIAL THANKS@"         ; "スぺシャルサンクス@"
-Credits_Producers:           db "     PRODUCERS@"            ; "プロデューサー@"
-Credits_ExecutiveProducer:   db " EXECUTIVE PRODUCER@"       ; "エグゼクティブ　プロデューサー@"
-Credits_UsVersionStaff:      db "  US VERSION STAFF@"
-Credits_UsCoordination:      db "  US COORDINATION@"
-Credits_TextTranslation:     db "  TEXT TRANSLATION@"
-Credits_PaadTesting:         db "    PAAD TESTING@"
+Credits_Director::            db "      DIRECTOR@"            ; "エグゼクティブ　ディレクター@"
+Credits_SubDirector::         db "    SUB DIRECTOR@"
+Credits_Programmers::         db "    PROGRAMMERS@"           ; "プログラム@"
+Credits_GraphicsDirector::    db " GRAPHICS DIRECTOR@"        ; "グラフィック　ディレクター@"
+Credits_MonsterDesign::       db "   MONSTER DESIGN@"         ; "#　デザイン@"
+Credits_GraphicsDesign::      db "  GRAPHICS DESIGN@"         ; "グラフィック　デザイン@"
+Credits_Music::               db "       MUSIC@"              ; "おんがく@"
+Credits_SoundEffects::        db "   SOUND EFFECTS@"          ; "サウンド　エフェクト@"
+Credits_GameDesign::          db "    GAME DESIGN@"           ; "ゲームデザイン@"
+Credits_GameScenario::        db "   GAME SCENARIO@"          ; "シナりオ@"
+Credits_ToolProgramming::     db "  TOOL PROGRAMMING@"        ; "ツール　プログラム@"
+Credits_ParametricDesign::    db " PARAMETRIC DESIGN@"        ; "パラメーター　せってい@"
+Credits_ScriptDesign::        db "   SCRIPT DESIGN@"          ; "スクりプト　せってい@"
+Credits_MapDataDesign::       db "  MAP DATA DESIGN@"         ; "マップデータ　せってい@"
+Credits_MapDesign::           db "     MAP DESIGN@"           ; "マップ　デザイン@"
+Credits_ProductTesting::      db "  PRODUCT TESTING@"         ; "デバッグプレイ@"
+Credits_SpecialThanks::       db "   SPECIAL THANKS@"         ; "スぺシャルサンクス@"
+Credits_Producers::           db "     PRODUCERS@"            ; "プロデューサー@"
+Credits_ExecutiveProducer::   db " EXECUTIVE PRODUCER@"       ; "エグゼクティブ　プロデューサー@"
+Credits_UsVersionStaff::      db "  US VERSION STAFF@"
+Credits_UsCoordination::      db "  US COORDINATION@"
+Credits_TextTranslation::     db "  TEXT TRANSLATION@"
+Credits_PaadTesting::         db "    PAAD TESTING@"
 
-Credits_Copyright:
+Credits_Copyright::
 	;    (C) 1  9  9  5 - 2  0  0  0     N  i  n  t  e  n  d  o
 	db   $60,$61,$62,$63,$7a,$7b,$7c,$7d,$65,$66,$67,$68,$69,$6a
 	;    (C) 1  9  9  5 - 2  0  0  0    C  r  e  a  t  u  r  e  s     i  n  c .
diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm
index 4df4af5c..53ab9f9a 100755
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -14,6 +14,9 @@ HallOfFame::
 	ld hl, wStatusFlags
 	set STATUSFLAGS_HALL_OF_FAME_F, [hl]
 
+; Bug: Gold/Silver fail to (conditionally) erase the previous save and
+; initialize the current save, if the player did not save on this playthrough!
+
 	ld hl, wHallOfFameCount
 	ld a, [hl]
 	cp HOF_MASTER_COUNT
@@ -65,7 +68,7 @@ HallOfFame_FadeOutMusic:
 	ld c, 100
 	jp DelayFrames
 
-HallOfFame_PlayMusicDE:
+HallOfFame_PlayMusicDE::
 	push de
 	ld de, MUSIC_NONE
 	call PlayMusic
@@ -550,7 +553,7 @@ HOF_AnimatePlayerPic:
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
 	call ByteFill
-	ld a, $0c
+	ld a, CAL
 	ld [wTrainerClass], a
 	ld de, vTiles2
 	farcall GetTrainerPic
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index a39ab794..37b1d7ba 100755
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -76,7 +76,7 @@ Unused_CheckShininess:
 	and a
 	ret
 
-Function908e:
+SGB_ApplyCreditsPals::
 	push de
 	push bc
 	ld hl, PalPacket_a155
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index 6db529e5..533c3d79 100755
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -1,3 +1,8 @@
+INCLUDE "constants.asm"
+
+
+SECTION "Credits", ROMX
+
 Credits::
 	ld b, a
 	bit 6, b ; Hall Of Fame
@@ -297,7 +302,7 @@ ParseCredits:
 	call .get
 	ld bc, SCREEN_WIDTH * 2
 	call AddNTimes
-	ld a, $70
+	ld a, BANK(CreditsStrings)
 	call FarString
 	jr .loop
 
@@ -324,7 +329,7 @@ ParseCredits:
 
 .music
 ; Play the credits music.
-	ld de, $24
+	ld de, MUSIC_CREDITS
 	call HallOfFame_PlayMusicDE
 	jr .loop
 
@@ -423,7 +428,7 @@ ConstructCreditsTilemap:
 	xor a
 	ldh [hBGMapMode], a
 	ldh [hBGMapAddress], a
-	ld hl, wTilemap
+	hlcoord 0, 0
 	call .InitTopPortion
 	hlcoord 0, 14
 	call .InitTopPortion
@@ -488,7 +493,7 @@ GetCreditsPalette:
 	ld a, [hli]
 	ld e, a
 	ld d, [hl]
-	farcall Function908e
+	farcall SGB_ApplyCreditsPals
 	ret
 
 .asm_6bcf
@@ -501,11 +506,11 @@ GetCreditsPalette:
 	ld a, 8
 	call .UpdatePals
 
-	ld hl, wBGPals1 + 14
+	ld hl, wBGPals1 palette PAL_BG_RED color 3
 	xor a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wBGPals1 + 142
+	ld hl, wBGPals2 palette PAL_BG_RED color 3
 	xor a
 	ld [hli], a
 	ld [hl], a
@@ -582,24 +587,24 @@ Credits_LoadBorderGFX:
 
 .Frames:
 	dw CreditsBellossomGFX
-	dw CreditsBellossomGFX     + 16 tiles
+	dw CreditsBellossomGFX + 16 tiles
 	dw CreditsBellossomGFX
-	dw CreditsBellossomGFX     + 32 tiles
+	dw CreditsBellossomGFX + 32 tiles
 
 	dw CreditsTogepiGFX
-	dw CreditsTogepiGFX     + 16 tiles
+	dw CreditsTogepiGFX    + 16 tiles
 	dw CreditsTogepiGFX
-	dw CreditsTogepiGFX     + 32 tiles
+	dw CreditsTogepiGFX    + 32 tiles
 
 	dw CreditsElekidGFX
-	dw CreditsElekidGFX     + 16 tiles
+	dw CreditsElekidGFX    + 16 tiles
 	dw CreditsElekidGFX
-	dw CreditsElekidGFX     + 32 tiles
+	dw CreditsElekidGFX    + 32 tiles
 
 	dw CreditsSentretGFX
-	dw CreditsSentretGFX     + 16 tiles
-	dw CreditsSentretGFX     + 32 tiles
-	dw CreditsSentretGFX     + 48 tiles
+	dw CreditsSentretGFX   + 16 tiles
+	dw CreditsSentretGFX   + 32 tiles
+	dw CreditsSentretGFX   + 48 tiles
 
 Credits_TheEnd:
 	ld a, $40
diff --git a/gfx/credits/credits.pal b/gfx/credits/credits.pal
index 79f62e69..69d550cc 100755
--- a/gfx/credits/credits.pal
+++ b/gfx/credits/credits.pal
@@ -1,11 +1,11 @@
-	RGB 31,31,31, 29,08,27, 15,24,12
-	RGB 07,07,07, 31,31,31, 30,26,11
+	RGB 31,31,31, 29,08,27, 15,24,12, 07,07,07
 
-	RGB 31,11,27, 07,07,07, 31,31,31
-	RGB 31,31,05, 17,23,31, 07,07,07
+	RGB 31,31,31, 30,26,11, 31,11,27, 07,07,07
 
-	RGB 31,31,31, 22,15,10, 31,19,09
-	RGB 07,07,07, 21,25,31, 31,31,31
+	RGB 31,31,31, 31,31,05, 17,23,31, 07,07,07
 
-	RGB 31,31,31, 19,00,00, 31,31,31
-	RGB 18,23,31, 15,20,31, 00,00,00
+	RGB 31,31,31, 22,15,10, 31,19,09, 07,07,07
+
+	RGB 21,25,31, 31,31,31, 31,31,31, 19,00,00
+
+	RGB 31,31,31, 18,23,31, 15,20,31, 00,00,00
diff --git a/layout.link b/layout.link
index d9a33677..e2b35095 100644
--- a/layout.link
+++ b/layout.link
@@ -104,6 +104,7 @@ ROMX $20
 	"Pics 13"
 ROMX $21
 	"bank21"
+	"Credits"
 ROMX $23
 	"bank23"
 ROMX $24
diff --git a/main.asm b/main.asm
index ac12cee0..a766f118 100644
--- a/main.asm
+++ b/main.asm
@@ -221,12 +221,10 @@ INCBIN "gfx/pokemon/egg/front.2bpp.lz"
 
 SECTION "bank21", ROMX
 
-
 INCLUDE "engine/printer/printer_serial.asm"
 INCLUDE "engine/printer/printer.asm"
 INCLUDE "gfx/battle_anims.asm"
 INCLUDE "engine/events/halloffame.asm"
-INCLUDE "engine/movie/credits.asm"
 
 
 SECTION "bank23", ROMX