mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-19 07:47:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix misc 19 (#1488)

Browse Source 
* "bgs sword" -> "biggoron sword"

* Animation_ChangeImpl: last arg is `ANIMTAPER_` enum

* TransitionTileStatus -> state

* Tiny gbi.h formatting fixups

* some cleanup on floormaster

* misc float ops cleanup

* sunsSongState = SUNSSONG_INACTIVE

* continueFlag == CS_CMD_STOP

* fix few camera names inconsistency

* textual 0 padding? not on my lawn

* libultra: construct address from end of dmem rather than oob from imem

* more free1 -> 2 fixup
This commit is contained in:
Dragorn421
2023-01-10 19:03:31 +01:00
committed by GitHub
parent b4c97ce17e
commit 542012efa6
22 changed files with 146 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ultra64/gbi.h
+15 -15
View File
@@ -3336,8 +3336,8 @@ _DW({ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = (_SHIFTL(cmd, 24, 8) | \
_SHIFTL(32 - (sft)- ( len), 8, 8)| \
_SHIFTL((len) - 1, 0, 8)); \
_SHIFTL(32 - (sft) - (len), 8, 8) | \
_SHIFTL((len) - 1, 0, 8)); \
_g->words.w1 = (unsigned int)(data); \
})
@@ -4082,7 +4082,7 @@ _DW({
0, cmt, maskt,shiftt, cms, masks, shifts), \
gsDPLoadSync(), \
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, \
(((width) * (height) + siz##_INCR) >> siz##_SHIFT) - 1, 0 ), \
(((width) * (height) + siz##_INCR) >> siz##_SHIFT) - 1, 0), \
gsDPPipeSync(), \
gsDPSetTile(fmt, siz, \
((((width) * siz##_LINE_BYTES) + 7) >> 3), 0, \
@@ -4445,7 +4445,7 @@ _DW({ \
gDPSetTextureImage(pkt, fmt, siz, width, timg); \
gDPSetTile(pkt, fmt, siz, \
(((((lrs) - (uls) + 1) * siz##_TILE_BYTES) + 7) >> 3), tmem, \
G_TX_LOADTILE, 0 , cmt, maskt, shiftt, cms, masks, shifts); \
G_TX_LOADTILE, 0, cmt, maskt, shiftt, cms, masks, shifts); \
gDPLoadSync(pkt); \
gDPLoadTile(pkt, G_TX_LOADTILE, \
(uls) << G_TEXTURE_IMAGE_FRAC, \
@@ -4470,9 +4470,9 @@ _DW({ \
gsDPSetTextureImage(fmt, siz, width, timg), \
gsDPSetTile(fmt, siz, \
(((((lrs) - (uls) + 1) * siz##_TILE_BYTES) + 7) >> 3), 0, \
G_TX_LOADTILE, 0 , cmt, maskt, shiftt, cms, masks, shifts), \
G_TX_LOADTILE, 0, cmt, maskt, shiftt, cms, masks, shifts), \
gsDPLoadSync(), \
gsDPLoadTile( G_TX_LOADTILE, \
gsDPLoadTile(G_TX_LOADTILE, \
(uls) << G_TEXTURE_IMAGE_FRAC, \
(ult) << G_TEXTURE_IMAGE_FRAC, \
(lrs) << G_TEXTURE_IMAGE_FRAC, \
@@ -4497,7 +4497,7 @@ _DW({ \
gsDPSetTextureImage(fmt, siz, width, timg), \
gsDPSetTile(fmt, siz, \
(((((lrs) - (uls) + 1) * siz##_TILE_BYTES) + 7) >> 3), tmem, \
G_TX_LOADTILE, 0 , cmt, maskt, shiftt, cms, masks, shifts), \
G_TX_LOADTILE, 0, cmt, maskt, shiftt, cms, masks, shifts), \
gsDPLoadSync(), \
gsDPLoadTile(G_TX_LOADTILE, \
(uls) << G_TEXTURE_IMAGE_FRAC, \
@@ -4521,7 +4521,7 @@ _DW({ \
gDPSetTextureImage(pkt, fmt, G_IM_SIZ_8b, ((width) >> 1), timg); \
gDPSetTile(pkt, fmt, G_IM_SIZ_8b, \
(((((lrs) - (uls) + 1) >> 1) + 7) >> 3), 0, \
G_TX_LOADTILE, 0 , cmt, maskt, shiftt, cms, masks, shifts); \
G_TX_LOADTILE, 0, cmt, maskt, shiftt, cms, masks, shifts); \
gDPLoadSync(pkt); \
gDPLoadTile(pkt, G_TX_LOADTILE, \
(uls) << (G_TEXTURE_IMAGE_FRAC - 1), \
@@ -4550,7 +4550,7 @@ _DW({ \
gDPSetTextureImage(pkt, fmt, G_IM_SIZ_8b, ((width) >> 1), timg); \
gDPSetTile(pkt, fmt, G_IM_SIZ_8b, \
(((((lrs) - (uls) + 1) >> 1) + 7) >> 3), tmem, \
G_TX_LOADTILE, 0 , cmt, maskt, shiftt, cms, masks, shifts); \
G_TX_LOADTILE, 0, cmt, maskt, shiftt, cms, masks, shifts); \
gDPLoadSync(pkt); \
gDPLoadTile(pkt, G_TX_LOADTILE, \
(uls) << (G_TEXTURE_IMAGE_FRAC - 1), \
@@ -4574,7 +4574,7 @@ _DW({ \
gsDPSetTextureImage(fmt, G_IM_SIZ_8b, ((width) >> 1), timg), \
gsDPSetTile(fmt, G_IM_SIZ_8b, \
(((((lrs) - (uls) + 1) >> 1) + 7) >> 3), 0, \
G_TX_LOADTILE, 0 , cmt, maskt, shiftt, cms, masks, shifts), \
G_TX_LOADTILE, 0, cmt, maskt, shiftt, cms, masks, shifts), \
gsDPLoadSync(), \
gsDPLoadTile(G_TX_LOADTILE, \
(uls) << (G_TEXTURE_IMAGE_FRAC - 1), \
@@ -4604,7 +4604,7 @@ _DW({ \
(((((lrs) - (uls) + 1) >> 1) + 7) >> 3), tmem, \
G_TX_LOADTILE, 0, cmt, maskt, shiftt, cms, masks, shifts), \
gsDPLoadSync(), \
gsDPLoadTile( G_TX_LOADTILE, \
gsDPLoadTile(G_TX_LOADTILE, \
(uls) << (G_TEXTURE_IMAGE_FRAC - 1), \
(ult) << (G_TEXTURE_IMAGE_FRAC), \
(lrs) << (G_TEXTURE_IMAGE_FRAC - 1), \
@@ -4630,7 +4630,7 @@ _DW({ \
gDPSetTextureImage(pkt, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dram); \
gDPTileSync(pkt); \
gDPSetTile(pkt, 0, 0, 0, (256 + (((pal) & 0xF) * 16)), \
G_TX_LOADTILE, 0 , 0, 0, 0, 0, 0, 0); \
G_TX_LOADTILE, 0, 0, 0, 0, 0, 0, 0); \
gDPLoadSync(pkt); \
gDPLoadTLUTCmd(pkt, G_TX_LOADTILE, 15); \
gDPPipeSync(pkt); \
@@ -4656,7 +4656,7 @@ _DW({ \
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dram), \
gsDPTileSync(), \
gsDPSetTile(0, 0, 0, (256 + (((pal) & 0xF) * 16)), \
G_TX_LOADTILE, 0 , 0, 0, 0, 0, 0, 0), \
G_TX_LOADTILE, 0, 0, 0, 0, 0, 0, 0), \
gsDPLoadSync(), \
gsDPLoadTLUTCmd(G_TX_LOADTILE, 15), \
gsDPPipeSync()
@@ -4681,7 +4681,7 @@ _DW({ \
gDPSetTextureImage(pkt, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dram); \
gDPTileSync(pkt); \
gDPSetTile(pkt, 0, 0, 0, 256, \
G_TX_LOADTILE, 0 , 0, 0, 0, 0, 0, 0); \
G_TX_LOADTILE, 0, 0, 0, 0, 0, 0, 0); \
gDPLoadSync(pkt); \
gDPLoadTLUTCmd(pkt, G_TX_LOADTILE, 255); \
gDPPipeSync(pkt); \
@@ -4748,7 +4748,7 @@ _DW({ \
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dram), \
gsDPTileSync(), \
gsDPSetTile(0, 0, 0, tmemaddr, \
G_TX_LOADTILE, 0 , 0, 0, 0, 0, 0, 0), \
G_TX_LOADTILE, 0, 0, 0, 0, 0, 0, 0), \
gsDPLoadSync(), \
gsDPLoadTLUTCmd(G_TX_LOADTILE, ((count) - 1)), \
gsDPPipeSync()
include/z64.h
+1 -1
View File
@@ -796,7 +796,7 @@ typedef enum {
/* 1 */ TRANS_TILE_SETUP, // Save the necessary buffers
/* 2 */ TRANS_TILE_PROCESS, // Initialize the transition
/* 3 */ TRANS_TILE_READY // The transition is ready, so will update and draw each frame
} TransitionTileStatus;
} TransitionTileState;
typedef struct PlayState {
/* 0x00000 */ GameState state;
include/z64item.h
+2 -2
View File
@@ -20,7 +20,7 @@ typedef enum {
typedef enum {
/* 0 */ EQUIP_INV_SWORD_KOKIRI,
/* 1 */ EQUIP_INV_SWORD_MASTER,
/* 2 */ EQUIP_INV_SWORD_BGS,
/* 2 */ EQUIP_INV_SWORD_BIGGORON,
/* 3 */ EQUIP_INV_SWORD_BROKENGIANTKNIFE
} EquipInvSword;
@@ -48,7 +48,7 @@ typedef enum {
/* 0 */ EQUIP_VALUE_SWORD_NONE,
/* 1 */ EQUIP_VALUE_SWORD_KOKIRI,
/* 2 */ EQUIP_VALUE_SWORD_MASTER,
/* 3 */ EQUIP_VALUE_SWORD_BGS,
/* 3 */ EQUIP_VALUE_SWORD_BIGGORON,
/* 4 */ EQUIP_VALUE_SWORD_MAX
} EquipValueSword;
include/z64player.h
+2 -2
View File
@@ -10,7 +10,7 @@ typedef enum {
/* 0 */ PLAYER_SWORD_NONE,
/* 1 */ PLAYER_SWORD_KOKIRI,
/* 2 */ PLAYER_SWORD_MASTER,
/* 3 */ PLAYER_SWORD_BGS,
/* 3 */ PLAYER_SWORD_BIGGORON,
/* 4 */ PLAYER_SWORD_MAX
} PlayerSword;
@@ -75,7 +75,7 @@ typedef enum {
/* 0x02 */ PLAYER_IA_FISHING_POLE,
/* 0x03 */ PLAYER_IA_SWORD_MASTER,
/* 0x04 */ PLAYER_IA_SWORD_KOKIRI,
/* 0x05 */ PLAYER_IA_SWORD_BGS,
/* 0x05 */ PLAYER_IA_SWORD_BIGGORON,
/* 0x06 */ PLAYER_IA_DEKU_STICK,
/* 0x07 */ PLAYER_IA_HAMMER,
/* 0x08 */ PLAYER_IA_BOW,