mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-12 01:40:47 +00:00
Code Issues Projects Releases Wiki Activity

Global Context And General Cleanup (#863)

Browse source 
* door context

* renames

* done

* fix unintended change

* all nb gone

* more nb gone

* merge fishing

* fix size commentX

* door changes suggested by dragorn

* fix accidental semicolon

* another

* change all texture pointers to void*

* error fix and format

* Update src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* fix ostime

* correct mistake in SkyboxContext

* probably fix nonmatching

* Update include/z64.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* roman's suggestions, fix incorrect type definition in z64scene.h

* typo in struct

* make typedef use u8 array

* forgot one

* pull in master and format.sh

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Zelllll 2021-08-15 18:15:58 -05:00 • committed by GitHub
parent 1890e751b9
commit 7551dc2b71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 496 additions and 508 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/overlays/gamestates/ovl_select/z_select.c
View file

@ -410,15 +410,16 @@ void Select_PrintMenu(SelectContext* this, GfxPrint* printer) {
}
static char* sLoadingMessages[] = {
"\x8Dｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", // "Please wait a minute"
"\x8Dﾁｮｯﾄ ﾏｯﾃﾈ", // "Hold on a sec"
"\x8Cｳｪｲﾄ ｱ ﾓｰﾒﾝﾄ", // "Wait a moment"
"\x8Cﾛｰﾄﾞ\x8Dﾁｭｳ", // "Loading"
"\x8Dﾅｳ ﾜｰｷﾝｸﾞ", // "Now working"
"\x8Dｲﾏ ﾂｸｯﾃﾏｽ", // "Now creating"
"\x8Dｺｼｮｳｼﾞｬﾅｲﾖ", // "It's not broken"
"\x8Cｺｰﾋｰ ﾌﾞﾚｲｸ", // "Coffee Break"
"\x8C" "Bﾒﾝｦｾｯﾄｼﾃｸﾀﾞｻｲ", // "Please set B side"
"\x8Dｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", // "Please wait a minute"
"\x8Dﾁｮｯﾄ ﾏｯﾃﾈ", // "Hold on a sec"
"\x8Cｳｪｲﾄ ｱ ﾓｰﾒﾝﾄ", // "Wait a moment"
"\x8Cﾛｰﾄﾞ\x8Dﾁｭｳ", // "Loading"
"\x8Dﾅｳ ﾜｰｷﾝｸﾞ", // "Now working"
"\x8Dｲﾏ ﾂｸｯﾃﾏｽ", // "Now creating"
"\x8Dｺｼｮｳｼﾞｬﾅｲﾖ", // "It's not broken"
"\x8Cｺｰﾋｰ ﾌﾞﾚｲｸ", // "Coffee Break"
"\x8C"
"Bﾒﾝｦｾｯﾄｼﾃｸﾀﾞｻｲ", // "Please set B side"
"\x8Dｼﾞｯﾄ\x8Cｶﾞﾏﾝ\x8Dﾉ\x8Cｺ\x8Dﾃﾞｱｯﾀ", // "Be patient, now"
"\x8Dｲﾏｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ", // "Please wait just a minute"
"\x8Dｱﾜﾃﾅｲｱﾜﾃﾅｲ｡ﾋﾄﾔｽﾐﾋﾄﾔｽﾐ｡", // "Don't worry, don't worry. Take a break, take a break"