izzy/Ghostship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Ghostship.git synced 2026-06-19 01:17:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Reimplemented jp bugs and behaviors when using a jp rom

Browse Source
This commit is contained in:
KiritoDv
2023-10-13 13:33:00 -06:00
parent 55ec8579a5
commit 45f97c4352
33 changed files with 283 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/text_menu_strings.h.in
-18
View File
@@ -1,18 +0,0 @@
#ifndef TEXT_MENU_STRINGS_H
#define TEXT_MENU_STRINGS_H
// These strings use a different table defined in menu_hud_lut
// Unlike text_strings.h.in, the charmap is different and
// uses char values from charmap_menu.txt
/**
* File Select JP HUD Text
*/
#define TEXT_JPHUD_MARIO _("マリオ")
#define TEXT_JPHUD_SELECT_FILE _("ファイルセレクト")
#define TEXT_JPHUD_CHECK_FILE _("どのスコアをみる？")
#define TEXT_JPHUD_COPY_FILE _("ファイルコピーする")
#define TEXT_JPHUD_ERASE_FILE _("ファイルけす")
#define TEXT_JPHUD_SOUND_SELECT _("サウンドセレクト")
#endif // TEXT_MENU_STRINGS_H
include/text_strings.h.in
-475
View File
@@ -1,475 +0,0 @@
#ifndef TEXT_STRINGS_H
#define TEXT_STRINGS_H
#include "text_menu_strings.h"
/**
* Global Symbols
*/
#define TEXT_ZERO _("0")
#define TEXT_COIN _("$")
#define TEXT_STAR _("★")
#define TEXT_COIN_X _("$×")
#define TEXT_STAR_X _("★×")
#define TEXT_VARIABLE_X _("×")
#define TEXT_UNFILLED_STAR _("☆")
/**
* Global Text
*/
// File Select
#define TEXT_NEW _("NEW") // New File Text
#define TEXT_4DASHES _("----") // Used in Score File Menu
// Ingame Menu
#define TEXT_PAUSE _("PAUSE") // Pause text, Castle Courses
#define TEXT_HUD_CONGRATULATIONS _("CONGRATULATIONS") // Course Complete Text, Bowser Courses
#if defined(VERSION_JP) || defined(VERSION_SH)
/**
* File Select Text
*/
// Main Screens
// JPHUD menu strings are defined in "text_menu_strings.h.in"
#define TEXT_MARIO TEXT_JPHUD_MARIO // View Score Menu
#define TEXT_SELECT_FILE TEXT_JPHUD_SELECT_FILE
#define TEXT_CHECK_FILE TEXT_JPHUD_CHECK_FILE
#define TEXT_COPY_FILE TEXT_JPHUD_COPY_FILE
#define TEXT_ERASE_FILE TEXT_JPHUD_ERASE_FILE
#define TEXT_SOUND_SELECT TEXT_JPHUD_SOUND_SELECT
#define TEXT_FILE_MARIO_A _("マリオＡ")
#define TEXT_FILE_MARIO_B _("マリオＢ")
#define TEXT_FILE_MARIO_C _("マリオＣ")
#define TEXT_FILE_MARIO_D _("マリオＤ")
// Menu Options
#define TEXT_SCORE _("スコア")
#define TEXT_COPY _("コピー")
#define TEXT_ERASE _("けす")
// Sound Options
#define TEXT_STEREO _("ステレオ")
#define TEXT_MONO _("モノラル")
#define TEXT_HEADSET _("ヘッドホン")
// Misc Menu Text
#define TEXT_SAVED_DATA_EXISTS _("ファイルにデータがはいってます")
#define TEXT_NO_SAVED_DATA_EXISTS _("ファイルにデータがありません")
// Inside a Menu
#define TEXT_RETURN _("もどる")
#define TEXT_CHECK_SCORE _("スコアをみる")
#define TEXT_COPY_FILE_BUTTON _("ファイルコピー")
#define TEXT_ERASE_FILE_BUTTON _("ファイルけす")
// Score Menu
#define TEXT_HI_SCORE _("ハイスコア")
#define TEXT_MY_SCORE _("マイスコア")
#define TEXT_SCORE_MARIO_A _("マリオＡ")
#define TEXT_SCORE_MARIO_B _("マリオＢ")
#define TEXT_SCORE_MARIO_C _("マリオＣ")
#define TEXT_SCORE_MARIO_D _("マリオＤ")
// Copy Menu
#define TEXT_COPY_IT_TO_WHERE _("どこにコピーしますか？")
#define TEXT_COPYING_COMPLETED _("コピーおわりました")
#define TEXT_NO_FILE_TO_COPY_FROM _("からのファイルがありません")
// Erase Menu
#define TEXT_SURE _("ほんと？")
#define TEXT_YES _("はい")
#define TEXT_NO _("いいえ")
#define TEXT_FILE_MARIO_A_JUST_ERASED _("マリオＡをけしました")
/**
* Menus Text (Pause, Course Completed)
*/
// Main Courses
#define TEXT_COURSE _("コース")
#define TEXT_MYSCORE _("マイスコア")
#define TEXT_CONTINUE _("つづけて　マリオする？")
#define TEXT_EXIT_COURSE _("コースからでる？")
#define TEXT_CAMERA_ANGLE_R _("Ｒボタンのカメラきりかえ")
// Camera Options
#define TEXT_LAKITU_MARIO _("ジュゲム↔マリオ")
#define TEXT_LAKITU_STOP _("ジュゲム↔ストップ")
#define TEXT_NORMAL_UPCLOSE _("（おすすめ）（リアル）")
#define TEXT_NORMAL_FIXED _("（おすすめ）（とまる）")
// Course Completed Misc Text
#define TEXT_CATCH _("キャッチ！")
#define TEXT_CLEAR _("クリア！")
#define TEXT_HUD_HI_SCORE _("ＨＩＳＣＯＲＥ")
// Save Options
#define TEXT_SAVE_AND_CONTINUE _("セーブしてつづける？")
#define TEXT_SAVE_AND_QUIT _("セーブしておわる？")
#define TEXT_CONTINUE_WITHOUT_SAVING _("セーブしないでつづける？")
/**
* Ending Peach cutscene text.
*/
#define TEXT_FILE_MARIO_EXCLAMATION _("マリオ！！")
#define TEXT_POWER_STARS_RESTORED _("おしろにスターが　もどったのね")
#define TEXT_THANKS_TO_YOU _("みんな　あなたのおかげだわ！")
#define TEXT_THANK_YOU_MARIO _("ありがとう　マリオ")
#define TEXT_SOMETHING_SPECIAL _("なにか　おれいをしなくちゃ・・")
#define TEXT_LISTEN_EVERYBODY _("さあ　みんな")
#define TEXT_LETS_HAVE_CAKE _("おいしいケーキを　やきましょう")
#define TEXT_FOR_MARIO _("マリオの　ために・・・")
#define TEXT_FILE_MARIO_QUESTION _("マリオ？")
#endif
#if defined(VERSION_US) || defined(VERSION_EU)
/**
* File Select Text
*/
// Main Screens
#define TEXT_MARIO _("MARIO") // View Score Menu
#define TEXT_SELECT_FILE _("SELECT FILE")
#define TEXT_CHECK_FILE _("CHECK FILE")
#define TEXT_COPY_FILE _("COPY FILE")
#define TEXT_ERASE_FILE _("ERASE FILE")
#define TEXT_SOUND_SELECT _("SOUND SELECT")
#define TEXT_FILE_MARIO_A _("MARIO A")
#define TEXT_FILE_MARIO_B _("MARIO B")
#define TEXT_FILE_MARIO_C _("MARIO C")
#define TEXT_FILE_MARIO_D _("MARIO D")
// Menu Options
#define TEXT_SCORE _("SCORE")
#define TEXT_COPY _("COPY")
#define TEXT_ERASE _("ERASE")
// Sound Options
#define TEXT_STEREO _("STEREO")
#define TEXT_MONO _("MONO")
#define TEXT_HEADSET _("HEADSET")
// Misc Menu Text
#define TEXT_SAVED_DATA_EXISTS _("SAVED DATA EXITS") // Misspell
#define TEXT_NO_SAVED_DATA_EXISTS _("NO SAVED DATA EXISTS")
// Inside a Menu
#define TEXT_RETURN _("RETURN")
#define TEXT_CHECK_SCORE _("CHECK SCORE")
#define TEXT_COPY_FILE_BUTTON _("COPY FILE")
#define TEXT_ERASE_FILE_BUTTON _("ERASE FILE")
// Score Menu
#define TEXT_HI_SCORE _("HI SCORE")
#define TEXT_MY_SCORE _("MY SCORE")
// Score Mario Text ("☺" is the Mario face defined in the US/EU menu char table)
#define TEXT_SCORE_MARIO_A _("☺A")
#define TEXT_SCORE_MARIO_B _("☺B")
#define TEXT_SCORE_MARIO_C _("☺C")
#define TEXT_SCORE_MARIO_D _("☺D")
// Copy Menu
#define TEXT_COPY_IT_TO_WHERE _("COPY IT TO WHERE?")
#define TEXT_COPYING_COMPLETED _("COPYING COMPLETED")
#define TEXT_NO_FILE_TO_COPY_FROM _("NO EMPTY FILE")
// Erase Menu
#define TEXT_SURE _("SURE?")
#define TEXT_YES _("YES")
#define TEXT_NO _("NO")
#define TEXT_FILE_MARIO_A_JUST_ERASED _("MARIO A JUST ERASED")
/**
* Menus Text (Pause, Course Completed)
*/
// Main Courses
#define TEXT_COURSE _("COURSE")
#define TEXT_MYSCORE _("MYSCORE")
#define TEXT_CONTINUE _("CONTINUE")
#define TEXT_EXIT_COURSE _("EXIT COURSE")
#ifndef VERSION_EU // "R" text is different in EU
#define TEXT_CAMERA_ANGLE_R _("SET CAMERA ANGLE WITH R")
#endif
// Camera Options
#define TEXT_LAKITU_MARIO _("LAKITU + MARIO")
#define TEXT_LAKITU_STOP _("LAKITU + STOP")
#define TEXT_NORMAL_UPCLOSE __("(NORMAL)(UP-CLOSE)")
#define TEXT_NORMAL_FIXED __("(NORMAL)(FIXED)")
// Course Completed Misc Text
#define TEXT_CATCH _("CATCH")
#define TEXT_CLEAR _("CLEAR")
#define TEXT_HUD_HI_SCORE _("HI SCORE")
// Save Options
#define TEXT_SAVE_AND_CONTINUE _("SAVE & CONTINUE")
#define TEXT_SAVE_AND_QUIT _("SAVE & QUIT")
#define TEXT_CONTINUE_WITHOUT_SAVING _("CONTINUE, DON'T SAVE")
/**
* Ending Peach cutscene text.
*/
#define TEXT_FILE_MARIO_EXCLAMATION _("Mario!")
#define TEXT_POWER_STARS_RESTORED __("The power of the Stars is restored to the castle...")
#define TEXT_THANKS_TO_YOU __("...and it's all thanks to you!")
#define TEXT_THANK_YOU_MARIO __("Thank you, Mario!")
#define TEXT_SOMETHING_SPECIAL __("We have to do something special for you...")
#define TEXT_LISTEN_EVERYBODY _("Listen, everybody,")
#define TEXT_LETS_HAVE_CAKE _("let's bake a delicious cake...")
#define TEXT_FOR_MARIO _("...for Mario...")
#define TEXT_FILE_MARIO_QUESTION _("Mario!")
#endif
#ifdef VERSION_EU
/**
* File Select Text
*/
#define TEXT_RETURN_FR _("RETOUR")
#define TEXT_RETURN_DE _("ZURÜCK")
#define TEXT_CHECK_SCORE_FR _("SCORE")
#define TEXT_CHECK_SCORE_DE _("LEISTUNG")
#define TEXT_COPY_FILE_FR _("COPIER")
#define TEXT_COPY_FILE_DE _("KOPIEREN")
#define TEXT_ERASE_FILE_FR _("EFFACER")
#define TEXT_ERASE_FILE_DE _("LÖSCHEN")
#define TEXT_SELECT_FILE_FR _("CHOISIR FICHIER")
#define TEXT_SELECT_FILE_DE _("WwHLE SPIEL")
#define TEXT_SCORE_FR _("SCORE")
#define TEXT_SCORE_DE _("LEISTUNG")
#define TEXT_COPY_FR _("COPIER")
#define TEXT_COPY_DE _("KOPIEREN")
#define TEXT_ERASE_FR _("EFFACER")
#define TEXT_ERASE_DE _("LÖSCHEN")
#define TEXT_OPTION _("OPTION") // new in EU
#define TEXT_OPTION_FR _("OPTION")
#define TEXT_OPTION_DE _("OPTIONEN")
#define TEXT_CHECK_FILE_FR _("VOIR SCORE")
#define TEXT_CHECK_FILE_DE _("VON WELCHEM SPIEL")
#define TEXT_NO_SAVED_DATA_EXISTS_FR _("AUCUNE SAUVEGARDE DISPONIBLE")
#define TEXT_NO_SAVED_DATA_EXISTS_DE _("KEIN SPIEL VORHANDEN")
#define TEXT_COPY_FILE_BUTTON_FR _("COPIER FICHIER")
#define TEXT_COPY_FILE_BUTTON_DE _("SPIEL KOPIEREN")
#define TEXT_COPY_IT_TO_WHERE_FR _("COPIER SUR?")
#define TEXT_COPY_IT_TO_WHERE_DE _("WOHIN KOPIEREN?")
#define TEXT_COPYING_COMPLETED_FR _("COPIE ACHEVEÉ")
#define TEXT_COPYING_COMPLETED_DE _("SPIEL KOPIERT")
#define TEXT_SAVED_DATA_EXISTS_FR _("SAVEGARDE EXISTANTE")
#define TEXT_SAVED_DATA_EXISTS_DE _("BEREITS BELEGT")
#define TEXT_NO_FILE_TO_COPY_FROM_FR _("AUCUN FICHIER VIDE")
#define TEXT_NO_FILE_TO_COPY_FROM_DE _("KEIN PLATZ VORHANDEN")
#define TEXT_YES_FR _("OUI")
#define TEXT_YES_DE _("JA")
#define TEXT_NO_FR _("NON")
#define TEXT_NO_DE _("NEIN")
#define TEXT_ERASE_FILE_BUTTON_FR _("EFFACER FICHIER")
#define TEXT_ERASE_FILE_BUTTON_DE _("SPIEL LxSCHEN")
#define TEXT_SURE_FR _("OK?")
#define TEXT_SURE_DE _("SICHER?")
#define TEXT_FILE_MARIO_A_JUST_ERASED_FR _("MARIO A EFFACÉ")
#define TEXT_FILE_MARIO_A_JUST_ERASED_DE _("MARIO A GELÖSCHT")
#define TEXT_SOUND_SELECT_FR _("SON")
#define TEXT_SOUND_SELECT_DE _("SOUND")
#define TEXT_LANGUAGE_SELECT _("LANGUAGE SELECT") // new in EU
#define TEXT_LANGUAGE_SELECT_FR _("SELECTION LANGUE")
#define TEXT_LANGUAGE_SELECT_DE _("WwHLE SPRACHE")
#define TEXT_STEREO_FR _("STÉRÉO")
#define TEXT_MONO_FR _("MONO")
#define TEXT_HEADSET_FR _("CASQUE")
#define TEXT_STEREO_DE _("STEREO")
#define TEXT_MONO_DE _("MONO")
#define TEXT_HEADSET_DE _("PHONES")
#define TEXT_ENGLISH _("ENGLISH")
#define TEXT_FRENCH _("FRANÇAIS")
#define TEXT_GERMAN _("DEUTSCH")
#define TEXT_HI_SCORE_FR _("MEILLEUR SCORE")
#define TEXT_HI_SCORE_DE _("BESTLEISTUNG")
#define TEXT_MY_SCORE_FR _("MON SCORE")
#define TEXT_MY_SCORE_DE _("LEISTUNG")
#define TEXT_NEW_FR _("VIDE")
#define TEXT_NEW_DE _("FREI")
/**
* Menus Text (Pause, Course Completed)
*/
// Main Courses
// English, "R" text is different
#define TEXT_CAMERA_ANGLE_R _("SET CAMERA ANGLE WITH [R]")
// French
#define TEXT_COURSE_FR _("NIVEAU")
#define TEXT_MY_SCORE_FR _("MON SCORE")
#define TEXT_CONTINUE_FR _("CONTINUER")
#define TEXT_EXIT_COURSE_FR _("QUITTER NIVEAU")
#define TEXT_CAMERA_ANGLE_R_FR _("RÉGLAGE CAMÉRA AVEC [R]")
// German
#define TEXT_COURSE_DE _("KURS")
#define TEXT_MY_SCORE_DE _("LEISTUNG")
#define TEXT_CONTINUE_DE _("WEITER")
#define TEXT_EXIT_COURSE_DE _("KURS VERLASSEN")
#define TEXT_CAMERA_ANGLE_R_DE _("KAMERA MIT [R] VERSTELLEN")
// Camera Options
// French
#define TEXT_NORMAL_UPCLOSE_FR __("(NORMAL)(GROS-PLAN)")
#define TEXT_NORMAL_FIXED_FR __("(NORMAL)(FIXE)")
// German
#define TEXT_NORMAL_UPCLOSE_DE __("(NORMAL)(WEIT-ZOOM)")
#define TEXT_NORMAL_FIXED_DE __("(NORMAL)(STATIV)")
// Course Completed Misc Text
// French
#define TEXT_HUD_HI_SCORE_FR _("MEILLEUR SCORE")
#define TEXT_HUD_CONGRATULATIONS_FR _("FELICITATIONS")
// German
#define TEXT_HUD_HI_SCORE_DE _("BESTLEISTUNG")
#define TEXT_HUD_CONGRATULATIONS_DE _("GRATULATION")
// Save Options
// French
#define TEXT_SAVE_AND_CONTINUE_FR _("SAUVEGARDER & CONTINUER")
#define TEXT_SAVE_AND_QUIT_FR _("SAUVEGARDER & QUITTER")
#define TEXT_CONTINUE_WITHOUT_SAVING_FR _("CONTINUER SANS SAUVEGARDER")
// German
#define TEXT_SAVE_AND_CONTINUE_DE _("SPEICHERN & WEITER")
#define TEXT_SAVE_AND_QUIT_DE _("SPEICHERN & ENDE")
#define TEXT_CONTINUE_WITHOUT_SAVING_DE _("WEITER OHNE ZU SPEICHERN")
/**
* Ending Peach cutscene text.
*/
// French
#define TEXT_POWER_STARS_RESTORED_FR _("Grâce aux étoiles, le château a retrouvé ses pouvoirs...")
#define TEXT_THANKS_TO_YOU_FR _("...et ceci grâce à toi!")
#define TEXT_THANK_YOU_MARIO_FR _("Merci, Mario!")
#define TEXT_SOMETHING_SPECIAL_FR _("Tu mérites une récompense...")
#define TEXT_COME_ON_EVERYBODY_FR _("Venez les amis...")
#define TEXT_LETS_HAVE_CAKE_FR _("Allons préparer un délicieux gâteau...")
#define TEXT_FOR_MARIO_FR _("...pour Mario...")
// German
#define TEXT_POWER_STARS_RESTORED_DE _("Die Macht der Sterne ruht wieder sicher im Schloss...")
#define TEXT_THANKS_TO_YOU_DE _("...und alles dank Deiner Hilfe!")
#define TEXT_THANK_YOU_MARIO_DE _("Vielen Dank, Mario!")
#define TEXT_SOMETHING_SPECIAL_DE _("Wir haben eine Überraschung für Dich...")
#define TEXT_COME_ON_EVERYBODY_DE _("Hört alle her...")
#define TEXT_LETS_HAVE_CAKE_DE _("Laßt uns einen leckeren Kuchen backen...")
#define TEXT_FOR_MARIO_DE _("...für Mario...")
/**
* Course Table names for Score Menu Save view
*/
#define TEXT_MENU_BOB _(" 1 BOB-OMB BATTLEFIELD")
#define TEXT_MENU_WF _(" 2 WHOMP'S FORTRESS")
#define TEXT_MENU_JRB _(" 3 JOLLY ROGER BAY")
#define TEXT_MENU_CCM _(" 4 COOL, COOL MOUNTAIN")
#define TEXT_MENU_BBH _(" 5 BIG BOO'S HAUNT")
#define TEXT_MENU_HMC _(" 6 HAZY MAZE CAVE")
#define TEXT_MENU_LLL _(" 7 LETHAL LAVA LAND")
#define TEXT_MENU_SSL _(" 8 SHIFTING SAND LAND")
#define TEXT_MENU_DDD _(" 9 DIRE, DIRE DOCKS")
#define TEXT_MENU_SL _("10 SNOWMAN'S LAND")
#define TEXT_MENU_WDW _("11 WET-DRY WORLD")
#define TEXT_MENU_TTM _("12 TALL, TALL MOUNTAIN")
#define TEXT_MENU_THI _("13 TINY-HUGE ISLAND")
#define TEXT_MENU_TTC _("14 TICK TOCK CLOCK")
#define TEXT_MENU_RR _("15 RAINBOW RIDE")
#define TEXT_MENU_BITDW _(" BOWSER IN THE DARK WORLD")
#define TEXT_MENU_BITFS _(" BOWSER IN THE FIRE SEA")
#define TEXT_MENU_BITS _(" BOWSER IN THE SKY")
#define TEXT_MENU_PSS _(" THE PRINCESS'S SECRET SLIDE")
#define TEXT_MENU_COTMC _(" CAVERN OF THE METAL CAP")
#define TEXT_MENU_TOTWC _(" TOWER OF THE WING CAP")
#define TEXT_MENU_VCUTM _(" VANISH CAP UNDER THE MOAT")
#define TEXT_MENU_WMOTR _(" WING MARIO OVER THE RAINBOW")
#define TEXT_MENU_SA _(" THE SECRET AQUARIUM")
#define TEXT_MENU_NONE _("")
#define TEXT_MENU_STARS _(" CASTLE SECRET STARS")
#define TEXT_MENU_BOB_FR _(" 1 BATAILLE DE BOB-OMB")
#define TEXT_MENU_WF_FR _(" 2 FORTERESSE DE WHOMP")
#define TEXT_MENU_JRB_FR _(" 3 BAIE DES PIRATES")
#define TEXT_MENU_CCM_FR _(" 4 MONTAGNE GLA-GLA")
#define TEXT_MENU_BBH_FR _(" 5 MANOIR DE BIG BOO")
#define TEXT_MENU_HMC_FR _(" 6 CAVERNE BRUMEUSE")
#define TEXT_MENU_LLL_FR _(" 7 LAVES FATALES")
#define TEXT_MENU_SSL_FR _(" 8 SABLES TROP MOUVANTS")
#define TEXT_MENU_DDD_FR _(" 9 AFFREUX BASSIN")
#define TEXT_MENU_SL_FR _("10 CHEZ LE ROI DES NEIGES")
#define TEXT_MENU_WDW_FR _("11 MONDE TREMPE-SECHE")
#define TEXT_MENU_TTM_FR _("12 TROP HAUTE MONTAGNE")
#define TEXT_MENU_THI_FR _("13 ILE GRANDS-PETITS")
#define TEXT_MENU_TTC_FR _("14 HORLOGE TIC-TAC")
#define TEXT_MENU_RR_FR _("15 COURSE ARC-EN-CIEL")
#define TEXT_MENU_BITDW_FR _(" BOWSER DES TENEBRES")
#define TEXT_MENU_BITFS_FR _(" BOWSER DES LAVES")
#define TEXT_MENU_BITS_FR _(" BOWSER DES CIEUX")
#define TEXT_MENU_PSS_FR _(" GLISSADE DE LA PRINCESSE")
#define TEXT_MENU_COTMC_FR _(" MINE DES CASQUETTES-METAL")
#define TEXT_MENU_TOTWC_FR _(" INTERRUPTEUR DE LA TOUR AILEE")
#define TEXT_MENU_VCUTM_FR _(" INVISIBLE SOUS LES DOUVES")
#define TEXT_MENU_WMOTR_FR _(" AU-DELA DE L'ARC-EN-CIEL")
#define TEXT_MENU_SA_FR _(" AQUARIUM SECRET")
#define TEXT_MENU_NONE_FR _("")
#define TEXT_MENU_STARS_FR _(" ETOILES SECRETES")
#define TEXT_MENU_BOB_DE _(" 1 BOB-OMBS BOMBENBERG")
#define TEXT_MENU_WF_DE _(" 2 WUMMPS WUCHTWALL")
#define TEXT_MENU_JRB_DE _(" 3 PIRATENBUCHT PANIK")
#define TEXT_MENU_CCM_DE _(" 4 BIBBERBERG BOB")
#define TEXT_MENU_BBH_DE _(" 5 BIG BOOS BURG")
#define TEXT_MENU_HMC_DE _(" 6 GRÜNE GIFTGROTTE")
#define TEXT_MENU_LLL_DE _(" 7 LAVA LAGUNE")
#define TEXT_MENU_SSL_DE _(" 8 WOBIWABA WÜSTE")
#define TEXT_MENU_DDD_DE _(" 9 WILDE WASSERWERFT")
#define TEXT_MENU_SL_DE _("10 FROSTBEULEN FRUST")
#define TEXT_MENU_WDW_DE _("11 ATLANTIS AQUARIA")
#define TEXT_MENU_TTM_DE _("12 FLIEGENPILZ FIASKO")
#define TEXT_MENU_THI_DE _("13 GULLIVER GUMBA")
#define TEXT_MENU_TTC_DE _("14 TICK TACK TRAUMA")
#define TEXT_MENU_RR_DE _("15 REGENBOGEN RASEREI")
#define TEXT_MENU_BITDW_DE _(" BOWSERS SCHATTENWELT")
#define TEXT_MENU_BITFS_DE _(" BOWSERS LAVASEE")
#define TEXT_MENU_BITS_DE _(" BOWSERS LUFTSCHLOSS")
#define TEXT_MENU_PSS_DE _(" TOADSTOOLS RUTSCHBAHN")
#define TEXT_MENU_COTMC_DE _(" GRÜNER SCHALTERPALAST")
#define TEXT_MENU_TOTWC_DE _(" ROTER SCHALTERPALAST")
#define TEXT_MENU_VCUTM_DE _(" BLAUER SCHALTERPALAST")
#define TEXT_MENU_WMOTR_DE _(" REGENBOGEN FEUERWERK")
#define TEXT_MENU_SA_DE _(" VERSTECKTES AQUARIUM")
#define TEXT_MENU_NONE_DE _("")
#define TEXT_MENU_STARS_DE _(" GEHEIME STERNE")
#endif // VERSION_EU
#endif // TEXT_STRINGS_H
src/game/behaviors/bbh_tilting_trap.inc.c
+8 -15
View File
@@ -15,21 +15,16 @@ void bhv_bbh_tilting_trap_platform_loop(void) {
// if statement, while immediately setting it over here.
// This was done so that Mario leaving or getting on the platform
// resets oTimer to 0.
#ifndef VERSION_JP
if (gMarioObject->platform == o) {
o->oAction = BBH_TILTING_TRAP_PLATFORM_ACT_MARIO_ON;
} else {
o->oAction = BBH_TILTING_TRAP_PLATFORM_ACT_MARIO_OFF;
if(!ROM_JP){
if (gMarioObject->platform == o) {
o->oAction = BBH_TILTING_TRAP_PLATFORM_ACT_MARIO_ON;
} else {
o->oAction = BBH_TILTING_TRAP_PLATFORM_ACT_MARIO_OFF;
}
}
if (o->oAction == BBH_TILTING_TRAP_PLATFORM_ACT_MARIO_ON) {
#else
if (gMarioObject->platform == o) {
#endif
if (!ROM_JP ? o->oAction == BBH_TILTING_TRAP_PLATFORM_ACT_MARIO_ON : gMarioObject->platform == o) {
o->oAngleVelPitch = (s32)(o->oDistanceToMario * coss(o->oAngleToMario));
o->oFaceAnglePitch += o->oAngleVelPitch;
} else
#ifndef VERSION_JP
// In the post-JP versions, if the platform has tilted more than 3000 angle units
// in less than 16 frames since Mario got on it, and he has stepped off,
// this code will not run, so it will continue to rotate with the same
@@ -37,9 +32,7 @@ void bhv_bbh_tilting_trap_platform_loop(void) {
// the platform more dangerous. This code will not work correctly
// without the oAction changes above, since oTimer will not ever
// reset to 0 without them.
if ((absi(o->oFaceAnglePitch) < 3000) || (o->oTimer > 15))
#endif
{
} else if (ROM_JP || (absi(o->oFaceAnglePitch) < 3000) || (o->oTimer > 15)) {
// Make the platform return to the horizontal at a speed of
// 200 angle units/frame, and clamp it to 0 if it's within 200 units of 0.
o->oAngleVelPitch = 0;
src/game/behaviors/boo.inc.c
+12 -19
View File
@@ -267,13 +267,9 @@ static s32 boo_update_during_death(void) {
if (o->oBooParentBigBoo != NULL) {
struct Object *parentBigBoo = o->oBooParentBigBoo;
#ifndef VERSION_JP
if (!cur_obj_has_behavior(bhvBoo)) {
#endif
if (ROM_JP || !cur_obj_has_behavior(bhvBoo)) {
parentBigBoo->oBigBooNumMinionBoosKilled++;
#ifndef VERSION_JP
}
#endif
}
return TRUE;
@@ -499,12 +495,9 @@ static void big_boo_act_0(void) {
o->oBooParentBigBoo = NULL;
if (boo_should_be_active()
#ifndef VERSION_JP
&& o->oBigBooNumMinionBoosKilled >= gDebugInfo[DEBUG_PAGE_ENEMYINFO][0] + 5
#else
&& o->oBigBooNumMinionBoosKilled >= 5
#endif
if (boo_should_be_active() &&
(ROM_JP ? o->oBigBooNumMinionBoosKilled >= 5 :
o->oBigBooNumMinionBoosKilled >= gDebugInfo[DEBUG_PAGE_ENEMYINFO][0] + 5)
) {
o->oAction = 1;
@@ -625,9 +618,9 @@ static void big_boo_act_3(void) {
}
static void big_boo_act_4(void) {
#ifndef VERSION_JP
boo_stop();
#endif
if(!ROM_JP){
boo_stop();
}
if (o->oBehParams2ndByte == 0) {
obj_set_pos(o, 973, 0, 626);
@@ -765,11 +758,11 @@ void bhv_merry_go_round_boo_manager_loop(void) {
o->oAction = 2;
#ifndef VERSION_JP
play_puzzle_jingle();
#else
play_sound(SOUND_GENERAL2_RIGHT_ANSWER, gGlobalSoundSource);
#endif
if(ROM_JP){
play_sound(SOUND_GENERAL2_RIGHT_ANSWER, gGlobalSoundSource);
} else {
play_puzzle_jingle();
}
}
}
src/game/behaviors/bowser.inc.c
+1 -5
View File
@@ -331,19 +331,15 @@ void bowser_bitdw_actions(void) {
o->oBowserIsReacting = FALSE;
// Set starting Bowser level actions, randomly he can also start
// dancing after the introduction
#ifndef VERSION_JP
if (gCurrDemoInput == NULL) { // demo check because entry exits post JP
#endif
if (ROM_JP || gCurrDemoInput == NULL) { // demo check because entry exits post JP
if (rand < 0.1) {
o->oAction = BOWSER_ACT_DANCE; // 10% chance
} else {
o->oAction = BOWSER_ACT_WALK_TO_MARIO; // common
}
#ifndef VERSION_JP
} else {
o->oAction = BOWSER_ACT_WALK_TO_MARIO;
}
#endif
}
}
src/game/behaviors/coin.inc.c
+2 -10
View File
@@ -105,25 +105,17 @@ void bhv_coin_loop(void) {
}
if (o->oMoveFlags & OBJ_MOVE_LANDED) {
#ifndef VERSION_JP
if (o->oMoveFlags & (OBJ_MOVE_ABOVE_DEATH_BARRIER | OBJ_MOVE_ABOVE_LAVA))
#else
if (o->oMoveFlags & OBJ_MOVE_ABOVE_LAVA)
#endif
{
if (o->oMoveFlags & (ROM_JP ? OBJ_MOVE_ABOVE_LAVA : (OBJ_MOVE_ABOVE_DEATH_BARRIER | OBJ_MOVE_ABOVE_LAVA))) {
obj_mark_for_deletion(o);
}
}
if (o->oMoveFlags & OBJ_MOVE_BOUNCE) {
#ifndef VERSION_JP
if (o->oCoinUnk1B0 < 5) {
if (!ROM_JP && o->oCoinUnk1B0 < 5) {
cur_obj_play_sound_2(SOUND_GENERAL_COIN_DROP);
}
o->oCoinUnk1B0++;
#else
cur_obj_play_sound_2(SOUND_GENERAL_COIN_DROP);
#endif
}
if (cur_obj_wait_then_blink(400, 20)) {
src/game/behaviors/cruiser.inc.c
+1 -3
View File
@@ -13,10 +13,8 @@ void bhv_rr_cruiser_wing_loop(void) {
o->oFaceAngleYaw = o->oRRCruiserWingUnkF4 - sins(o->oTimer * 0x400) * 8192.0f;
o->oFaceAnglePitch = o->oRRCruiserWingUnkF8 + coss(o->oTimer * 0x400) * 2048.0f;
}
#ifndef VERSION_JP
if (o->oTimer == 64) {
if (!ROM_JP && o->oTimer == 64) {
cur_obj_play_sound_2(SOUND_GENERAL_BOAT_ROCK);
o->oTimer = 0;
}
#endif
}
src/game/behaviors/dorrie.inc.c
+21 -22
View File
@@ -61,30 +61,29 @@ void dorrie_act_lower_head(void) {
if (cur_obj_init_anim_check_frame(2, 35)) {
cur_obj_reverse_animation();
#ifdef VERSION_JP
if (o->oTimer > 150) {
dorrie_begin_head_raise(FALSE);
} else if (gMarioObject->platform == o) {
if (o->oDorrieForwardDistToMario > 830.0f
&& set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_START) {
dorrie_begin_head_raise(TRUE);
} else if (o->oDorrieForwardDistToMario > 320.0f) {
o->oTimer = 0;
if(ROM_JP){
if (o->oTimer > 150) {
dorrie_begin_head_raise(FALSE);
} else if (gMarioObject->platform == o) {
if (o->oDorrieForwardDistToMario > 830.0f
&& set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_START) {
dorrie_begin_head_raise(TRUE);
} else if (o->oDorrieForwardDistToMario > 320.0f) {
o->oTimer = 0;
}
}
} else {
if (gMarioObject->platform == o) {
if (o->oDorrieOffsetY == -17.0f && o->oDorrieForwardDistToMario > 780.0f
&& set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_START) {
dorrie_begin_head_raise(TRUE);
} else if (o->oDorrieForwardDistToMario > 320.0f) {
o->oTimer = 0;
}
} else if (o->oTimer > 150) {
dorrie_begin_head_raise(FALSE);
}
}
#else
if (gMarioObject->platform == o) {
if (o->oDorrieOffsetY == -17.0f && o->oDorrieForwardDistToMario > 780.0f
&& set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_START) {
dorrie_begin_head_raise(TRUE);
} else if (o->oDorrieForwardDistToMario > 320.0f) {
o->oTimer = 0;
}
} else if (o->oTimer > 150) {
dorrie_begin_head_raise(FALSE);
}
#endif
} else {
o->oDorrieNeckAngle += 0x115;
}
src/game/behaviors/hidden_star.inc.c
+5 -5
View File
@@ -42,12 +42,12 @@ void bhv_hidden_star_trigger_loop(void) {
spawn_orange_number(hiddenStar->oHiddenStarTriggerCounter, 0, 0, 0);
}
#ifdef VERSION_JP
play_sound(SOUND_MENU_STAR_SOUND, gGlobalSoundSource);
#else
play_sound(SOUND_MENU_COLLECT_SECRET
if(ROM_JP){
play_sound(SOUND_MENU_STAR_SOUND, gGlobalSoundSource);
} else {
play_sound(SOUND_MENU_COLLECT_SECRET
+ (((u8) hiddenStar->oHiddenStarTriggerCounter - 1) << 16), gGlobalSoundSource);
#endif
}
}
o->activeFlags = ACTIVE_FLAG_DEACTIVATED;
src/game/behaviors/intro_lakitu.inc.c
+1 -3
View File
@@ -186,11 +186,9 @@ void bhv_intro_lakitu_loop(void) {
obj_mark_for_deletion(o->oIntroLakituCloud);
}
#ifndef VERSION_JP
if (o->oTimer == 14) {
if (!ROM_JP && o->oTimer == 14) {
cur_obj_play_sound_2(SOUND_ACTION_INTRO_UNK45F);
}
#endif
break;
case 100:
src/game/behaviors/king_bobomb.inc.c
+12 -12
View File
@@ -20,10 +20,10 @@ void bhv_bobomb_anchor_mario_loop(void) {
}
void king_bobomb_act_0(void) {
#ifndef VERSION_JP
o->oForwardVel = 0.0f;
o->oVelY = 0.0f;
#endif
if(!ROM_JP){
o->oForwardVel = 0.0f;
o->oVelY = 0.0f;
}
if (o->oSubAction == 0) {
cur_obj_become_intangible();
@@ -200,7 +200,7 @@ void king_bobomb_act_6(void) {
void king_bobomb_act_7(void) {
cur_obj_init_animation_with_sound(2);
if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP,
if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP,
DIALOG_FLAG_TEXT_DEFAULT, CUTSCENE_DIALOG, DIALOG_116)) {
create_sound_spawner(SOUND_OBJ_KING_WHOMP_DEATH);
@@ -211,12 +211,12 @@ void king_bobomb_act_7(void) {
spawn_triangle_break_particles(20, MODEL_DIRT_ANIMATION, 3.0f, 4);
cur_obj_shake_screen(SHAKE_POS_SMALL);
#ifndef VERSION_JP
cur_obj_spawn_star_at_y_offset(2000.0f, 4500.0f, -4500.0f, 200.0f);
#else
o->oPosY += 100.0f;
spawn_default_star(2000.0f, 4500.0f, -4500.0f);
#endif
if(ROM_JP){
o->oPosY += 100.0f;
spawn_default_star(2000.0f, 4500.0f, -4500.0f);
} else {
cur_obj_spawn_star_at_y_offset(2000.0f, 4500.0f, -4500.0f, 200.0f);
}
o->oAction = 8;
}
@@ -319,7 +319,7 @@ void king_bobomb_act_5(void) { // bobomb returns home
break;
case 4:
if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP,
if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP,
DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, DIALOG_128)) {
o->oAction = 2;
}
src/game/behaviors/mips.inc.c
+8 -16
View File
@@ -15,17 +15,17 @@ void bhv_mips_init(void) {
if (save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1) >= 15
&& !(starFlags & SAVE_FLAG_TO_STAR_FLAG(SAVE_FLAG_COLLECTED_MIPS_STAR_1))) {
o->oBehParams2ndByte = 0;
#ifndef VERSION_JP
o->oMipsForwardVelocity = 40.0f;
#endif
if(!ROM_JP){
o->oMipsForwardVelocity = 40.0f;
}
}
// If the player has >= 50 stars and hasn't collected second MIPS star...
else if (save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1) >= 50
&& !(starFlags & SAVE_FLAG_TO_STAR_FLAG(SAVE_FLAG_COLLECTED_MIPS_STAR_2))) {
o->oBehParams2ndByte = 1;
#ifndef VERSION_JP
o->oMipsForwardVelocity = 45.0f;
#endif
if(!ROM_JP){
o->oMipsForwardVelocity = 45.0f;
}
} else {
// No MIPS stars are available, hide MIPS.
o->activeFlags = ACTIVE_FLAG_DEACTIVATED;
@@ -33,11 +33,7 @@ void bhv_mips_init(void) {
o->oInteractionSubtype = INT_SUBTYPE_HOLDABLE_NPC;
#ifndef VERSION_JP
o->oGravity = 15.0f;
#else
o->oGravity = 2.5f;
#endif
o->oGravity = !ROM_JP ? 15.0f : 2.5f;
o->oFriction = 0.89f;
o->oBuoyancy = 1.2f;
@@ -119,11 +115,7 @@ void bhv_mips_act_follow_path(void) {
followStatus = cur_obj_follow_path(followStatus);
// Update velocity and angle and do movement.
#ifndef VERSION_JP
o->oForwardVel = o->oMipsForwardVelocity;
#else
o->oForwardVel = 45.0f;
#endif
o->oForwardVel = !ROM_JP ? o->oMipsForwardVelocity : 45.0f;
o->oMoveAngleYaw = o->oPathedTargetYaw;
collisionFlags = object_step();
src/game/behaviors/moneybag.inc.c
+6 -6
View File
@@ -147,9 +147,9 @@ void moneybag_act_return_home(void) {
if (is_point_close_to_object(o, o->oHomeX, o->oHomeY, o->oHomeZ, 100)) {
spawn_object(o, MODEL_YELLOW_COIN, bhvMoneybagHidden);
#ifndef VERSION_JP
cur_obj_play_sound_2(SOUND_GENERAL_VANISH_SFX);
#endif
if(!ROM_JP){
cur_obj_play_sound_2(SOUND_GENERAL_VANISH_SFX);
}
cur_obj_init_animation(0);
o->oAction = MONEYBAG_ACT_DISAPPEAR;
o->oMoneybagJumpState = MONEYBAG_JUMP_LANDING;
@@ -218,9 +218,9 @@ void bhv_moneybag_hidden_loop(void) {
case FAKE_MONEYBAG_COIN_ACT_IDLE:
if (is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 400)) {
spawn_object(o, MODEL_MONEYBAG, bhvMoneybag);
#ifndef VERSION_JP
cur_obj_play_sound_2(SOUND_GENERAL_VANISH_SFX);
#endif
if(!ROM_JP){
cur_obj_play_sound_2(SOUND_GENERAL_VANISH_SFX);
}
o->oAction = FAKE_MONEYBAG_COIN_ACT_TRANSFORM;
}
break;
src/game/behaviors/mr_i.inc.c
-4
View File
@@ -267,13 +267,9 @@ void mr_i_act_1(void) {
}
void mr_i_act_0(void) {
#ifndef VERSION_JP
obj_set_angle(o, 0, 0, 0);
#else
o->oMoveAnglePitch = 0;
o->oMoveAngleYaw = 0;
o->oMoveAngleRoll = 0;
#endif
cur_obj_scale(o->oBehParams2ndByte + 1);
if (o->oTimer == 0) {
src/game/behaviors/racing_penguin.inc.c
+9 -10
View File
@@ -132,26 +132,25 @@ static void racing_penguin_act_show_final_text(void) {
}
} else {
cur_obj_init_animation_with_sound(0);
#ifndef VERSION_JP
play_penguin_walking_sound(1);
#endif
if(!ROM_JP){
play_penguin_walking_sound(1);
}
o->oForwardVel = 4.0f;
}
} else if (o->oRacingPenguinFinalTextbox > 0) {
s32 textResult;
if ((textResult = cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP,
if ((textResult = cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP,
DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, o->oRacingPenguinFinalTextbox))) {
o->oRacingPenguinFinalTextbox = -1;
o->oTimer = 0;
}
} else if (o->oRacingPenguinMarioWon) {
#ifdef VERSION_JP
spawn_default_star(-7339.0f, -5700.0f, -6774.0f);
#else
cur_obj_spawn_star_at_y_offset(-7339.0f, -5700.0f, -6774.0f, 200.0f);
#endif
if(ROM_JP){
spawn_default_star(-7339.0f, -5700.0f, -6774.0f);
} else {
cur_obj_spawn_star_at_y_offset(-7339.0f, -5700.0f, -6774.0f, 200.0f);
}
o->oRacingPenguinMarioWon = FALSE;
}
}
src/game/behaviors/sparkle_spawn_star.inc.c
+1 -5
View File
@@ -87,11 +87,7 @@ void bhv_spawned_star_loop(void) {
o->oVelY = 20.0f;
o->oGravity = -1.0f;
if (o->oInteractionSubtype & INT_SUBTYPE_NO_EXIT) {
#ifdef VERSION_JP
play_power_star_jingle(FALSE);
#else
play_power_star_jingle(TRUE);
#endif
play_power_star_jingle(!ROM_JP);
} else {
play_power_star_jingle(TRUE);
}
src/game/behaviors/tuxie.inc.c
+12 -12
View File
@@ -59,7 +59,7 @@ void tuxies_mother_act_1(void) {
} else {
dialogID = DIALOG_059;
}
if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP,
if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP,
DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, dialogID)) {
if (dialogID == DIALOG_058) {
o->oSubAction = 1;
@@ -85,11 +85,11 @@ void tuxies_mother_act_1(void) {
// or 1, which is not affected by the bitwise AND.
o->prevObj->OBJECT_FIELD_S32(o->oInteractionSubtype) &= ~INT_SUBTYPE_DROP_IMMEDIATELY;
obj_set_behavior(o->prevObj, bhvUnused20E0);
#ifndef VERSION_JP
cur_obj_spawn_star_at_y_offset(3167.0f, -4300.0f, 5108.0f, 200.0f);
#else
spawn_default_star(3500.0f, -4300.0f, 4650.0f);
#endif
if(ROM_JP){
spawn_default_star(3500.0f, -4300.0f, 4650.0f);
} else {
cur_obj_spawn_star_at_y_offset(3167.0f, -4300.0f, 5108.0f, 200.0f);
}
o->oAction = 2;
}
break;
@@ -129,7 +129,7 @@ void tuxies_mother_act_0(void) {
}
break;
case 1:
if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP,
if (cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_UP,
DIALOG_FLAG_TURN_TO_MARIO, CUTSCENE_DIALOG, DIALOG_057)) {
o->oSubAction++;
}
@@ -308,11 +308,11 @@ void bhv_small_penguin_loop(void) {
}
obj_copy_pos(o, gMarioObject);
if (gGlobalTimer % 30 == 0) {
#ifndef VERSION_JP
play_sound(SOUND_OBJ2_BABY_PENGUIN_YELL, gMarioObject->header.gfx.cameraToObject);
#else
play_sound(SOUND_OBJ2_BABY_PENGUIN_YELL, o->header.gfx.cameraToObject);
#endif
if(ROM_JP){
play_sound(SOUND_OBJ2_BABY_PENGUIN_YELL, o->header.gfx.cameraToObject);
} else {
play_sound(SOUND_OBJ2_BABY_PENGUIN_YELL, gMarioObject->header.gfx.cameraToObject);
}
}
break;
case HELD_THROWN:
src/game/camera.c
+21 -24
View File
@@ -3334,18 +3334,18 @@ void init_camera(struct Camera *c) {
// Note: This replaced an "old" way to call these cutscenes using
// a camEvent value: CAM_EVENT_BOWSER_INIT
case LEVEL_BOWSER_1:
#ifndef VERSION_JP
// Since Bowser 1 has a demo entry, check for it
// If it is, then set CamAct to the end to directly activate Bowser
// If it isn't, then start cutscene
if (gCurrDemoInput == NULL) {
if(!ROM_JP){
// Since Bowser 1 has a demo entry, check for it
// If it is, then set CamAct to the end to directly activate Bowser
// If it isn't, then start cutscene
if (gCurrDemoInput == NULL) {
start_cutscene(c, CUTSCENE_ENTER_BOWSER_ARENA);
} else if (gSecondCameraFocus != NULL) {
gSecondCameraFocus->oBowserCamAct = BOWSER_CAM_ACT_END;
}
} else {
start_cutscene(c, CUTSCENE_ENTER_BOWSER_ARENA);
} else if (gSecondCameraFocus != NULL) {
gSecondCameraFocus->oBowserCamAct = BOWSER_CAM_ACT_END;
}
#else
start_cutscene(c, CUTSCENE_ENTER_BOWSER_ARENA);
#endif
break;
case LEVEL_BOWSER_2:
start_cutscene(c, CUTSCENE_ENTER_BOWSER_ARENA);
@@ -5710,10 +5710,10 @@ BAD_RETURN(s32) cam_hmc_enter_maze(struct Camera *c) {
vec3f_get_dist_and_angle(c->focus, gLakituState.goalPos, &dist, &pitch, &yaw);
vec3f_set_dist_and_angle(c->focus, gLakituState.goalPos, 300.f, pitch, yaw);
gLakituState.goalPos[1] = -800.f;
#ifndef VERSION_JP
c->pos[1] = gLakituState.goalPos[1];
gLakituState.curPos[1] = gLakituState.goalPos[1];
#endif
if(!ROM_JP){
c->pos[1] = gLakituState.goalPos[1];
gLakituState.curPos[1] = gLakituState.goalPos[1];
}
sStatusFlags &= ~CAM_FLAG_SMOOTH_MOVEMENT;
}
}
@@ -7031,11 +7031,12 @@ BAD_RETURN(s32) cutscene_intro_peach_start_letter_music(UNUSED struct Camera *c)
/**
* Raise the volume (not in JP) and start the flying music.
*/
BAD_RETURN(s32) cutscene_intro_peach_start_flying_music(UNUSED struct Camera *c) {
#ifndef VERSION_JP
seq_player_unlower_volume(SEQ_PLAYER_LEVEL, 60);
#endif
cutscene_intro_peach_play_lakitu_flying_music();
BAD_RETURN(s32) cutscene_intro_peach_start_flying_music(UNUSED struct Camera *c) {\
if(!ROM_JP){
seq_player_unlower_volume(SEQ_PLAYER_LEVEL, 60);
} else {
cutscene_intro_peach_play_lakitu_flying_music();
}
}
#ifdef VERSION_EU
@@ -8909,16 +8910,12 @@ BAD_RETURN(s32) cutscene_dialog_start(struct Camera *c) {
cutscene_soften_music(c);
set_time_stop_flags(TIME_STOP_ENABLED | TIME_STOP_DIALOG);
#ifndef VERSION_JP
if (c->mode == CAMERA_MODE_BOSS_FIGHT) {
if (!ROM_JP && c->mode == CAMERA_MODE_BOSS_FIGHT) {
vec3f_copy(sCameraStoreCutscene.focus, c->focus);
vec3f_copy(sCameraStoreCutscene.pos, c->pos);
} else {
#endif
store_info_star(c);
#ifndef VERSION_JP
}
#endif
// Store Mario's position and faceAngle
sCutsceneVars[8].angle[0] = 0;
src/game/hud.c
+1 -9
View File
@@ -275,11 +275,7 @@ void render_hud_power_meter(void) {
sPowerMeterVisibleTimer++;
}
#ifdef VERSION_JP
#define HUD_TOP_Y 210
#else
#define HUD_TOP_Y 209
#endif
/**
* Renders the amount of lives Mario has.
@@ -299,11 +295,7 @@ void render_hud_coins(void) {
print_text_fmt_int(198, HUD_TOP_Y, "%d", gHudDisplay.coins);
}
#ifdef VERSION_JP
#define HUD_STARS_X 73
#else
#define HUD_STARS_X 78
#endif
#define HUD_STARS_X ROM_JP ? 73 : 78
/**
* Renders the amount of stars collected.
src/game/interaction.c
+3 -12
View File
@@ -819,9 +819,9 @@ u32 interact_star_or_key(struct MarioState *m, UNUSED u32 interactType, struct O
}
play_sound(SOUND_MENU_STAR_SOUND, m->marioObj->header.gfx.cameraToObject);
#ifndef VERSION_JP
update_mario_sound_and_camera(m);
#endif
if(!ROM_JP){
update_mario_sound_and_camera(m);
}
if (grandStar) {
return set_mario_action(m, ACT_JUMBO_STAR_CUTSCENE, 0);
@@ -1687,17 +1687,8 @@ u32 mario_can_talk(struct MarioState *m, u32 arg) {
return FALSE;
}
#ifdef VERSION_JP
#define READ_MASK (INPUT_B_PRESSED)
#else
#define READ_MASK (INPUT_B_PRESSED | INPUT_A_PRESSED)
#endif
#ifdef VERSION_JP
#define SIGN_RANGE 0x38E3
#else
#define SIGN_RANGE 0x4000
#endif
u32 check_read_sign(struct MarioState *m, struct Object *o) {
if ((m->input & READ_MASK) && mario_can_talk(m, 0) && object_facing_mario(m, o, SIGN_RANGE)) {

Some files were not shown because too many files have changed in this diff Show More