diff options
| -rw-r--r-- | data/credits.s | 159 | ||||
| -rw-r--r-- | data/text/credits.inc | 1011 | ||||
| -rwxr-xr-x | include/ewram.h | 2 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rwxr-xr-x | src/data/credits_en.h | 654 | ||||
| -rw-r--r-- | src/scene/credits.c | 222 |
6 files changed, 862 insertions, 1187 deletions
diff --git a/data/credits.s b/data/credits.s deleted file mode 100644 index 72a7b22ac..000000000 --- a/data/credits.s +++ /dev/null @@ -1,159 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0840B83C:: @ 840B83C - .byte 0, 1, 0 - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - -gUnknown_0840B84B:: @ 840B84B - .byte 1,0xFF, 1 - .byte 1,0xFF, 1 - .byte 1, 2, 1 - .byte 1,0xFF, 1 - .byte 1,0xFF, 1 - -gUnknown_0840B85A:: @ 840B85A - .byte 1, 0, 0 - .byte 1,0xFF,0xFF - .byte 1, 2, 2 - .byte 1,0xFF,0xFF - .byte 1,0x80,0x80 - -gUnknown_0840B869:: @ 840B869 - .byte 1, 3, 1 - .byte 1, 4, 1 - .byte 1, 5, 1 - .byte 1,0xC4, 1 - .byte 1,0xC3, 1 - -gUnknown_0840B878:: @ 840B878 - .byte 1, 6, 7 - .byte 1, 8, 9 - .byte 1,0xFF, 1 - .byte 1,0x88,0x89 - .byte 1,0x86,0x87 - -.ifdef GERMAN - .byte 1, 0, 0 - .byte 1,0xFF,0xFF - .byte 1,0x80,0x8A - .byte 1,0xFF,0xFF - .byte 1,0xFF,0xFF - .byte 0, 1, 0 - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0x80, 1,0x80 -.endif - - .include "data/text/credits.inc" - -gUnknown_0840CA00:: @ 840CA00 - .byte 104, 36 - .byte 120, 36 - .byte 136, 36 - - .align 2 -gSpriteAnim_840CA08: - obj_image_anim_frame 0, 8 - obj_image_anim_frame 64, 8 - obj_image_anim_frame 128, 8 - obj_image_anim_frame 192, 8 - obj_image_anim_jump 0 - -gSpriteAnim_840CA1C: - obj_image_anim_frame 0, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 128, 4 - obj_image_anim_frame 192, 4 - obj_image_anim_jump 0 - -gSpriteAnim_840CA30: - obj_image_anim_frame 256, 4 - obj_image_anim_frame 320, 4 - obj_image_anim_frame 384, 4 - obj_image_anim_end - -gSpriteAnim_840CA40: - obj_image_anim_frame 384, 30 - obj_image_anim_frame 320, 30 - obj_image_anim_frame 256, 30 - obj_image_anim_frame 256, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_0840CA54:: @ 840CA54 - .4byte gSpriteAnim_840CA08 - .4byte gSpriteAnim_840CA1C - .4byte gSpriteAnim_840CA30 - .4byte gSpriteAnim_840CA40 - - -gSpriteAnim_840CA64: - obj_image_anim_frame 0, 8 - obj_image_anim_frame 64, 8 - obj_image_anim_frame 128, 8 - obj_image_anim_frame 192, 8 - obj_image_anim_jump 0 - -gSpriteAnim_840CA78: - obj_image_anim_frame 0, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 128, 4 - obj_image_anim_frame 192, 4 - obj_image_anim_jump 0 - -gSpriteAnim_840CA8C: - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_0840CA94:: @ 840CA94 - .4byte gSpriteAnim_840CA64 - .4byte gSpriteAnim_840CA78 - .4byte gSpriteAnim_840CA8C - - -gUnknown_0840CAA0:: @ 840CAA0 - obj_tiles 0x201E000, 6144, 1001 @ can't believe im making this a pointer again... this should be eHallOfFame, when represented in the original C file again. Please fix this by migrating data/credits.s to credits.c. - null_obj_tiles - -gUnknown_0840CAB0:: @ 840CAB0 - obj_pal 0x201F800, 1001 @ same as above. When this is in credits.c, it will be able to proper see its definition in ewram.h, which is EWRAM_1F800. - null_obj_pal - - .align 2 -gOamData_840CAC0:: @ 840CAC0 - .2byte 0x00A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_840CAC8:: @ 840CAC8 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840CAD0:: @ 840CAD0 - obj_image_anim_frame 64, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840CAD8:: @ 840CAD8 - obj_image_anim_frame 128, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840CAE0:: @ 840CAE0 - .4byte gSpriteAnim_840CAC8 - .4byte gSpriteAnim_840CAD0 - .4byte gSpriteAnim_840CAD8 - - .align 2 -gSpriteTemplate_840CAEC:: @ 840CAEC - spr_template 1001, 1001, gOamData_840CAC0, gSpriteAnimTable_840CAE0, NULL, gDummySpriteAffineAnimTable, spritecb_814580C diff --git a/data/text/credits.inc b/data/text/credits.inc deleted file mode 100644 index 29abccf91..000000000 --- a/data/text/credits.inc +++ /dev/null @@ -1,1011 +0,0 @@ -Category_Credits: - .string "{PALETTE 9}Credits$" -Category_ExecutiveDirector: - .string "{PALETTE 9}Executive Director$" -Category_Director: - .string "{PALETTE 9}Director$" -Category_ArtDirector: - .string "{PALETTE 9}Art Director$" -Category_BattleDirector: - .string "{PALETTE 9}Battle Director$" -Category_MainProgrammer: - .string "{PALETTE 9}Main Programmer$" -Category_BattleSystemProgrammer: - .string "{PALETTE 9}Battle System Programmer$" -Category_FieldSystemProgrammer: - .string "{PALETTE 9}Field System Programmer$" -Category_Programmers: - .string "{PALETTE 9}Programmers$" -Category_MainGraphicDesigner: - .string "{PALETTE 9}Main Graphic Designer$" -Category_POKeMONGraphicDesigners: - .string "{PALETTE 9}POKéMON & Graphic Designers$" -Category_POKeMONDesigners: - .string "{PALETTE 9}POKéMON Designers$" -Category_MusicComposition: - .string "{PALETTE 9}Music Composition$" -Category_SoundEffectsPOKeMONVoices: - .string "{PALETTE 9}Sound Effects & POKéMON Voices$" -Category_GameDesigners: - .string "{PALETTE 9}Game Designers$" -Category_PlotScenario: - .string "{PALETTE 9}Plot Scenario$" -Category_GameScenario: - .string "{PALETTE 9}Game Scenario$" -Category_ScriptDesigners: - .string "{PALETTE 9}Script Designers$" -Category_MapDesigners: - .string "{PALETTE 9}Map Designers$" -Category_MapDataDesigners: - .string "{PALETTE 9}Map Data Designers$" -Category_ParametricDesigners: - .string "{PALETTE 9}Parametric Designers$" -Category_POKeDEXText: - .string "{PALETTE 9}POKéDEX Text$" -Category_EnvironmentToolProgrammers: - .string "{PALETTE 9}Environment & Tool Programmers$" -Category_ProductTesting: - .string "{PALETTE 9}Product Testing$" -Category_SpecialThanks: - .string "{PALETTE 9}Special Thanks$" -Category_Coordinators: - .string "{PALETTE 9}Coordinators$" -Category_Producers: - .string "{PALETTE 9}Producers$" -Category_ExecutiveProducers: - .string "{PALETTE 9}Executive Producers$" -Category_InformationSupervisors: - .string "{PALETTE 9}Information Supervisors$" -Category_TaskManagers: - .string "{PALETTE 9}Task Managers$" -Category_BrailleCodeCheck: - .string "{PALETTE 9}Braille Code Check$" -Category_EnglishVersionCoordinators: - .string "{PALETTE 9}English Version Coordinators$" -Category_Translator: - .string "{PALETTE 9}Translator$" -Category_ProductSupport: - .string "{PALETTE 9}Product Support$" -Category_Artwork: - .string "{PALETTE 9}Artwork$" -Category_TextEditor: - .string "{PALETTE 9}Text Editor$" -Category_NOAProductTesting: - .string "{PALETTE 9}NOA Product Testing$" -Category_GraphicDesigners: - .string "{PALETTE 9}Graphic Designers$" -Text_SatoshiTajiri: - .string "Satoshi Tajiri$" -Text_Masuda: - .string "Junichi Masuda$" -Text_Sugimori: - .string "Ken Sugimori$" -Text_Morimoto: - .string "Shigeki Morimoto$" -Text_TetsuyaWatanabe: - .string "Tetsuya Watanabe$" -Text_Sogabe: - .string "Hisashi Sogabe$" -Text_Tamada: - .string "Sousuke Tamada$" -Text_Mori: - .string "Akito Mori$" -Text_Kagaya: - .string "Keita Kagaya$" -Text_Matsuda: - .string "Yoshinori Matsuda$" -Text_HiroyukiNakamura: - .string "Hiroyuki Nakamura$" -Text_Taya: - .string "Masao Taya$" -Text_Nohara: - .string "Satoshi Nohara$" -Text_TomomichiOhta: - .string "Tomomichi Ohta$" -Text_Iwasawa: - .string "Miyuki Iwasawa$" -Text_TakenoriOhta: - .string "Takenori Ohta$" -Text_Yoshida: - .string "Hironobu Yoshida$" -Text_Fujiwara: - .string "Motofumi Fujiwara$" -Text_SatoshiOhta: - .string "Satoshi Ohta$" -Text_Iwashita: - .string "Asuka Iwashita$" -Text_Tomita: - .string "Aimi Tomita$" -Text_Unno: - .string "Takao Unno$" -Text_Eo: - .string "Kanako Eo$" -Text_Okutani: - .string "Jun Okutani$" -Text_Nishida: - .string "Atsuko Nishida$" -Text_Saito: - .string "Muneo Saito$" -Text_Yoshikawa: - .string "Rena Yoshikawa$" -Text_Ichinose: - .string "Go Ichinose$" -Text_Aoki: - .string "Morikazu Aoki$" -Text_Nishino: - .string "Koji Nishino$" -Text_Matsushima: - .string "Kenji Matsushima$" -Text_TetsujiOhta: - .string "Tetsuji Ohta$" -Text_Sato: - .string "Hitomi Sato$" -Text_Kawachimaru: - .string "Takeshi Kawachimaru$" -Text_Shimoyamada: - .string "Teruyuki Shimoyamada$" -Text_Ohmori: - .string "Shigeru Ohmori$" -Text_Takahashi: - .string "Tadashi Takahashi$" -Text_ToshinobuMatsumiya: - .string "Toshinobu Matsumiya$" -Text_Tomisawa: - .string "Akihito Tomisawa$" -Text_Enomoto: - .string "Hiroki Enomoto$" -Text_Terada: - .string "Kazuyuki Terada$" -Text_Sakurai: - .string "Yuri Sakurai$" -Text_Sagawa: - .string "Hiromi Sagawa$" -Text_Tominaga: - .string "Kenji Tominaga$" -Text_YoshioTajiri: - .string "Yoshio Tajiri$" -Text_Sasaki: - .string "Teiko Sasaki$" -Text_Hamano: - .string "Sachiko Hamano$" -Text_ChieMatsumiya: - .string "Chie Matsumiya$" -Text_Shinozaki: - .string "Akiko Shinozaki$" -Text_Fujii: - .string "Atsuko Fujii$" -Text_SuperMarioClub: - .string "NCL Super Mario Club$" -Text_Tada: - .string "Atsushi Tada$" -Text_Ohnishi: - .string "Takahiro Ohnishi$" -Text_Okamura: - .string "Norihide Okamura$" -Text_HiroNakamura: - .string "Hiro Nakamura$" -Text_Uesugi: - .string "Hiroyuki Uesugi$" -Text_Murakawa: - .string "Teruki Murakawa$" -Text_Kinashi: - .string "Akira Kinashi$" -Text_Takizawa: - .string "Michiko Takizawa$" -Text_Takada: - .string "Makiko Takada$" -Text_Kondo: - .string "Takanao Kondo$" -Text_Mashima: - .string "Ai Mashima$" -Text_Nomoto: - .string "Gakuji Nomoto$" -Text_Izushi: - .string "Takehiro Izushi$" -Text_Yamagami: - .string "Hitoshi Yamagami$" -Text_KyokoWatanabe: - .string "Kyoko Watanabe$" -Text_Nakano: - .string "Takao Nakano$" -Text_Jinnai: - .string "Hiroyuki Jinnai$" -Text_Tsuru: - .string "Hiroaki Tsuru$" -Text_Ishihara: - .string "Tsunekaz Ishihara$" -Text_Iwata: - .string "Satoru Iwata$" -Text_Suyama: - .string "Kazuya Suyama$" -Text_Mitsuhara: - .string "Satoshi Mitsuhara$" -Text_JapanBrailleLibrary: - .string "Japan Braille Library$" -Text_Komura: - .string "Tomotaka Komura$" -Text_Ohashi: - .string "Mikiko Ohashi$" -Text_McMahill: - .string "Seth McMahill$" -Text_Ogasawara: - .string "Nob Ogasawara$" -Text_Yamamoto: - .string "Souichi Yamamoto$" -Text_Funakoshi: - .string "Masanori Funakoshi$" -Text_Fujihara: - .string "Kazuhiro Fujihara$" -Text_Nakamichi: - .string "Kimiko Nakamichi$" -Text_Hara: - .string "Daisuke Hara$" -Text_Okada: - .string "Atsushi Okada$" -Text_Lillygren: - .string "Teresa Lillygren$" -Text_Hertzog: - .string "Thomas Hertzog$" -Text_Ridgeway: - .string "Ed Ridgeway$" -Text_NFotB: - .string "National Federation of the Blind$" -Text_Maurer: - .string "Patricia A. Maurer$" -Text_Ford: - .string "Sayoko Blodgett-Ford$" -Text_Barlow: - .string "Nicola Pratt-Barlow$" -Text_Uyama: - .string "Koji Uyama$" -Text_Howitt: - .string "Anthony Howitt$" -Text_Tilden: - .string "Gail Tilden$" -Text_EBU: - .string "European Blind Union$" -Text_ABA: - .string "Australian Braille Authority$" -Text_RNZFotB: - .string "Royal New Zealand Federation for the Blind$" -Text_CreditsTerminator: - .string "$" -Text_Version: - .ifdef SAPPHIRE - .string "{PALETTE 9}POKéMON SAPPHIRE VERSION$" - .else - .string "{PALETTE 9}POKéMON RUBY VERSION$" - .endif - -@ pointer table - -CreditsTerminator:: - credits_entry 0, Text_CreditsTerminator - -CreditsVersion:: - .ifdef SAPPHIRE - credits_entry 7, Text_Version - .else - credits_entry 8, Text_Version - .endif - -CreditsCredits:: - credits_entry 11, Category_Credits - -CreditsExecutiveDirector:: - credits_entry 8, Category_ExecutiveDirector - -CreditsDirector:: - credits_entry 12, Category_Director - -CreditsArtDirector:: - credits_entry 10, Category_ArtDirector - -CreditsBattleDirector:: - credits_entry 10, Category_BattleDirector - -CreditsMainProgrammer:: - credits_entry 10, Category_MainProgrammer - -CreditsBattleSystemProgrammer:: - credits_entry 8, Category_BattleSystemProgrammer - -CreditsFieldSystemProgrammer:: - credits_entry 7, Category_FieldSystemProgrammer - -CreditsProgrammers:: - credits_entry 12, Category_Programmers - -CreditsMainGraphicDesigner:: - credits_entry 7, Category_MainGraphicDesigner - -CreditsPOKeMONGraphicDesigners:: - credits_entry 6, Category_POKeMONGraphicDesigners - -CreditsPOKeMONDesigners:: - credits_entry 10, Category_POKeMONDesigners - -CreditsMusicComposition:: - credits_entry 13, Category_MusicComposition - -CreditsSoundEffectsPOKeMONVoices:: - credits_entry 4, Category_SoundEffectsPOKeMONVoices - -CreditsGameDesigners:: - credits_entry 11, Category_GameDesigners - -CreditsPlotScenario:: - credits_entry 11, Category_PlotScenario - -CreditsGameScenario:: - credits_entry 13, Category_GameScenario - -CreditsScriptDesigners:: - credits_entry 10, Category_ScriptDesigners - -CreditsMapDesigners:: - credits_entry 11, Category_MapDesigners - -CreditsMapDataDesigners:: - credits_entry 9, Category_MapDataDesigners - -CreditsParametricDesigners:: - credits_entry 9, Category_ParametricDesigners - -CreditsPOKeDEXText:: - credits_entry 11, Category_POKeDEXText - -CreditsEnvironmentToolProgrammers:: - credits_entry 6, Category_EnvironmentToolProgrammers - -CreditsProductTesting:: - credits_entry 11, Category_ProductTesting - -CreditsSpecialThanks:: - credits_entry 10, Category_SpecialThanks - -CreditsCoordinators:: - credits_entry 11, Category_Coordinators - -CreditsProducers:: - credits_entry 11, Category_Producers - -CreditsExecutiveProducers:: - credits_entry 7, Category_ExecutiveProducers - -CreditsInformationSupervisors:: - credits_entry 10, Category_InformationSupervisors - -CreditsTaskManagers:: - credits_entry 8, Category_TaskManagers - -CreditsBrailleCodeCheck:: - credits_entry 10, Category_BrailleCodeCheck - -CreditsSatoshiTajiri:: - credits_entry 11, Text_SatoshiTajiri - -CreditsMasuda:: - credits_entry 11, Text_Masuda - -CreditsSugimori:: - credits_entry 11, Text_Sugimori - -CreditsMorimoto:: - credits_entry 11, Text_Morimoto - -CreditsTetsuyaWatanabe:: - credits_entry 11, Text_TetsuyaWatanabe - -CreditsSogabe:: - credits_entry 11, Text_Sogabe - -CreditsTamada:: - credits_entry 11, Text_Tamada - -CreditsMori:: - credits_entry 11, Text_Mori - -CreditsKagaya:: - credits_entry 11, Text_Kagaya - -CreditsMatsuda:: - credits_entry 11, Text_Matsuda - -CreditsHiroyukiNakamura:: - credits_entry 11, Text_HiroyukiNakamura - -CreditsTaya:: - credits_entry 11, Text_Taya - -CreditsNohara:: - credits_entry 11, Text_Nohara - -CreditsTomomichiOhta:: - credits_entry 11, Text_TomomichiOhta - -CreditsIwasawa:: - credits_entry 11, Text_Iwasawa - -CreditsTakenoriOhta:: - credits_entry 11, Text_TakenoriOhta - -CreditsYoshida:: - credits_entry 11, Text_Yoshida - -CreditsFujiwara:: - credits_entry 11, Text_Fujiwara - -CreditsSatoshiOhta:: - credits_entry 11, Text_SatoshiOhta - -CreditsIwashita:: - credits_entry 11, Text_Iwashita - -CreditsTomita:: - credits_entry 11, Text_Tomita - -CreditsUnno:: - credits_entry 11, Text_Unno - -CreditsEo:: - credits_entry 11, Text_Eo - -CreditsOkutani:: - credits_entry 11, Text_Okutani - -CreditsNishida:: - credits_entry 11, Text_Nishida - -CreditsSaito:: - credits_entry 11, Text_Saito - -CreditsYoshikawa:: - credits_entry 11, Text_Yoshikawa - -CreditsIchinose:: - credits_entry 11, Text_Ichinose - -CreditsAoki:: - credits_entry 11, Text_Aoki - -CreditsNishino:: - credits_entry 11, Text_Nishino - -CreditsMatsushima:: - credits_entry 11, Text_Matsushima - -CreditsTetsujiOhta:: - credits_entry 11, Text_TetsujiOhta - -CreditsSato:: - credits_entry 11, Text_Sato - -CreditsKawachimaru:: - credits_entry 11, Text_Kawachimaru - -CreditsShimoyamada:: - credits_entry 11, Text_Shimoyamada - -CreditsOhmori:: - credits_entry 11, Text_Ohmori - -CreditsTakahashi:: - credits_entry 11, Text_Takahashi - -CreditsToshinobuMatsumiya:: - credits_entry 11, Text_ToshinobuMatsumiya - -CreditsTomisawa:: - credits_entry 11, Text_Tomisawa - -CreditsEnomoto:: - credits_entry 11, Text_Enomoto - -CreditsTerada:: - credits_entry 11, Text_Terada - -CreditsSakurai:: - credits_entry 11, Text_Sakurai - -CreditsSagawa:: - credits_entry 11, Text_Sagawa - -CreditsTominaga:: - credits_entry 11, Text_Tominaga - -CreditsYoshiroTajiri:: - credits_entry 11, Text_YoshioTajiri - -CreditsSasaki:: - credits_entry 11, Text_Sasaki - -CreditsHamano:: - credits_entry 11, Text_Hamano - -CreditsChieMatsumiya:: - credits_entry 11, Text_ChieMatsumiya - -CreditsShinozaki:: - credits_entry 11, Text_Shinozaki - -CreditsFujii:: - credits_entry 11, Text_Fujii - -CreditsSuperMarioClub:: - credits_entry 11, Text_SuperMarioClub - -CreditsTada:: - credits_entry 11, Text_Tada - -CreditsOhnishi:: - credits_entry 11, Text_Ohnishi - -CreditsOkamura:: - credits_entry 11, Text_Okamura - -CreditsHiroNakamura:: - credits_entry 11, Text_HiroNakamura - -CreditsUesugi:: - credits_entry 11, Text_Uesugi - -CreditsMurakawa:: - credits_entry 11, Text_Murakawa - -CreditsKinashi:: - credits_entry 11, Text_Kinashi - -CreditsTakizawa:: - credits_entry 11, Text_Takizawa - -CreditsTakada:: - credits_entry 11, Text_Takada - -CreditsKondo:: - credits_entry 11, Text_Kondo - -CreditsMashima:: - credits_entry 11, Text_Mashima - -CreditsNomoto:: - credits_entry 11, Text_Nomoto - -CreditsIzushi:: - credits_entry 11, Text_Izushi - -CreditsYamagami:: - credits_entry 11, Text_Yamagami - -CreditsKyokoWatanabe:: - credits_entry 11, Text_KyokoWatanabe - -CreditsNakano:: - credits_entry 11, Text_Nakano - -CreditsJinnai:: - credits_entry 11, Text_Jinnai - -CreditsTsuru:: - credits_entry 11, Text_Tsuru - -CreditsIshihara:: - credits_entry 11, Text_Ishihara - -CreditsIwata:: - credits_entry 11, Text_Iwata - -CreditsSuyama:: - credits_entry 11, Text_Suyama - -CreditsMitsuhara:: - credits_entry 11, Text_Mitsuhara - -CreditsJapanBrailleLibrary:: - credits_entry 9, Text_JapanBrailleLibrary - -CreditsKomura:: - credits_entry 11, Text_Komura - -CreditsOhashi:: - credits_entry 11, Text_Ohashi - -CreditsEnglishVersionCoordinators:: - credits_entry 0, Category_EnglishVersionCoordinators - -CreditsTranslator:: - credits_entry 0, Category_Translator - -CreditsProductSupport:: - credits_entry 0, Category_ProductSupport - -CreditsArtwork:: - credits_entry 0, Category_Artwork - -CreditsTextEditor:: - credits_entry 0, Category_TextEditor - -CreditsNOAProductTesting:: - credits_entry 0, Category_NOAProductTesting - -CreditsGraphicDesigners:: - credits_entry 0, Category_GraphicDesigners - -CreditsMcMahill:: - credits_entry 0, Text_McMahill - -CreditsOgasawara:: - credits_entry 0, Text_Ogasawara - -CreditsYamamoto:: - credits_entry 0, Text_Yamamoto - -CreditsFunakoshi:: - credits_entry 0, Text_Funakoshi - -CreditsFujihara:: - credits_entry 0, Text_Fujihara - -CreditsNakamichi:: - credits_entry 0, Text_Nakamichi - -CreditsHara:: - credits_entry 0, Text_Hara - -CreditsOkada:: - credits_entry 0, Text_Okada - -CreditsLillygren:: - credits_entry 0, Text_Lillygren - -CreditsHertzog:: - credits_entry 0, Text_Hertzog - -CreditsRidgeway:: - credits_entry 0, Text_Ridgeway - -CreditsNFotB:: - credits_entry 0, Text_NFotB - -CreditsMaurer:: - credits_entry 0, Text_Maurer - -CreditsFord:: - credits_entry 0, Text_Ford - -CreditsBarlow:: - credits_entry 0, Text_Barlow - -CreditsUyama:: - credits_entry 0, Text_Uyama - -CreditsHowitt:: - credits_entry 0, Text_Howitt - -CreditsTilden:: - credits_entry 0, Text_Tilden - -CreditsEBU:: - credits_entry 0, Text_EBU - -CreditsABA:: - credits_entry 0, Text_ABA - -CreditsRNZFotB:: - credits_entry 0, Text_RNZFotB - -@ pointer table to credits entries - - .align 2 -gCreditsEntryPointerTable:: @ 840C5F0 - .4byte CreditsTerminator - .4byte CreditsVersion - .4byte CreditsCredits - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsDirector - .4byte CreditsMasuda - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsArtDirector - .4byte CreditsSugimori - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsBattleDirector - .4byte CreditsMorimoto - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsMainProgrammer - .4byte CreditsTetsuyaWatanabe - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsBattleSystemProgrammer - .4byte CreditsSogabe - .4byte CreditsFieldSystemProgrammer - .4byte CreditsTamada - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsMori - .4byte CreditsKagaya - .4byte CreditsMatsuda - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsHiroyukiNakamura - .4byte CreditsTaya - .4byte CreditsNohara - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsTomomichiOhta - .4byte CreditsIwasawa - .4byte CreditsTakenoriOhta - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsMainGraphicDesigner - .4byte CreditsYoshida - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsPOKeMONGraphicDesigners - .4byte CreditsSugimori - .4byte CreditsYoshida - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsPOKeMONGraphicDesigners - .4byte CreditsFujiwara - .4byte CreditsSatoshiOhta - .4byte CreditsIwashita - .4byte CreditsTerminator - - .4byte CreditsPOKeMONGraphicDesigners - .4byte CreditsTomita - .4byte CreditsUnno - .4byte CreditsEo - .4byte CreditsTerminator - - .4byte CreditsPOKeMONDesigners - .4byte CreditsMorimoto - .4byte CreditsOkutani - .4byte CreditsNishida - .4byte CreditsTerminator - - .4byte CreditsPOKeMONDesigners - .4byte CreditsSaito - .4byte CreditsYoshikawa - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsMusicComposition - .4byte CreditsIchinose - .4byte CreditsAoki - .4byte CreditsMasuda - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsSoundEffectsPOKeMONVoices - .4byte CreditsAoki - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsGameDesigners - .4byte CreditsMasuda - .4byte CreditsMorimoto - .4byte CreditsNishino - .4byte CreditsTerminator - - .4byte CreditsGameDesigners - .4byte CreditsMatsushima - .4byte CreditsTetsujiOhta - .4byte CreditsSato - .4byte CreditsKawachimaru - - .4byte CreditsGameDesigners - .4byte CreditsShimoyamada - .4byte CreditsOhmori - .4byte CreditsTakahashi - .4byte CreditsTerminator - - .4byte CreditsPlotScenario - .4byte CreditsMasuda - .4byte CreditsTomisawa - .4byte CreditsNishino - .4byte CreditsTerminator - - .4byte CreditsGameScenario - .4byte CreditsToshinobuMatsumiya - .4byte CreditsTomisawa - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsScriptDesigners - .4byte CreditsNohara - .4byte CreditsTetsujiOhta - .4byte CreditsTomomichiOhta - .4byte CreditsTerminator - - .4byte CreditsMapDesigners - .4byte CreditsOhmori - .4byte CreditsTetsujiOhta - .4byte CreditsNishino - .4byte CreditsTerminator - - .4byte CreditsMapDataDesigners - .4byte CreditsTetsujiOhta - .4byte CreditsTakahashi - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsParametricDesigners - .4byte CreditsNishino - .4byte CreditsMorimoto - .4byte CreditsTetsujiOhta - .4byte CreditsShimoyamada - - .4byte CreditsTerminator - .4byte CreditsPOKeDEXText - .4byte CreditsMatsushima - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsEnvironmentToolProgrammers - .4byte CreditsSogabe - .4byte CreditsTamada - .4byte CreditsHiroyukiNakamura - .4byte CreditsMori - - .4byte CreditsProductTesting - .4byte CreditsSuperMarioClub - .4byte CreditsTada - .4byte CreditsOhnishi - .4byte CreditsOkamura - - .4byte CreditsSpecialThanks - .4byte CreditsTominaga - .4byte CreditsYoshiroTajiri - .4byte CreditsSasaki - .4byte CreditsTerminator - - .4byte CreditsSpecialThanks - .4byte CreditsHamano - .4byte CreditsChieMatsumiya - .4byte CreditsShinozaki - .4byte CreditsFujii - - .4byte CreditsSpecialThanks - .4byte CreditsSuyama - .4byte CreditsMitsuhara - .4byte CreditsKomura - .4byte CreditsOhashi - - .4byte CreditsSpecialThanks - .4byte CreditsTakizawa - .4byte CreditsTakada - .4byte CreditsKondo - .4byte CreditsMashima - - .4byte CreditsInformationSupervisors - .4byte CreditsEnomoto - .4byte CreditsTerada - .4byte CreditsSakurai - .4byte CreditsSagawa - - .4byte CreditsCoordinators - .4byte CreditsKyokoWatanabe - .4byte CreditsNakano - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTaskManagers - .4byte CreditsYamagami - .4byte CreditsNomoto - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsProducers - .4byte CreditsJinnai - .4byte CreditsIzushi - .4byte CreditsTsuru - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsExecutiveDirector - .4byte CreditsSatoshiTajiri - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsExecutiveProducers - .4byte CreditsIwata - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsExecutiveProducers - .4byte CreditsIshihara - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsEnglishVersionCoordinators - .4byte CreditsHiroNakamura - .4byte CreditsMcMahill - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsTranslator - .4byte CreditsOgasawara - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsMurakawa - .4byte CreditsYamamoto - .4byte CreditsFunakoshi - .4byte CreditsKinashi - - .4byte CreditsGraphicDesigners - .4byte CreditsYamamoto - .4byte CreditsKinashi - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsProductSupport - .4byte CreditsNakamichi - .4byte CreditsHara - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsArtwork - .4byte CreditsOkada - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsTextEditor - .4byte CreditsLillygren - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsNOAProductTesting - .4byte CreditsHertzog - .4byte CreditsRidgeway - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsBrailleCodeCheck - .4byte CreditsNFotB - .4byte CreditsMaurer - .4byte CreditsJapanBrailleLibrary - .4byte CreditsEBU - - .4byte CreditsBrailleCodeCheck - .4byte CreditsABA - .4byte CreditsRNZFotB - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsSpecialThanks - .4byte CreditsFord - .4byte CreditsBarlow - .4byte CreditsUesugi - .4byte CreditsUyama - - .4byte CreditsSpecialThanks - .4byte CreditsHowitt - .4byte CreditsTilden - .4byte CreditsFujihara - .4byte CreditsTerminator diff --git a/include/ewram.h b/include/ewram.h index 93fba80f8..4f96688c9 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -208,11 +208,13 @@ extern u8 gSharedMem[]; #define eHallOfFameMons2 (struct HallofFameMons*)(&gSharedMem[0x1E000]) #define eHallOfFame (struct HallOfFame *)(gSharedMem + 0x1E000) #define HALL_OF_FAME_SHEET_0 ((u8 *)(gSharedMem + 0x1E000)) +#define ewram1E000_2 (const u8 *)(gSharedMem + 0x1E000) #define HALL_OF_FAME_SHEET_1 ((u8 *)(gSharedMem + 0x1E800)) #define ewram_1f000 (*(struct DecoPCPointers *)(gSharedMem + 0x1f000)) #define ewramSavedPokeballsPocket ((struct ItemSlot *)(gSharedMem + 0x1F000)) // saved Pokeballs pocket (for Wally battle) #define HALL_OF_FAME_SHEET_2 ((u8 *)(gSharedMem + 0x1F000)) #define EWRAM_1F800 ((u16 *)(gSharedMem + 0x1F800)) +#define ewram_1F800_2 (const u16 *)(gSharedMem + 0x1F800) #define ewram1FE00 (*(struct Unk201FE00 *)(gSharedMem + 0x1FE00)) #define eMailboxInfo (*(struct MailboxStruct *)(gSharedMem + 0x1FE00)) #define eCutGrassSpriteArray (gSharedMem + 0x1FFF0) // 8 sprite IDs diff --git a/ld_script.txt b/ld_script.txt index e208d5749..c2d20d313 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -449,7 +449,6 @@ SECTIONS { data/battle_anim_813F0F4.o(.rodata); src/scene/hall_of_fame.o(.rodata); src/scene/credits.o(.rodata); - data/credits.o(.rodata); src/field/lottery_corner.o(.rodata); src/field/diploma.o(.rodata); src/strings.o(.rodata); diff --git a/src/data/credits_en.h b/src/data/credits_en.h new file mode 100755 index 000000000..fd00dd94b --- /dev/null +++ b/src/data/credits_en.h @@ -0,0 +1,654 @@ +const u8 Category_Credits[] = _("{PALETTE 9}Credits"); +const u8 Category_ExecutiveDirector[] = _("{PALETTE 9}Executive Director"); +const u8 Category_Director[] = _("{PALETTE 9}Director"); +const u8 Category_ArtDirector[] = _("{PALETTE 9}Art Director"); +const u8 Category_BattleDirector[] = _("{PALETTE 9}Battle Director"); +const u8 Category_MainProgrammer[] = _("{PALETTE 9}Main Programmer"); +const u8 Category_BattleSystemProgrammer[] = _("{PALETTE 9}Battle System Programmer"); +const u8 Category_FieldSystemProgrammer[] = _("{PALETTE 9}Field System Programmer"); +const u8 Category_Programmers[] = _("{PALETTE 9}Programmers"); +const u8 Category_MainGraphicDesigner[] = _("{PALETTE 9}Main Graphic Designer"); +const u8 Category_POKeMONGraphicDesigners[] = _("{PALETTE 9}POKéMON & Graphic Designers"); +const u8 Category_POKeMONDesigners[] = _("{PALETTE 9}POKéMON Designers"); +const u8 Category_MusicComposition[] = _("{PALETTE 9}Music Composition"); +const u8 Category_SoundEffectsPOKeMONVoices[] = _("{PALETTE 9}Sound Effects & POKéMON Voices"); +const u8 Category_GameDesigners[] = _("{PALETTE 9}Game Designers"); +const u8 Category_PlotScenario[] = _("{PALETTE 9}Plot Scenario"); +const u8 Category_GameScenario[] = _("{PALETTE 9}Game Scenario"); +const u8 Category_ScriptDesigners[] = _("{PALETTE 9}Script Designers"); +const u8 Category_MapDesigners[] = _("{PALETTE 9}Map Designers"); +const u8 Category_MapDataDesigners[] = _("{PALETTE 9}Map Data Designers"); +const u8 Category_ParametricDesigners[] = _("{PALETTE 9}Parametric Designers"); +const u8 Category_POKeDEXText[] = _("{PALETTE 9}POKéDEX Text"); +const u8 Category_EnvironmentToolProgrammers[] = _("{PALETTE 9}Environment & Tool Programmers"); +const u8 Category_ProductTesting[] = _("{PALETTE 9}Product Testing"); +const u8 Category_SpecialThanks[] = _("{PALETTE 9}Special Thanks"); +const u8 Category_Coordinators[] = _("{PALETTE 9}Coordinators"); +const u8 Category_Producers[] = _("{PALETTE 9}Producers"); +const u8 Category_ExecutiveProducers[] = _("{PALETTE 9}Executive Producers"); +const u8 Category_InformationSupervisors[] = _("{PALETTE 9}Information Supervisors"); +const u8 Category_TaskManagers[] = _("{PALETTE 9}Task Managers"); +const u8 Category_BrailleCodeCheck[] = _("{PALETTE 9}Braille Code Check"); +const u8 Category_EnglishVersionCoordinators[] = _("{PALETTE 9}English Version Coordinators"); +const u8 Category_Translator[] = _("{PALETTE 9}Translator"); +const u8 Category_ProductSupport[] = _("{PALETTE 9}Product Support"); +const u8 Category_Artwork[] = _("{PALETTE 9}Artwork"); +const u8 Category_TextEditor[] = _("{PALETTE 9}Text Editor"); +const u8 Category_NOAProductTesting[] = _("{PALETTE 9}NOA Product Testing"); +const u8 Category_GraphicDesigners[] = _("{PALETTE 9}Graphic Designers"); +const u8 Text_SatoshiTajiri[] = _("Satoshi Tajiri"); +const u8 Text_Masuda[] = _("Junichi Masuda"); +const u8 Text_Sugimori[] = _("Ken Sugimori"); +const u8 Text_Morimoto[] = _("Shigeki Morimoto"); +const u8 Text_TetsuyaWatanabe[] = _("Tetsuya Watanabe"); +const u8 Text_Sogabe[] = _("Hisashi Sogabe"); +const u8 Text_Tamada[] = _("Sousuke Tamada"); +const u8 Text_Mori[] = _("Akito Mori"); +const u8 Text_Kagaya[] = _("Keita Kagaya"); +const u8 Text_Matsuda[] = _("Yoshinori Matsuda"); +const u8 Text_HiroyukiNakamura[] = _("Hiroyuki Nakamura"); +const u8 Text_Taya[] = _("Masao Taya"); +const u8 Text_Nohara[] = _("Satoshi Nohara"); +const u8 Text_TomomichiOhta[] = _("Tomomichi Ohta"); +const u8 Text_Iwasawa[] = _("Miyuki Iwasawa"); +const u8 Text_TakenoriOhta[] = _("Takenori Ohta"); +const u8 Text_Yoshida[] = _("Hironobu Yoshida"); +const u8 Text_Fujiwara[] = _("Motofumi Fujiwara"); +const u8 Text_SatoshiOhta[] = _("Satoshi Ohta"); +const u8 Text_Iwashita[] = _("Asuka Iwashita"); +const u8 Text_Tomita[] = _("Aimi Tomita"); +const u8 Text_Unno[] = _("Takao Unno"); +const u8 Text_Eo[] = _("Kanako Eo"); +const u8 Text_Okutani[] = _("Jun Okutani"); +const u8 Text_Nishida[] = _("Atsuko Nishida"); +const u8 Text_Saito[] = _("Muneo Saito"); +const u8 Text_Yoshikawa[] = _("Rena Yoshikawa"); +const u8 Text_Ichinose[] = _("Go Ichinose"); +const u8 Text_Aoki[] = _("Morikazu Aoki"); +const u8 Text_Nishino[] = _("Koji Nishino"); +const u8 Text_Matsushima[] = _("Kenji Matsushima"); +const u8 Text_TetsujiOhta[] = _("Tetsuji Ohta"); +const u8 Text_Sato[] = _("Hitomi Sato"); +const u8 Text_Kawachimaru[] = _("Takeshi Kawachimaru"); +const u8 Text_Shimoyamada[] = _("Teruyuki Shimoyamada"); +const u8 Text_Ohmori[] = _("Shigeru Ohmori"); +const u8 Text_Takahashi[] = _("Tadashi Takahashi"); +const u8 Text_ToshinobuMatsumiya[] = _("Toshinobu Matsumiya"); +const u8 Text_Tomisawa[] = _("Akihito Tomisawa"); +const u8 Text_Enomoto[] = _("Hiroki Enomoto"); +const u8 Text_Terada[] = _("Kazuyuki Terada"); +const u8 Text_Sakurai[] = _("Yuri Sakurai"); +const u8 Text_Sagawa[] = _("Hiromi Sagawa"); +const u8 Text_Tominaga[] = _("Kenji Tominaga"); +const u8 Text_YoshioTajiri[] = _("Yoshio Tajiri"); +const u8 Text_Sasaki[] = _("Teiko Sasaki"); +const u8 Text_Hamano[] = _("Sachiko Hamano"); +const u8 Text_ChieMatsumiya[] = _("Chie Matsumiya"); +const u8 Text_Shinozaki[] = _("Akiko Shinozaki"); +const u8 Text_Fujii[] = _("Atsuko Fujii"); +const u8 Text_SuperMarioClub[] = _("NCL Super Mario Club"); +const u8 Text_Tada[] = _("Atsushi Tada"); +const u8 Text_Ohnishi[] = _("Takahiro Ohnishi"); +const u8 Text_Okamura[] = _("Norihide Okamura"); +const u8 Text_HiroNakamura[] = _("Hiro Nakamura"); +const u8 Text_Uesugi[] = _("Hiroyuki Uesugi"); +const u8 Text_Murakawa[] = _("Teruki Murakawa"); +const u8 Text_Kinashi[] = _("Akira Kinashi"); +const u8 Text_Takizawa[] = _("Michiko Takizawa"); +const u8 Text_Takada[] = _("Makiko Takada"); +const u8 Text_Kondo[] = _("Takanao Kondo"); +const u8 Text_Mashima[] = _("Ai Mashima"); +const u8 Text_Nomoto[] = _("Gakuji Nomoto"); +const u8 Text_Izushi[] = _("Takehiro Izushi"); +const u8 Text_Yamagami[] = _("Hitoshi Yamagami"); +const u8 Text_KyokoWatanabe[] = _("Kyoko Watanabe"); +const u8 Text_Nakano[] = _("Takao Nakano"); +const u8 Text_Jinnai[] = _("Hiroyuki Jinnai"); +const u8 Text_Tsuru[] = _("Hiroaki Tsuru"); +const u8 Text_Ishihara[] = _("Tsunekaz Ishihara"); +const u8 Text_Iwata[] = _("Satoru Iwata"); +const u8 Text_Suyama[] = _("Kazuya Suyama"); +const u8 Text_Mitsuhara[] = _("Satoshi Mitsuhara"); +const u8 Text_JapanBrailleLibrary[] = _("Japan Braille Library"); +const u8 Text_Komura[] = _("Tomotaka Komura"); +const u8 Text_Ohashi[] = _("Mikiko Ohashi"); +const u8 Text_McMahill[] = _("Seth McMahill"); +const u8 Text_Ogasawara[] = _("Nob Ogasawara"); +const u8 Text_Yamamoto[] = _("Souichi Yamamoto"); +const u8 Text_Funakoshi[] = _("Masanori Funakoshi"); +const u8 Text_Fujihara[] = _("Kazuhiro Fujihara"); +const u8 Text_Nakamichi[] = _("Kimiko Nakamichi"); +const u8 Text_Hara[] = _("Daisuke Hara"); +const u8 Text_Okada[] = _("Atsushi Okada"); +const u8 Text_Lillygren[] = _("Teresa Lillygren"); +const u8 Text_Hertzog[] = _("Thomas Hertzog"); +const u8 Text_Ridgeway[] = _("Ed Ridgeway"); +const u8 Text_NFotB[] = _("National Federation of the Blind"); +const u8 Text_Maurer[] = _("Patricia A. Maurer"); +const u8 Text_Ford[] = _("Sayoko Blodgett-Ford"); +const u8 Text_Barlow[] = _("Nicola Pratt-Barlow"); +const u8 Text_Uyama[] = _("Koji Uyama"); +const u8 Text_Howitt[] = _("Anthony Howitt"); +const u8 Text_Tilden[] = _("Gail Tilden"); +const u8 Text_EBU[] = _("European Blind Union"); +const u8 Text_ABA[] = _("Australian Braille Authority"); +const u8 Text_RNZFotB[] = _("Royal New Zealand Federation for the Blind"); +const u8 Text_CreditsTerminator[] = _(""); +#ifdef SAPPHIRE +const u8 Text_Version[] = _("{PALETTE 9}POKéMON SAPPHIRE VERSION"); +#else +const u8 Text_Version[] = _("{PALETTE 9}POKéMON RUBY VERSION"); +#endif + +const struct CreditsEntry CreditsTerminator[] = {0, Text_CreditsTerminator}; +#ifdef SAPPHIRE +const struct CreditsEntry CreditsVersion[] = {7, Text_Version}; +#else +const struct CreditsEntry CreditsVersion[] = {8, Text_Version}; +#endif +const struct CreditsEntry CreditsCredits[] = {11, Category_Credits}; +const struct CreditsEntry CreditsExecutiveDirector[] = {8, Category_ExecutiveDirector}; +const struct CreditsEntry CreditsDirector[] = {12, Category_Director}; +const struct CreditsEntry CreditsArtDirector[] = {10, Category_ArtDirector}; +const struct CreditsEntry CreditsBattleDirector[] = {10, Category_BattleDirector}; +const struct CreditsEntry CreditsMainProgrammer[] = {10, Category_MainProgrammer}; +const struct CreditsEntry CreditsBattleSystemProgrammer[] = {8, Category_BattleSystemProgrammer}; +const struct CreditsEntry CreditsFieldSystemProgrammer[] = {7, Category_FieldSystemProgrammer}; +const struct CreditsEntry CreditsProgrammers[] = {12, Category_Programmers}; +const struct CreditsEntry CreditsMainGraphicDesigner[] = {7, Category_MainGraphicDesigner}; +const struct CreditsEntry CreditsPOKeMONGraphicDesigners[] = {6, Category_POKeMONGraphicDesigners}; +const struct CreditsEntry CreditsPOKeMONDesigners[] = {10, Category_POKeMONDesigners}; +const struct CreditsEntry CreditsMusicComposition[] = {13, Category_MusicComposition}; +const struct CreditsEntry CreditsSoundEffectsPOKeMONVoices[] = {4, Category_SoundEffectsPOKeMONVoices}; +const struct CreditsEntry CreditsGameDesigners[] = {11, Category_GameDesigners}; +const struct CreditsEntry CreditsPlotScenario[] = {11, Category_PlotScenario}; +const struct CreditsEntry CreditsGameScenario[] = {13, Category_GameScenario}; +const struct CreditsEntry CreditsScriptDesigners[] = {10, Category_ScriptDesigners}; +const struct CreditsEntry CreditsMapDesigners[] = {11, Category_MapDesigners}; +const struct CreditsEntry CreditsMapDataDesigners[] = {9, Category_MapDataDesigners}; +const struct CreditsEntry CreditsParametricDesigners[] = {9, Category_ParametricDesigners}; +const struct CreditsEntry CreditsPOKeDEXText[] = {11, Category_POKeDEXText}; +const struct CreditsEntry CreditsEnvironmentToolProgrammers[] = {6, Category_EnvironmentToolProgrammers}; +const struct CreditsEntry CreditsProductTesting[] = {11, Category_ProductTesting}; +const struct CreditsEntry CreditsSpecialThanks[] = {10, Category_SpecialThanks}; +const struct CreditsEntry CreditsCoordinators[] = {11, Category_Coordinators}; +const struct CreditsEntry CreditsProducers[] = {11, Category_Producers}; +const struct CreditsEntry CreditsExecutiveProducers[] = {7, Category_ExecutiveProducers}; +const struct CreditsEntry CreditsInformationSupervisors[] = {10, Category_InformationSupervisors}; +const struct CreditsEntry CreditsTaskManagers[] = {8, Category_TaskManagers}; +const struct CreditsEntry CreditsBrailleCodeCheck[] = {10, Category_BrailleCodeCheck}; +const struct CreditsEntry CreditsSatoshiTajiri[] = {11, Text_SatoshiTajiri}; +const struct CreditsEntry CreditsMasuda[] = {11, Text_Masuda}; +const struct CreditsEntry CreditsSugimori[] = {11, Text_Sugimori}; +const struct CreditsEntry CreditsMorimoto[] = {11, Text_Morimoto}; +const struct CreditsEntry CreditsTetsuyaWatanabe[] = {11, Text_TetsuyaWatanabe}; +const struct CreditsEntry CreditsSogabe[] = {11, Text_Sogabe}; +const struct CreditsEntry CreditsTamada[] = {11, Text_Tamada}; +const struct CreditsEntry CreditsMori[] = {11, Text_Mori}; +const struct CreditsEntry CreditsKagaya[] = {11, Text_Kagaya}; +const struct CreditsEntry CreditsMatsuda[] = {11, Text_Matsuda}; +const struct CreditsEntry CreditsHiroyukiNakamura[] = {11, Text_HiroyukiNakamura}; +const struct CreditsEntry CreditsTaya[] = {11, Text_Taya}; +const struct CreditsEntry CreditsNohara[] = {11, Text_Nohara}; +const struct CreditsEntry CreditsTomomichiOhta[] = {11, Text_TomomichiOhta}; +const struct CreditsEntry CreditsIwasawa[] = {11, Text_Iwasawa}; +const struct CreditsEntry CreditsTakenoriOhta[] = {11, Text_TakenoriOhta}; +const struct CreditsEntry CreditsYoshida[] = {11, Text_Yoshida}; +const struct CreditsEntry CreditsFujiwara[] = {11, Text_Fujiwara}; +const struct CreditsEntry CreditsSatoshiOhta[] = {11, Text_SatoshiOhta}; +const struct CreditsEntry CreditsIwashita[] = {11, Text_Iwashita}; +const struct CreditsEntry CreditsTomita[] = {11, Text_Tomita}; +const struct CreditsEntry CreditsUnno[] = {11, Text_Unno}; +const struct CreditsEntry CreditsEo[] = {11, Text_Eo}; +const struct CreditsEntry CreditsOkutani[] = {11, Text_Okutani}; +const struct CreditsEntry CreditsNishida[] = {11, Text_Nishida}; +const struct CreditsEntry CreditsSaito[] = {11, Text_Saito}; +const struct CreditsEntry CreditsYoshikawa[] = {11, Text_Yoshikawa}; +const struct CreditsEntry CreditsIchinose[] = {11, Text_Ichinose}; +const struct CreditsEntry CreditsAoki[] = {11, Text_Aoki}; +const struct CreditsEntry CreditsNishino[] = {11, Text_Nishino}; +const struct CreditsEntry CreditsMatsushima[] = {11, Text_Matsushima}; +const struct CreditsEntry CreditsTetsujiOhta[] = {11, Text_TetsujiOhta}; +const struct CreditsEntry CreditsSato[] = {11, Text_Sato}; +const struct CreditsEntry CreditsKawachimaru[] = {11, Text_Kawachimaru}; +const struct CreditsEntry CreditsShimoyamada[] = {11, Text_Shimoyamada}; +const struct CreditsEntry CreditsOhmori[] = {11, Text_Ohmori}; +const struct CreditsEntry CreditsTakahashi[] = {11, Text_Takahashi}; +const struct CreditsEntry CreditsToshinobuMatsumiya[] = {11, Text_ToshinobuMatsumiya}; +const struct CreditsEntry CreditsTomisawa[] = {11, Text_Tomisawa}; +const struct CreditsEntry CreditsEnomoto[] = {11, Text_Enomoto}; +const struct CreditsEntry CreditsTerada[] = {11, Text_Terada}; +const struct CreditsEntry CreditsSakurai[] = {11, Text_Sakurai}; +const struct CreditsEntry CreditsSagawa[] = {11, Text_Sagawa}; +const struct CreditsEntry CreditsTominaga[] = {11, Text_Tominaga}; +const struct CreditsEntry CreditsYoshiroTajiri[] = {11, Text_YoshioTajiri}; +const struct CreditsEntry CreditsSasaki[] = {11, Text_Sasaki}; +const struct CreditsEntry CreditsHamano[] = {11, Text_Hamano}; +const struct CreditsEntry CreditsChieMatsumiya[] = {11, Text_ChieMatsumiya}; +const struct CreditsEntry CreditsShinozaki[] = {11, Text_Shinozaki}; +const struct CreditsEntry CreditsFujii[] = {11, Text_Fujii}; +const struct CreditsEntry CreditsSuperMarioClub[] = {11, Text_SuperMarioClub}; +const struct CreditsEntry CreditsTada[] = {11, Text_Tada}; +const struct CreditsEntry CreditsOhnishi[] = {11, Text_Ohnishi}; +const struct CreditsEntry CreditsOkamura[] = {11, Text_Okamura}; +const struct CreditsEntry CreditsHiroNakamura[] = {11, Text_HiroNakamura}; +const struct CreditsEntry CreditsUesugi[] = {11, Text_Uesugi}; +const struct CreditsEntry CreditsMurakawa[] = {11, Text_Murakawa}; +const struct CreditsEntry CreditsKinashi[] = {11, Text_Kinashi}; +const struct CreditsEntry CreditsTakizawa[] = {11, Text_Takizawa}; +const struct CreditsEntry CreditsTakada[] = {11, Text_Takada}; +const struct CreditsEntry CreditsKondo[] = {11, Text_Kondo}; +const struct CreditsEntry CreditsMashima[] = {11, Text_Mashima}; +const struct CreditsEntry CreditsNomoto[] = {11, Text_Nomoto}; +const struct CreditsEntry CreditsIzushi[] = {11, Text_Izushi}; +const struct CreditsEntry CreditsYamagami[] = {11, Text_Yamagami}; +const struct CreditsEntry CreditsKyokoWatanabe[] = {11, Text_KyokoWatanabe}; +const struct CreditsEntry CreditsNakano[] = {11, Text_Nakano}; +const struct CreditsEntry CreditsJinnai[] = {11, Text_Jinnai}; +const struct CreditsEntry CreditsTsuru[] = {11, Text_Tsuru}; +const struct CreditsEntry CreditsIshihara[] = {11, Text_Ishihara}; +const struct CreditsEntry CreditsIwata[] = {11, Text_Iwata}; +const struct CreditsEntry CreditsSuyama[] = {11, Text_Suyama}; +const struct CreditsEntry CreditsMitsuhara[] = {11, Text_Mitsuhara}; +const struct CreditsEntry CreditsJapanBrailleLibrary[] = {9, Text_JapanBrailleLibrary}; +const struct CreditsEntry CreditsKomura[] = {11, Text_Komura}; +const struct CreditsEntry CreditsOhashi[] = {11, Text_Ohashi}; +const struct CreditsEntry CreditsEnglishVersionCoordinators[] = {0, Category_EnglishVersionCoordinators}; +const struct CreditsEntry CreditsTranslator[] = {0, Category_Translator}; +const struct CreditsEntry CreditsProductSupport[] = {0, Category_ProductSupport}; +const struct CreditsEntry CreditsArtwork[] = {0, Category_Artwork}; +const struct CreditsEntry CreditsTextEditor[] = {0, Category_TextEditor}; +const struct CreditsEntry CreditsNOAProductTesting[] = {0, Category_NOAProductTesting}; +const struct CreditsEntry CreditsGraphicDesigners[] = {0, Category_GraphicDesigners}; +const struct CreditsEntry CreditsMcMahill[] = {0, Text_McMahill}; +const struct CreditsEntry CreditsOgasawara[] = {0, Text_Ogasawara}; +const struct CreditsEntry CreditsYamamoto[] = {0, Text_Yamamoto}; +const struct CreditsEntry CreditsFunakoshi[] = {0, Text_Funakoshi}; +const struct CreditsEntry CreditsFujihara[] = {0, Text_Fujihara}; +const struct CreditsEntry CreditsNakamichi[] = {0, Text_Nakamichi}; +const struct CreditsEntry CreditsHara[] = {0, Text_Hara}; +const struct CreditsEntry CreditsOkada[] = {0, Text_Okada}; +const struct CreditsEntry CreditsLillygren[] = {0, Text_Lillygren}; +const struct CreditsEntry CreditsHertzog[] = {0, Text_Hertzog}; +const struct CreditsEntry CreditsRidgeway[] = {0, Text_Ridgeway}; +const struct CreditsEntry CreditsNFotB[] = {0, Text_NFotB}; +const struct CreditsEntry CreditsMaurer[] = {0, Text_Maurer}; +const struct CreditsEntry CreditsFord[] = {0, Text_Ford}; +const struct CreditsEntry CreditsBarlow[] = {0, Text_Barlow}; +const struct CreditsEntry CreditsUyama[] = {0, Text_Uyama}; +const struct CreditsEntry CreditsHowitt[] = {0, Text_Howitt}; +const struct CreditsEntry CreditsTilden[] = {0, Text_Tilden}; +const struct CreditsEntry CreditsEBU[] = {0, Text_EBU}; +const struct CreditsEntry CreditsABA[] = {0, Text_ABA}; +const struct CreditsEntry CreditsRNZFotB[] = {0, Text_RNZFotB}; + +#define LINES_PER_PAGE 5 +#define _ CreditsTerminator +const struct CreditsEntry *const gCreditsEntryPointerTable[][LINES_PER_PAGE] = +{ + { + _, + CreditsVersion, + CreditsCredits, + _, + _ + }, + { + _, + CreditsDirector, + CreditsMasuda, + _, + _, + }, + { + _, + CreditsArtDirector, + CreditsSugimori, + _, + _, + }, + { + _, + CreditsBattleDirector, + CreditsMorimoto, + _, + _, + }, + { + _, + CreditsMainProgrammer, + CreditsTetsuyaWatanabe, + _, + _, + }, + { + CreditsBattleSystemProgrammer, + CreditsSogabe, + CreditsFieldSystemProgrammer, + CreditsTamada, + _, + }, + { + CreditsProgrammers, + CreditsMori, + CreditsKagaya, + CreditsMatsuda, + _, + }, + { + CreditsProgrammers, + CreditsHiroyukiNakamura, + CreditsTaya, + CreditsNohara, + _, + }, + { + CreditsProgrammers, + CreditsTomomichiOhta, + CreditsIwasawa, + CreditsTakenoriOhta, + _, + }, + { + _, + CreditsMainGraphicDesigner, + CreditsYoshida, + _, + _, + }, + { + CreditsPOKeMONGraphicDesigners, + CreditsSugimori, + CreditsYoshida, + _, + _, + }, + { + CreditsPOKeMONGraphicDesigners, + CreditsFujiwara, + CreditsSatoshiOhta, + CreditsIwashita, + _, + }, + { + CreditsPOKeMONGraphicDesigners, + CreditsTomita, + CreditsUnno, + CreditsEo, + _, + }, + { + CreditsPOKeMONDesigners, + CreditsMorimoto, + CreditsOkutani, + CreditsNishida, + _, + }, + { + CreditsPOKeMONDesigners, + CreditsSaito, + CreditsYoshikawa, + _, + _, + }, + { + CreditsMusicComposition, + CreditsIchinose, + CreditsAoki, + CreditsMasuda, + _, + }, + { + _, + CreditsSoundEffectsPOKeMONVoices, + CreditsAoki, + _, + _, + }, + { + CreditsGameDesigners, + CreditsMasuda, + CreditsMorimoto, + CreditsNishino, + _, + }, + { + CreditsGameDesigners, + CreditsMatsushima, + CreditsTetsujiOhta, + CreditsSato, + CreditsKawachimaru, + }, + { + CreditsGameDesigners, + CreditsShimoyamada, + CreditsOhmori, + CreditsTakahashi, + _, + }, + { + CreditsPlotScenario, + CreditsMasuda, + CreditsTomisawa, + CreditsNishino, + _, + }, + { + CreditsGameScenario, + CreditsToshinobuMatsumiya, + CreditsTomisawa, + _, + _, + }, + { + CreditsScriptDesigners, + CreditsNohara, + CreditsTetsujiOhta, + CreditsTomomichiOhta, + _, + }, + { + CreditsMapDesigners, + CreditsOhmori, + CreditsTetsujiOhta, + CreditsNishino, + _, + }, + { + CreditsMapDataDesigners, + CreditsTetsujiOhta, + CreditsTakahashi, + _, + _, + }, + { + CreditsParametricDesigners, + CreditsNishino, + CreditsMorimoto, + CreditsTetsujiOhta, + CreditsShimoyamada, + }, + { + _, + CreditsPOKeDEXText, + CreditsMatsushima, + _, + _, + }, + { + CreditsEnvironmentToolProgrammers, + CreditsSogabe, + CreditsTamada, + CreditsHiroyukiNakamura, + CreditsMori, + }, + { + CreditsProductTesting, + CreditsSuperMarioClub, + CreditsTada, + CreditsOhnishi, + CreditsOkamura, + }, + { + CreditsSpecialThanks, + CreditsTominaga, + CreditsYoshiroTajiri, + CreditsSasaki, + _, + }, + { + CreditsSpecialThanks, + CreditsHamano, + CreditsChieMatsumiya, + CreditsShinozaki, + CreditsFujii, + }, + { + CreditsSpecialThanks, + CreditsSuyama, + CreditsMitsuhara, + CreditsKomura, + CreditsOhashi, + }, + { + CreditsSpecialThanks, + CreditsTakizawa, + CreditsTakada, + CreditsKondo, + CreditsMashima, + }, + { + CreditsInformationSupervisors, + CreditsEnomoto, + CreditsTerada, + CreditsSakurai, + CreditsSagawa, + }, + { + CreditsCoordinators, + CreditsKyokoWatanabe, + CreditsNakano, + _, + _, + }, + { + CreditsTaskManagers, + CreditsYamagami, + CreditsNomoto, + _, + _, + }, + { + CreditsProducers, + CreditsJinnai, + CreditsIzushi, + CreditsTsuru, + _, + }, + { + _, + CreditsExecutiveDirector, + CreditsSatoshiTajiri, + _, + _, + }, + { + _, + CreditsExecutiveProducers, + CreditsIwata, + _, + _, + }, + { + _, + CreditsExecutiveProducers, + CreditsIshihara, + _, + _, + }, + { + CreditsEnglishVersionCoordinators, + CreditsHiroNakamura, + CreditsMcMahill, + _, + _, + }, + { + _, + CreditsTranslator, + CreditsOgasawara, + _, + _, + }, + { + CreditsProgrammers, + CreditsMurakawa, + CreditsYamamoto, + CreditsFunakoshi, + CreditsKinashi, + }, + { + CreditsGraphicDesigners, + CreditsYamamoto, + CreditsKinashi, + _, + _, + }, + { + CreditsProductSupport, + CreditsNakamichi, + CreditsHara, + _, + _, + }, + { + _, + CreditsArtwork, + CreditsOkada, + _, + _, + }, + { + _, + CreditsTextEditor, + CreditsLillygren, + _, + _, + }, + { + CreditsNOAProductTesting, + CreditsHertzog, + CreditsRidgeway, + _, + _, + }, + { + CreditsBrailleCodeCheck, + CreditsNFotB, + CreditsMaurer, + CreditsJapanBrailleLibrary, + CreditsEBU, + }, + { + CreditsBrailleCodeCheck, + CreditsABA, + CreditsRNZFotB, + _, + _, + }, + { + CreditsSpecialThanks, + CreditsFord, + CreditsBarlow, + CreditsUesugi, + CreditsUyama, + }, + { + CreditsSpecialThanks, + CreditsHowitt, + CreditsTilden, + CreditsFujihara, + _, + }, +}; +#undef _ diff --git a/src/scene/credits.c b/src/scene/credits.c index d9e97c570..84b3b5faa 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -160,7 +160,7 @@ struct Unk201C000 struct CreditsEntry { u8 var_0; - u8 *text; + const u8 *text; }; extern u8 unk_201e800[0x800]; @@ -185,18 +185,208 @@ extern void *gUnknown_0840B5A0[]; // data/credits const u16 gUnknown_0840B7BC[] = INCBIN_U16("graphics/credits/palette_1.gbapal"); const u8 gUnknown_0840B7FC[] = INCBIN_U8("graphics/credits/ampersand.4bpp"); -extern u8 gUnknown_0840B83C[]; -extern u8 gUnknown_0840B84B[]; -extern u8 gUnknown_0840B85A[]; -extern u8 gUnknown_0840B869[]; -extern u8 gUnknown_0840B878[]; -extern struct CreditsEntry *gCreditsEntryPointerTable[][5]; -extern u8 gUnknown_0840CA00[][2]; -extern struct SpriteSheet gUnknown_0840CAA0; -extern struct SpritePalette gUnknown_0840CAB0; -extern const union AnimCmd *const gSpriteAnimTable_0840CA54[]; -extern const union AnimCmd *const gSpriteAnimTable_0840CA94[]; -extern struct SpriteTemplate gSpriteTemplate_840CAEC; + +void spritecb_814580C(struct Sprite *sprite); + +const u8 gUnknown_0840B83C[] = +{ + 0, 1, 0, + 0xFF, 1, 0xFF, + 0xFF, 1, 0xFF, + 0xFF, 1, 0xFF, + 0xFF, 1, 0xFF, +}; + +const u8 gUnknown_0840B84B[] = +{ + 1, 0xFF, 1, + 1, 0xFF, 1, + 1, 2, 1, + 1, 0xFF, 1, + 1, 0xFF, 1, +}; + +const u8 gUnknown_0840B85A[] = +{ + 1, 0, 0, + 1, 0xFF, 0xFF, + 1, 2, 2, + 1, 0xFF, 0xFF, + 1, 0x80, 0x80, +}; + +const u8 gUnknown_0840B869[] = +{ + 1, 3, 1, + 1, 4, 1, + 1, 5, 1, + 1, 0xC4, 1, + 1, 0xC3, 1, +}; + +const u8 gUnknown_0840B878[] = +{ + 1, 6, 7, + 1, 8, 9, + 1, 0xFF, 1, + 1, 0x88, 0x89, + 1, 0x86, 0x87, +#ifdef GERMAN + 1, 0, 0, + 1, 0xFF, 0xFF, + 1, 0x80, 0x8A, + 1, 0xFF, 0xFF, + 1, 0xFF, 0xFF, + 0, 1, 0, + 0xFF, 1, 0xFF, + 0xFF, 1, 0xFF, + 0xFF, 1, 0xFF, + 0x80, 1, 0x80, +#endif +}; + +#ifdef GERMAN +#include "../data/credits_en.h" // TODO, german credits +#else +#include "../data/credits_en.h" +#endif + +const u8 gUnknown_0840CA00[][2] = +{ + {104, 36}, + {120, 36}, + {136, 36}, +}; + +static const union AnimCmd gSpriteAnim_840CA08[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(64, 8), + ANIMCMD_FRAME(128, 8), + ANIMCMD_FRAME(192, 8), + ANIMCMD_JUMP(0), +}; + +static const union AnimCmd gSpriteAnim_840CA1C[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(128, 4), + ANIMCMD_FRAME(192, 4), + ANIMCMD_JUMP(0), +}; + +static const union AnimCmd gSpriteAnim_840CA30[] = +{ + ANIMCMD_FRAME(256, 4), + ANIMCMD_FRAME(320, 4), + ANIMCMD_FRAME(384, 4), + ANIMCMD_END, +}; + +static const union AnimCmd gSpriteAnim_840CA40[] = +{ + ANIMCMD_FRAME(384, 30), + ANIMCMD_FRAME(320, 30), + ANIMCMD_FRAME(256, 30), + ANIMCMD_FRAME(256, 30), + ANIMCMD_END, +}; + +static const union AnimCmd *const gSpriteAnimTable_0840CA54[] = +{ + gSpriteAnim_840CA08, + gSpriteAnim_840CA1C, + gSpriteAnim_840CA30, + gSpriteAnim_840CA40, +}; + +static const union AnimCmd gSpriteAnim_840CA64[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(64, 8), + ANIMCMD_FRAME(128, 8), + ANIMCMD_FRAME(192, 8), + ANIMCMD_JUMP(0), +}; + +static const union AnimCmd gSpriteAnim_840CA78[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(128, 4), + ANIMCMD_FRAME(192, 4), + ANIMCMD_JUMP(0), +}; + +static const union AnimCmd gSpriteAnim_840CA8C[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +static const union AnimCmd *const gSpriteAnimTable_0840CA94[] = +{ + gSpriteAnim_840CA64, + gSpriteAnim_840CA78, + gSpriteAnim_840CA8C, +}; + +static const struct SpriteSheet gUnknown_0840CAA0[] = {{ewram1E000_2, 6144, 1001}, {0}}; +static const struct SpritePalette gUnknown_0840CAB0[] = {{ewram_1F800_2, 1001}, {0}}; + +static const struct OamData gOamData_840CAC0 = +{ + .y = 160, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd gSpriteAnim_840CAC8[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_END, +}; + +static const union AnimCmd gSpriteAnim_840CAD0[] = +{ + ANIMCMD_FRAME(64, 8), + ANIMCMD_END, +}; + +static const union AnimCmd gSpriteAnim_840CAD8[] = +{ + ANIMCMD_FRAME(128, 8), + ANIMCMD_END, +}; + +static const union AnimCmd *const gSpriteAnimTable_840CAE0[] = +{ + gSpriteAnim_840CAC8, + gSpriteAnim_840CAD0, + gSpriteAnim_840CAD8, +}; + +static const struct SpriteTemplate gSpriteTemplate_840CAEC = +{ + .tileTag = 1001, + .paletteTag = 1001, + .oam = &gOamData_840CAC0, + .anims = gSpriteAnimTable_840CAE0, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = spritecb_814580C, +}; // graphics extern u8 gCreditsCopyrightEnd_Gfx[]; @@ -432,8 +622,8 @@ void task_a_8143D04(u8 taskIdA) EWRAM_1F800[2] = 0x529F; // light red EWRAM_1F800[3] = 0x7E94; // light blue - LoadSpriteSheet(&gUnknown_0840CAA0); - LoadSpritePalette(&gUnknown_0840CAB0); + LoadSpriteSheet(gUnknown_0840CAA0); + LoadSpritePalette(gUnknown_0840CAB0); gMain.state += 1; break; @@ -1151,7 +1341,7 @@ u16 sub_8145208(u8 arg0) return out; } -void sub_814524C(u8 arg0[], u8 baseX, u8 baseY, u16 arg3, u16 palette) +void sub_814524C(const u8 arg0[], u8 baseX, u8 baseY, u16 arg3, u16 palette) { u8 y, x; const u16 tileOffset = (palette / 16) << 12; |