Color_RGBAu32 (#253)

* Renamed deprecated RGB5A1 to RGBA16

* Cleanup shopkeeper structs with Color_RGBAu32 and Vec3f

* Rename functions with RGB5A1 in them

* BSS fix
This commit is contained in:
Derek Hensley
2021-08-15 07:56:20 -07:00
committed by GitHub
parent 5dc98392e0
commit f90e3ee739
18 changed files with 349 additions and 245 deletions
+42
View File
@@ -0,0 +1,42 @@
#!/bin/bash
# Given a list of header files, compute the bss index that results from
# including them. (See prevent_bss_reordering.h for more information.)
TEMPC=$(mktemp -t bss.XXXXXXX.c)
TEMPO=$(mktemp -t bss.XXXXXXX.o)
trap "rm -f $TEMPC $TEMPO" EXIT
set -e
if [[ $# = 0 ]]; then
echo "Usage: ./tools/calc_bss.sh file1.h file2.h ..." >&2
exit 1
fi
if [ -z "$CROSS" ]; then
CROSS=mips-linux-gnu-
fi
# bss indexing starts at 3
for I in {3..255}; do
echo "char bss$I;" >> $TEMPC
done
for I in {0..2}; do
echo "char bss$I;" >> $TEMPC
done
while [[ $# -gt 0 ]]; do
echo "#include \"$1\"" >> $TEMPC
shift
done
echo "char measurement;" >> $TEMPC
$(pwd)/tools/ido_recomp/linux/7.1/cc -G 0 -non_shared \
-Xfullwarn -Xcpluscomm -O2 -g3 -Xcpluscomm -mips2 \
-I $(pwd)/include/ -I $(pwd)/src/ -I $(pwd)/assets/ -I $(pwd)/build/ \
-Wab,-r4300_mul -woff 624,649,838,712 -c $TEMPC -o $TEMPO
LINE=$(${CROSS}objdump -t $TEMPO | grep measurement | cut -d' ' -f1)
NUM=$((0x$LINE - 1))
echo "bss index: $NUM"
+2 -2
View File
@@ -3240,10 +3240,10 @@
0x80178DAC:("func_80178DAC",),
0x80178E3C:("func_80178E3C",),
0x80178E7C:("func_80178E7C",),
0x80178F30:("Check_WriteRGB5A1Pixel",),
0x80178F30:("Check_WriteRGBA16Pixel",),
0x80178F60:("Check_WriteI4Pixel",),
0x80178FA0:("Check_DrawI4Texture",),
0x80179090:("Check_ClearRGB5A1",),
0x80179090:("Check_ClearRGBA16",),
0x8017910C:("Check_DrawExpansionPakErrorMessage",),
0x801791CC:("Check_DrawRegionLockErrorMessage",),
0x80179260:("Check_ExpansionPak",),
+2 -2
View File
@@ -2754,10 +2754,10 @@ asm/non_matchings/code/sys_cmpdma/func_80178D7C.s,func_80178D7C,0x80178D7C,0xC
asm/non_matchings/code/sys_cmpdma/func_80178DAC.s,func_80178DAC,0x80178DAC,0x24
asm/non_matchings/code/sys_cmpdma/func_80178E3C.s,func_80178E3C,0x80178E3C,0x10
asm/non_matchings/code/sys_cmpdma/func_80178E7C.s,func_80178E7C,0x80178E7C,0x2D
asm/non_matchings/code/sys_initial_check/Check_WriteRGB5A1Pixel.s,Check_WriteRGB5A1Pixel,0x80178F30,0xC
asm/non_matchings/code/sys_initial_check/Check_WriteRGBA16Pixel.s,Check_WriteRGBA16Pixel,0x80178F30,0xC
asm/non_matchings/code/sys_initial_check/Check_WriteI4Pixel.s,Check_WriteI4Pixel,0x80178F60,0x10
asm/non_matchings/code/sys_initial_check/Check_DrawI4Texture.s,Check_DrawI4Texture,0x80178FA0,0x3C
asm/non_matchings/code/sys_initial_check/Check_ClearRGB5A1.s,Check_ClearRGB5A1,0x80179090,0x1F
asm/non_matchings/code/sys_initial_check/Check_ClearRGBA16.s,Check_ClearRGBA16,0x80179090,0x1F
asm/non_matchings/code/sys_initial_check/Check_DrawExpansionPakErrorMessage.s,Check_DrawExpansionPakErrorMessage,0x8017910C,0x30
asm/non_matchings/code/sys_initial_check/Check_DrawRegionLockErrorMessage.s,Check_DrawRegionLockErrorMessage,0x801791CC,0x25
asm/non_matchings/code/sys_initial_check/Check_ExpansionPak.s,Check_ExpansionPak,0x80179260,0x11
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
2754 asm/non_matchings/code/sys_cmpdma/func_80178DAC.s func_80178DAC 0x80178DAC 0x24
2755 asm/non_matchings/code/sys_cmpdma/func_80178E3C.s func_80178E3C 0x80178E3C 0x10
2756 asm/non_matchings/code/sys_cmpdma/func_80178E7C.s func_80178E7C 0x80178E7C 0x2D
2757 asm/non_matchings/code/sys_initial_check/Check_WriteRGB5A1Pixel.s asm/non_matchings/code/sys_initial_check/Check_WriteRGBA16Pixel.s Check_WriteRGB5A1Pixel Check_WriteRGBA16Pixel 0x80178F30 0xC
2758 asm/non_matchings/code/sys_initial_check/Check_WriteI4Pixel.s Check_WriteI4Pixel 0x80178F60 0x10
2759 asm/non_matchings/code/sys_initial_check/Check_DrawI4Texture.s Check_DrawI4Texture 0x80178FA0 0x3C
2760 asm/non_matchings/code/sys_initial_check/Check_ClearRGB5A1.s asm/non_matchings/code/sys_initial_check/Check_ClearRGBA16.s Check_ClearRGB5A1 Check_ClearRGBA16 0x80179090 0x1F
2761 asm/non_matchings/code/sys_initial_check/Check_DrawExpansionPakErrorMessage.s Check_DrawExpansionPakErrorMessage 0x8017910C 0x30
2762 asm/non_matchings/code/sys_initial_check/Check_DrawRegionLockErrorMessage.s Check_DrawRegionLockErrorMessage 0x801791CC 0x25
2763 asm/non_matchings/code/sys_initial_check/Check_ExpansionPak.s Check_ExpansionPak 0x80179260 0x11