nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Rename all instances of "Training Grounds" to "Training Ground" to match the many that are already there as well as the in-game name. (#4730)

Browse Source
This commit is contained in:
Malkierian
2024-12-19 02:44:16 -07:00
committed by GitHub
parent 0afffe24fe
commit a7d082246f
37 changed files with 489 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
soh/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c
View File

@@ -1,7 +1,7 @@
/*
* File: z_bg_menkuri_kaiten.c
* Overlay: Bg_Menkuri_Kaiten
* Description: Large rotating stone ring used in Gerudo Training Grounds and Forest Temple.
* Description: Large rotating stone ring used in Gerudo Training Ground and Forest Temple.
*/
#include "z_bg_menkuri_kaiten.h"

2
soh/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c
View File

@@ -1,7 +1,7 @@
/*
* File: z_bg_menkuri_nisekabe.c
* Overlay: ovl_Bg_Menkuri_Nisekabe
* Description: False Stone Walls (Gerudo Training Grounds)
* Description: False Stone Walls (Gerudo Training Ground)
*/
#include "z_bg_menkuri_nisekabe.h"

2
soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
View File

@@ -183,7 +183,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
}
break;
case GE1_TYPE_TRAINING_GROUNDS_GUARD:
case GE1_TYPE_TRAINING_GROUND_GUARD:
this->hairstyle = GE1_HAIR_STRAIGHT;
if (GameInteractor_Should(VB_GERUDOS_BE_FRIENDLY, EnGe1_CheckCarpentersFreed())) {

2
soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
View File

@@ -16,7 +16,7 @@ typedef enum {
/* 0x04 */ GE1_TYPE_NORMAL = 4,
/* 0x05 */ GE1_TYPE_VALLEY_FLOOR,
/* 0x45 */ GE1_TYPE_HORSEBACK_ARCHERY = 0x45,
/* 0x46 */ GE1_TYPE_TRAINING_GROUNDS_GUARD
/* 0x46 */ GE1_TYPE_TRAINING_GROUND_GUARD
} EnGe1Type;
typedef enum {

2
soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
View File

@@ -246,7 +246,7 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) {
osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆ 強制 ☆☆ \n" VT_RST);
break;
case 4:
// "Gerudo Training Grounds Forced Check Only"
// "Gerudo Training Ground Forced Check Only"
osSyncPrintf(VT_FGCOL(RED) " ☆☆ ゲルドの修練場強制チェックのみ ☆☆ \n" VT_RST);
break;
}

2
soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
View File

@@ -51,7 +51,7 @@ static Color_RGB8 sColors[][4] = {
{ { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 } }, // spirit temple
{ { 135, 125, 95 }, { 135, 125, 95 }, { 135, 125, 95 }, { 135, 125, 95 } }, // shadow temple
{ { 255, 255, 255 }, { 255, 255, 255 }, { 255, 255, 255 }, { 255, 255, 255 } }, // ganons castle
{ { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 } }, // gerudo training grounds
{ { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 } }, // Gerudo Training Ground
};
static s16 sScenes[] = {

4
soh/src/overlays/gamestates/ovl_select/z_select.c
View File

@@ -479,7 +479,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
}},
{ "28:Gerudo Fortress", "28:Gerudo-Festung", "28:Forteresse Gerudo", Select_LoadGame, 18, {
{ "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_GERUDOS_FORTRESS_EAST_EXIT, 0 },
{ "From Gerudo Training Grounds", "Von der Gerudo-Trainingsarena", "Depuis le Gymnase Gerudo", ENTR_GERUDOS_FORTRESS_OUTSIDE_GERUDO_TRAINING_GROUND, 0 },
{ "From Gerudo Training Ground", "Von der Gerudo-Trainingsarena", "Depuis le Gymnase Gerudo", ENTR_GERUDOS_FORTRESS_OUTSIDE_GERUDO_TRAINING_GROUND, 0 },
{ "From Haunted Wasteland", "Von der Gespensterwueste", "Depuis le Desert Hante", ENTR_GERUDOS_FORTRESS_GATE_EXIT, 0 },
{ "Horseback Riding Minigame", "Bogen zu Pferde Minispiel", "Archerie Montee", ENTR_GERUDOS_FORTRESS_16, 0 },
{ "Gerudo Fortress Jail", "Gerudo-Festung Gefaengnis", "Prison de la Forteresse Gerudo", ENTR_GERUDOS_FORTRESS_17, 0 },
@@ -584,7 +584,7 @@ static BetterSceneSelectEntry sBetterScenes[] = {
{ "42:Ice Cavern", "42:Eishoehle", "42:Caverne Polaire", Select_LoadGame, 1, {
{ "Entrance", "Eingang", "Entree", ENTR_ICE_CAVERN_ENTRANCE, 1 },
}},
{ "43:Gerudo Training Grounds", "43:Gerudo-Trainingsarena", "43:Gymnase Gerudo", Select_LoadGame, 1, {
{ "43:Gerudo Training Ground", "43:Gerudo-Trainingsarena", "43:Gymnase Gerudo", Select_LoadGame, 1, {
{ "Entrance", "Eingang", "Entree", ENTR_GERUDO_TRAINING_GROUND_ENTRANCE, 1 },
}},
{ "44:Warps", "44:Teleportpunkte", "44:Teleporteurs", Select_LoadGame, 6, {