diff options
| author | Lucas Shaw <lgs84@cornell.edu> | 2020-03-22 22:57:24 -0700 |
|---|---|---|
| committer | Lucas Shaw <lgs84@cornell.edu> | 2020-03-22 22:57:24 -0700 |
| commit | 6a45dcba7f382a357a016dc295beba58398079e4 (patch) | |
| tree | f6cd3be8ec3b662c5acaaeaecf0f4d8c4056d024 /src/code/code_8006C360.c | |
| parent | 62e7a8c0376666f7ab8ca49e44eb831d6232d61e (diff) | |
| parent | d879f2acb02924b75552487db291fa3e0397d86c (diff) | |
Fixed merge conflict
Diffstat (limited to 'src/code/code_8006C360.c')
| -rw-r--r-- | src/code/code_8006C360.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/code/code_8006C360.c b/src/code/code_8006C360.c index fa48f62ed..01cf89b4d 100644 --- a/src/code/code_8006C360.c +++ b/src/code/code_8006C360.c @@ -1,8 +1,7 @@ #include <ultra64.h> #include <global.h> -u16 D_8011F3F0[60][9] = -{ +u16 D_8011F3F0[60][9] = { { 0x0000, 0x7124, 0x7127, 0x7126, 0x7125, 0x7127, 0x7124, 0x7125, 0x7127 }, { 0x0000, 0x7128, 0x7129, 0x7128, 0x7128, 0x7128, 0x7128, 0x712A, 0x712B }, { 0x0000, 0x7128, 0x712B, 0x7128, 0x7128, 0x7129, 0x7128, 0x712B, 0x7128 }, @@ -65,8 +64,7 @@ u16 D_8011F3F0[60][9] = { 0x0000, 0x7104, 0x7105, 0x7107, 0x7105, 0x710C, 0x7105, 0x7107, 0x7107 }, }; -u16 func_8006C360(GlobalContext* globalCtx, u32 idx) -{ +u16 func_8006C360(GlobalContext* globalCtx, u32 idx) { u8 mask = func_8008F080(globalCtx); return D_8011F3F0[idx][mask]; } |