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

Various minor fixes (#1383)

Browse source 
* Swap REGION_US and REGION_JP

* Fix a few missing EXCH_ITEM enum values

* Remove unnecessary casts on alloc functions

* Fix a double slash in the spec file

* Swap top and bottom args in StackCheck_Init

* Remove some unnecessary & in array references

* Run formatter

* Fix the comments for US and JP codes
This commit is contained in:
Roman971 2022-10-02 23:40:09 +02:00 • committed by GitHub
parent a2c8eabbc5
commit 78e528d6fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 48 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/boot/stackcheck.c
View file

@ -4,7 +4,7 @@
StackEntry* sStackInfoListStart = NULL;
StackEntry* sStackInfoListEnd = NULL;
void StackCheck_Init(StackEntry* entry, void* stackTop, void* stackBottom, u32 initValue, s32 minSpace,
void StackCheck_Init(StackEntry* entry, void* stackBottom, void* stackTop, u32 initValue, s32 minSpace,
const char* name) {
StackEntry* iter;
u32* addr;
@ -12,8 +12,8 @@ void StackCheck_Init(StackEntry* entry, void* stackTop, void* stackBottom, u32 i
if (entry == NULL) {
sStackInfoListStart = NULL;
} else {
entry->head = stackTop;
entry->tail = stackBottom;
entry->head = stackBottom;
entry->tail = stackTop;
entry->initValue = initValue;
entry->minSpace = minSpace;
entry->name = name;

8
src/boot/z_locale.c
View file

@ -9,12 +9,12 @@ void Locale_Init(void) {
osEPiReadIo(gCartHandle, 0x3C, &sCartInfo.regionInfo);
switch (sCartInfo.countryCode) {
case 'J': // "NTSC-U (North America)"
gCurrentRegion = REGION_US;
break;
case 'E': // "NTSC-J (Japan)"
case 'J': // "NTSC-J (Japan)"
gCurrentRegion = REGION_JP;
break;
case 'E': // "NTSC-U (North America)"
gCurrentRegion = REGION_US;
break;
case 'P': // "PAL (Europe)"
gCurrentRegion = REGION_EU;
break;