izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove assets.h from global.h, some other header adjustments (#174)

Browse Source 
* splits

* torch

* torch again

* headers

* merges

* format
This commit is contained in:
petrie911
2024-03-21 17:19:38 -03:00
committed by GitHub
parent df268e3bad
commit 4a572e7e30
65 changed files with 594 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/yaml/us/ast_option.yaml
+126 -126
View File
@@ -10,241 +10,241 @@
- '#include "structs.h"'
# Invoice
D_8000000:
{ type: TEXTURE, ctype: u8, format: CI4, width: 128, height: 26, offset: 0x8000000, symbol: D_8000000, tlut: 0x8000680 }
D_OPT_8000000:
{ type: TEXTURE, ctype: u8, format: CI4, width: 128, height: 26, offset: 0x8000000, symbol: D_OPT_8000000, tlut: 0x8000680 }
D_8000680:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8000680, symbol: D_8000680 }
D_OPT_8000680:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8000680, symbol: D_OPT_8000680 }
# Cornerian army attn:
D_80006A0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 34, offset: 0x80006A0, symbol: D_80006A0, tlut: 0x80017A0 }
D_OPT_80006A0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 34, offset: 0x80006A0, symbol: D_OPT_80006A0, tlut: 0x80017A0 }
D_80017A0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80017A0, symbol: D_80017A0 }
D_OPT_80017A0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80017A0, symbol: D_OPT_80017A0 }
# Venomian units destroyed
D_80017C0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 66, offset: 0x80017C0, symbol: D_80017C0, tlut: 0x80038C0 }
D_OPT_80017C0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 66, offset: 0x80017C0, symbol: D_OPT_80017C0, tlut: 0x80038C0 }
D_80038C0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80038C0, symbol: D_80038C0 }
D_OPT_80038C0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80038C0, symbol: D_OPT_80038C0 }
# nd
D_80038E0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 10, offset: 0x80038E0, symbol: D_80038E0, tlut: 0x8003930 }
D_OPT_80038E0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 10, offset: 0x80038E0, symbol: D_OPT_80038E0, tlut: 0x8003930 }
D_8003930:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003930, symbol: D_8003930 }
D_OPT_8003930:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003930, symbol: D_OPT_8003930 }
# rd
D_8003950:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 11, offset: 0x8003950, symbol: D_8003950, tlut: 0x80039A8 }
D_OPT_8003950:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 11, offset: 0x8003950, symbol: D_OPT_8003950, tlut: 0x80039A8 }
D_80039A8:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80039A8, symbol: D_80039A8 }
D_OPT_80039A8:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80039A8, symbol: D_OPT_80039A8 }
#
D_80039D0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x80039D0 , symbol: D_80039D0, tlut: 0x8003A50 }
D_OPT_80039D0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x80039D0 , symbol: D_OPT_80039D0, tlut: 0x8003A50 }
D_8003A50:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003A50, symbol: D_8003A50 }
D_OPT_8003A50:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003A50, symbol: D_OPT_8003A50 }
# st
D_8003A70:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 9, offset: 0x8003A70, symbol: D_8003A70, tlut: 0x8003AB8 }
D_OPT_8003A70:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 9, offset: 0x8003A70, symbol: D_OPT_8003A70, tlut: 0x8003AB8 }
D_8003AB8:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003AB8, symbol: D_8003AB8 }
D_OPT_8003AB8:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003AB8, symbol: D_OPT_8003AB8 }
# th
D_8003AE0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 9, offset: 0x8003AE0, symbol: D_8003AE0, tlut: 0x8003B28 }
D_OPT_8003AE0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 9, offset: 0x8003AE0, symbol: D_OPT_8003AE0, tlut: 0x8003B28 }
D_8003B28:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003B28, symbol: D_8003B28 }
D_OPT_8003B28:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8003B28, symbol: D_OPT_8003B28 }
# Option Title Cards
# Main Game
D_8003B50:
{ type: TEXTURE, ctype: u8, format: IA8, width: 72, height: 12, offset: 0x8003B50, symbol: D_8003B50 }
D_OPT_8003B50:
{ type: TEXTURE, ctype: u8, format: IA8, width: 72, height: 12, offset: 0x8003B50, symbol: D_OPT_8003B50 }
# Training
D_8003EB0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x8003EB0, symbol: D_8003EB0 }
D_OPT_8003EB0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x8003EB0, symbol: D_OPT_8003EB0 }
# Vs.
D_8004270:
{ type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 10, offset: 0x8004270, symbol: D_8004270 }
D_OPT_8004270:
{ type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 10, offset: 0x8004270, symbol: D_OPT_8004270 }
# Ranking
D_80043B0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 12, offset: 0x80043B0, symbol: D_80043B0 }
D_OPT_80043B0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 12, offset: 0x80043B0, symbol: D_OPT_80043B0 }
# Sound
D_80046B0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 10, offset: 0x80046B0, symbol: D_80046B0 }
D_OPT_80046B0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 10, offset: 0x80046B0, symbol: D_OPT_80046B0 }
# Data
D_8004930:
{ type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 10, offset: 0x8004930, symbol: D_8004930 }
D_OPT_8004930:
{ type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 10, offset: 0x8004930, symbol: D_OPT_8004930 }
D_8004C50:
{ type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x8004C50, symbol: D_8004C50 }
D_OPT_8004C50:
{ type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x8004C50, symbol: D_OPT_8004C50 }
# Option VS Cards
# Point Match
D_8005010:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 13, offset: 0x8005010, symbol: D_8005010 }
D_OPT_8005010:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 13, offset: 0x8005010, symbol: D_OPT_8005010 }
# Battle Royal
D_80054F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 11, offset: 0x80054F0, symbol: D_80054F0 }
D_OPT_80054F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 11, offset: 0x80054F0, symbol: D_OPT_80054F0 }
# Time Trial
D_8005910:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x8005910, symbol: D_8005910 }
D_OPT_8005910:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x8005910, symbol: D_OPT_8005910 }
# Sound Options
# Press R to test
D_8005CD0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 112, height: 13, offset: 0x8005CD0, symbol: D_8005CD0 }
D_OPT_8005CD0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 112, height: 13, offset: 0x8005CD0, symbol: D_OPT_8005CD0 }
# Mode
D_8006280:
{ type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 13, offset: 0x8006280, symbol: D_8006280 }
D_OPT_8006280:
{ type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 13, offset: 0x8006280, symbol: D_OPT_8006280 }
# Music
D_80064F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 88, height: 14, offset: 0x80064F0, symbol: D_80064F0 }
D_OPT_80064F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 88, height: 14, offset: 0x80064F0, symbol: D_OPT_80064F0 }
# Voice
D_80069C0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 15, offset: 0x80069C0, symbol: D_80069C0 }
D_OPT_80069C0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 15, offset: 0x80069C0, symbol: D_OPT_80069C0 }
# SE
D_8006D10:
{ type: TEXTURE, ctype: u8, format: IA8, width: 24, height: 13, offset: 0x8006D10, symbol: D_8006D10 }
D_OPT_8006D10:
{ type: TEXTURE, ctype: u8, format: IA8, width: 24, height: 13, offset: 0x8006D10, symbol: D_OPT_8006D10 }
# B to cancel
D_8006E50:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x8006E50, symbol: D_8006E50 }
D_OPT_8006E50:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x8006E50, symbol: D_OPT_8006E50 }
# Headphone
D_8007210:
{ type: TEXTURE, ctype: u8, format: IA8, width: 88, height: 14, offset: 0x8007210, symbol: D_8007210 }
D_OPT_8007210:
{ type: TEXTURE, ctype: u8, format: IA8, width: 88, height: 14, offset: 0x8007210, symbol: D_OPT_8007210 }
# Mono
D_80076E0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 14, offset: 0x80076E0, symbol: D_80076E0 }
D_OPT_80076E0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 14, offset: 0x80076E0, symbol: D_OPT_80076E0 }
# Soundtrack
D_80079F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 14, offset: 0x80079F0, symbol: D_80079F0 }
D_OPT_80079F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 14, offset: 0x80079F0, symbol: D_OPT_80079F0 }
# A to confirm
D_80080F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x80080F0, symbol: D_80080F0 }
D_OPT_80080F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 10, offset: 0x80080F0, symbol: D_OPT_80080F0 }
# Clear Saved Data
D_80084B0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 13, offset: 0x80084B0, symbol: D_80084B0 }
D_OPT_80084B0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 13, offset: 0x80084B0, symbol: D_OPT_80084B0 }
# Are you sure?
D_8008DA0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 160, height: 19, offset: 0x8008DA0, symbol: D_8008DA0 }
D_OPT_8008DA0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 160, height: 19, offset: 0x8008DA0, symbol: D_OPT_8008DA0 }
# Yes
D_8009980:
{ type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 12, offset: 0x8009980, symbol: D_8009980 }
D_OPT_8009980:
{ type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 12, offset: 0x8009980, symbol: D_OPT_8009980 }
# No
D_8009B00:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 12, offset: 0x8009B00, symbol: D_8009B00 }
D_OPT_8009B00:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 12, offset: 0x8009B00, symbol: D_OPT_8009B00 }
# Are you REALLY sure?
D_8009CE0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 160, height: 41, offset: 0x8009CE0, symbol: D_8009CE0 }
D_OPT_8009CE0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 160, height: 41, offset: 0x8009CE0, symbol: D_OPT_8009CE0 }
# Data erased
D_800B680:
{ type: TEXTURE, ctype: u8, format: IA8, width: 144, height: 41, offset: 0x800B680, symbol: D_800B680 }
D_OPT_800B680:
{ type: TEXTURE, ctype: u8, format: IA8, width: 144, height: 41, offset: 0x800B680, symbol: D_OPT_800B680 }
# Stereo
D_800CD90:
{ type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 13, offset: 0x800CD90, symbol: D_800CD90 }
D_OPT_800CD90:
{ type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 13, offset: 0x800CD90, symbol: D_OPT_800CD90 }
# UNK: Triangle shape, it's mirrored to form a diamond shape
D_800D070:
{ type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x800D070, symbol: D_800D070 }
D_OPT_800D070:
{ type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x800D070, symbol: D_OPT_800D070 }
# UNK:
D_800D170:
{ type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 16, offset: 0x800D170, symbol: D_800D170 }
D_OPT_800D170:
{ type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 16, offset: 0x800D170, symbol: D_OPT_800D170 }
# Seal
D_800D1F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 48, offset: 0x800D1F0, symbol: D_800D1F0 }
D_OPT_800D1F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 48, offset: 0x800D1F0, symbol: D_OPT_800D1F0 }
# UNK:
D_800E0F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x800E0F0, symbol: D_800E0F0 }
D_OPT_800E0F0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x800E0F0, symbol: D_OPT_800E0F0 }
D_800E130:
{ type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x800E130, symbol: D_800E130 }
D_OPT_800E130:
{ type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x800E130, symbol: D_OPT_800E130 }
# Mercenary Unit STARFOX Fox Mccloud
D_800E170:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 188, height: 60, offset: 0x800E170, symbol: D_800E170 }
D_OPT_800E170:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 188, height: 60, offset: 0x800E170, symbol: D_OPT_800E170 }
# ScrollBar
D_8013990:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 104, height: 10, offset: 0x8013990, symbol: D_8013990 }
D_OPT_8013990:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 104, height: 10, offset: 0x8013990, symbol: D_OPT_8013990 }
# ScrollBar Indicator
D_80141B0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x80141B0, symbol: D_80141B0 }
D_OPT_80141B0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x80141B0, symbol: D_OPT_80141B0 }
# Speaker
D_80143B0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x80143B0, symbol: D_80143B0, tlut: D_80147B0 }
D_OPT_80143B0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x80143B0, symbol: D_OPT_80143B0, tlut: D_OPT_80147B0 }
D_80147B0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 32, offset: 0x80147B0, symbol: D_80147B0 }
D_OPT_80147B0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 32, offset: 0x80147B0, symbol: D_OPT_80147B0 }
D_80147F0:
{ type: GFX, offset: 0x80147F0, symbol: D_80147F0 }
D_OPT_80147F0:
{ type: GFX, offset: 0x80147F0, symbol: D_OPT_80147F0 }
ast_option_seg8_vtx_00014B50:
{ type: VTX, count: 124, offset: 0x8014B50, symbol: ast_option_seg8_vtx_00014B50 }
D_8015310:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x8015310, symbol: D_8015310, tlut: 0x08015390 }
D_OPT_8015310:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x8015310, symbol: D_OPT_8015310, tlut: 0x08015390 }
D_8015390:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8015390, symbol: D_8015390 }
D_OPT_8015390:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8015390, symbol: D_OPT_8015390 }
D_80153B0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x80153B0, symbol: D_80153B0, tlut: 0x08015430 }
D_OPT_80153B0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x80153B0, symbol: D_OPT_80153B0, tlut: 0x08015430 }
D_8015430:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8015430, symbol: D_8015430 }
D_OPT_8015430:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x8015430, symbol: D_OPT_8015430 }
D_8015450:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 16, offset: 0x08015450, symbol: D_8015450 }
D_OPT_8015450:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 16, offset: 0x08015450, symbol: D_OPT_8015450 }
D_8015550:
{ type: GFX, offset: 0x8015550, symbol: D_8015550 }
D_OPT_8015550:
{ type: GFX, offset: 0x8015550, symbol: D_OPT_8015550 }
D_80155E8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x080155E8, symbol: D_80155E8 }
D_OPT_80155E8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x080155E8, symbol: D_OPT_80155E8 }
D_8015DF0:
{ type: GFX, offset: 0x8015DF0, symbol: D_8015DF0 }
D_OPT_8015DF0:
{ type: GFX, offset: 0x8015DF0, symbol: D_OPT_8015DF0 }
D_8015E88:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x08015E88, symbol: D_8015E88 }
D_OPT_8015E88:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x08015E88, symbol: D_OPT_8015E88 }
include/assets.h
-100
View File
@@ -17,55 +17,42 @@
*/
extern Gfx D_60005B0[]; // fox_bg
extern Gfx D_6000A80[]; // fox_bg, fox_effect
extern u16 D_A6_6000B60[]; // fox_radio
extern Gfx D_6000E00[]; // fox_edata_1C
extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C
extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
extern Gfx D_6001840[]; // fox_bg
extern Gfx D_6001A60[]; // fox_effect
extern u16 D_A6_6001A80[]; // fox_radio
extern u8 D_6001B80[]; // fox_hud
extern Vtx D_6001C50[]; // fox_play
extern u8 D_6001C80[]; // fox_map
extern Gfx D_6001DA0[]; // fox_demo, fox_edata_1C
extern u8 D_60020D0[]; // fox_hud
extern u8 D_6002160[]; // fox_map
extern Gfx D_60023B0[]; // fox_edata_1C
extern Gfx D_6002990[]; // fox_edata_1C
extern u16 D_A6_60029A0[]; // fox_radio
extern Gfx D_6002E60[]; // fox_bg
extern Gfx D_6002F80[]; // fox_bg
extern Gfx D_6003000[]; // fox_edata_1C
extern u8 D_60030D0[]; // fox_map
extern Gfx D_60030F0[]; // fox_edata_1C
extern Gfx D_60034D0[]; // fox_edata_1C, fox_enmy2
extern Gfx D_60036A0[]; // fox_edata_1C, fox_enmy2
extern Gfx D_6003760[];
extern u16 D_A6_60038C0[];
extern Gfx D_60038E0[];
extern u16 D_60038F8[];
extern u8 D_6003B50[];
extern Gfx D_6004170[];
extern Gfx D_6004330[];
extern Vtx D_6004500[];
extern Gfx D_6004570[];
extern Gfx D_60046F0[];
extern u16 D_A6_60047E0[];
extern Gfx D_6004900[];
extern u8 D_6004AC0[];
extern Gfx D_6004FE0[];
extern EnvSettings D_6005000;
extern Gfx D_6005360[];
extern u16 D_A6_6005700[];
extern u16 D_6005710[];
extern u8 D_6005740[];
extern Gfx D_6005780[];
extern Gfx D_6005880[];
extern Gfx D_60059F0[];
extern Gfx D_6006140[];
extern Gfx D_6006310[];
extern u16* D_600631C[];
extern u8 D_6006320[];
extern Animation D_600636C;
extern f32 D_60064AC[];
extern f32 D_60064C8[];
@@ -109,7 +96,6 @@ extern f32 D_6006C44[];
extern Animation D_6006D64;
extern Limb* D_6006E50[];
extern EnvSettings D_6006E70;
extern u8 D_6006E80[];
extern u16 D_6006EA0[];
extern Gfx D_6006F50[];
extern Gfx D_6007410[];
@@ -117,7 +103,6 @@ extern CollisionPoly D_6007558[];
extern Gfx D_60075D0[];
extern Gfx D_6007650[];
extern Gfx D_60079B0[];
extern u8 D_6007B90[];
extern Gfx D_6007CF0[];
extern Gfx D_6007D80[];
extern Gfx D_6007D90[];
@@ -125,7 +110,6 @@ extern EnvSettings D_6007E30;
extern Gfx D_6008370[];
extern Gfx D_6008770[];
extern Gfx D_6008830[];
extern u8 D_6008990[];
extern Gfx D_6008AA0[];
extern Vec3s D_6008E08[];
extern f32 D_600924C[];
@@ -133,7 +117,6 @@ extern Gfx D_6009250[];
extern f32 D_60092E8[];
extern f32 D_6009388[];
extern Gfx D_60097E0[];
extern u8 D_6009AD0[];
extern u16* D_6009B34[];
extern u16 D_6009BB8[];
extern f32 D_6009CC4[];
@@ -144,13 +127,11 @@ extern Vtx D_6009ED0[];
extern Gfx D_6009F90[];
extern Gfx D_600A420[];
extern Gfx D_600A810[];
extern u8 D_600AD30[];
extern Gfx D_600AF40[];
extern Gfx D_600B0E0[];
extern Animation D_600B1B4;
extern Gfx D_600B4B0[];
extern Gfx D_600B8B0[];
extern u8 D_600B9B0[];
extern Gfx D_600BAF0[];
extern u16 D_600BEA0[];
extern Gfx D_600C130[];
@@ -162,7 +143,6 @@ extern Gfx D_600C740[];
extern Vtx D_600C780[];
extern Gfx D_600CAA0[];
extern u16 D_600CBD8[];
extern u8 D_600CC10[];
extern Gfx D_600D190[];
extern Animation D_600D3DC;
extern u16 D_600D5C0[];
@@ -174,8 +154,6 @@ extern Gfx D_600DBC0[];
extern u8 D_600DDC0[];
extern Gfx D_600DDF0[];
extern Gfx D_600E050[];
extern Gfx D_A6_600E0C0[];
extern u8 D_600E210[];
extern Animation D_600E2C4;
extern u8 D_600E360[];
extern Limb* D_600E470[];
@@ -188,9 +166,7 @@ extern Gfx D_600EFF0[];
extern Gfx D_600F160[];
extern Gfx D_600F1D0[];
extern CollisionPoly D_600F1DC[];
extern Gfx D_A6_600F1F0[];
extern Gfx D_600F2F0[];
extern u8 D_600F390[];
extern Vec3s D_600F394[];
extern Gfx D_600F3D0[];
extern CollisionPoly D_600F3F4[];
@@ -213,13 +189,11 @@ extern f32 D_600FF80[];
extern f32 D_600FFA0[];
extern f32 D_600FFC0[];
extern f32 D_600FFE0[];
extern u8 D_6010010[];
extern ObjectInit* D_6010088[];
extern u8 D_6010090[];
extern u16 D_6010198[];
extern CollisionPoly D_6010294[];
extern Gfx D_60102C0[];
extern u8 D_60105C0[];
extern u8 D_60106B0[];
extern Gfx D_6010700[];
extern Gfx D_6010960[];
@@ -230,32 +204,26 @@ extern u8 D_6010FA0[];
extern EnvSettings D_6011000;
extern f32 D_6011058[];
extern f32 D_601115C[];
extern u8 D_TEX_6011660[];
extern Vec3s D_601170C[];
extern u8 D_6011890[];
extern Gfx D_A6_6011910[];
extern f32 D_6011B24[];
extern u16 D_6011B40[];
extern f32 D_6011BF4[];
extern f32 D_6011C10[];
extern f32 D_6011C48[];
extern f32 D_6011C80[];
extern u8 D_6011EA0[];
extern u8 D_6012310[];
extern u8 D_60123F0[];
extern Gfx D_6012C00_Gfx[];
extern Animation D_6012C00_Anim;
extern u8 D_60131A0[];
extern Gfx D_60132B0[];
extern u8 D_6013470[];
extern Gfx D_6013480[];
extern Gfx D_60137B0[];
extern Animation D_601388C;
extern Gfx D_6013960[];
extern u8 D_60139E0[];
extern Gfx D_6013B50[];
extern u8 D_6014140[];
extern u8 D_6014360[];
extern Gfx D_60143E0[];
extern Gfx D_6014500[];
extern u16 D_6014510[];
@@ -267,13 +235,10 @@ extern u8 D_60148B0[];
extern Gfx D_60148D0[];
extern Gfx D_6014A20[];
extern Gfx D_6014B50[];
extern u8 D_6014BA0[];
extern EnvSettings D_6014D50;
extern CollisionPoly D_6014FEC[];
extern Gfx D_60153B0[];
extern u16 D_6015430[];
extern u8 D_6015CE0[];
extern Gfx D_A6_6015EE0[];
extern Gfx D_6015F00[];
extern Gfx D_6016270[];
extern Vec3s D_6016374[];
@@ -282,34 +247,23 @@ extern Gfx D_6016580[];
extern f32 D_601668C[];
extern f32 D_60166F4[];
extern f32 D_6016714[];
extern u8 D_6016760[];
extern Gfx D_6016CF0[];
extern Gfx D_6017090[];
extern Gfx D_6017370[];
extern u8 D_6017640[];
extern u8 D_6018280[];
extern Gfx D_6018450[];
extern Gfx D_60188D0[];
extern Animation D_A6_6018994;
extern Limb* D_A6_6018BA0[];
extern Gfx D_A6_6018BF0[];
extern Gfx D_6018C00[]; // possible collision
extern Gfx D_6018D40[];
extern Gfx D_6018E80[];
extern u16 D_6018F30[];
extern u8 D_60190B0[];
extern Gfx D_6019220[];
extern Gfx D_A6_6019730[];
extern u16 D_6019E50[];
extern Gfx D_A6_601A120[];
extern Gfx D_601A7A0[];
extern Gfx D_601A7D0[];
extern Gfx D_601AD70[];
extern Gfx D_601AE40[];
extern Gfx D_601B0D0[];
extern u16* D_601B1E4[];
extern Gfx D_A6_601B2B0[];
extern u16 D_601B4B0[];
extern f32 D_601B4C4[];
extern f32 D_601B4E0[];
extern f32 D_601B4FC[];
@@ -331,21 +285,16 @@ extern f32 D_601B830[];
extern f32 D_601B868[];
extern f32 D_601B8A0[];
extern f32 D_601B8D8[];
extern Gfx D_A6_601BB40[];
extern Gfx D_601BEC0[];
extern Gfx D_601C0D0[];
extern Gfx D_601C6A0[];
extern Gfx D_601C7C0[];
extern Gfx D_601C820[];
extern u16 D_601C8E0[];
extern Gfx D_601C960[];
extern Gfx D_601C9B0[];
extern Gfx D_601D1F0[];
extern Gfx D_601D730[];
extern u8 D_601D750[];
extern u16 D_601D800[];
extern u16 D_601DB50[];
extern Gfx D_601DE80[];
extern Gfx D_601E150[];
extern u16 D_601E1E8[];
extern Animation D_601E8C4;
@@ -355,11 +304,9 @@ extern Gfx D_601F1D0[];
extern EnvSettings D_601F1F0;
extern Gfx D_601F500[];
extern Gfx D_601F5A0[];
extern Gfx D_601F6B0[];
extern Animation D_601F874;
extern Limb* D_601F920[];
extern Gfx D_601FCB0[];
extern u8 D_601FF40[];
extern Gfx D_601FF80[];
extern Gfx D_60200E0[];
extern Gfx D_6020760[];
@@ -368,9 +315,7 @@ extern Gfx D_6020B40[];
extern u16* D_6020DD0[];
extern Gfx D_6020E60[];
extern u16 D_6020F60[];
extern u16 D_6022340[];
extern Gfx D_60223C0[];
extern u8 D_60223E0[];
extern Gfx D_6022450[];
extern Gfx D_6022530[];
extern u16 D_6022760[];
@@ -379,13 +324,10 @@ extern u16 D_60229A4[];
extern f32 D_60231A4[];
extern Gfx D_60238F0[];
extern Gfx D_6023AC0[];
extern EnvSettings D_A6_6023F20;
extern Gfx D_6024010[];
extern Gfx D_6024220[];
extern Gfx D_60244A0[];
extern u16 D_60245E0[];
extern u16 D_60247E0[];
extern u8 D_6024890[];
extern Gfx D_6024AC0[];
extern Gfx D_6024B60[];
extern u16 D_6025500[];
@@ -393,23 +335,14 @@ extern Gfx D_6025B50[];
extern u16 D_6026420[];
extern EnvSettings D_60266D0;
extern EnvSettings D_ENV_6026C80;
extern u16 D_6026C90[];
extern u8 D_6026D70[];
extern Gfx D_60270E0[];
extern Gfx D_6027180[];
extern Animation D_6027320;
extern u16 D_6027340[];
extern Limb* D_602742C[];
extern Gfx D_6027900[];
extern u16* D_A6_6027F50[];
extern u16 D_6028260[];
extern f32 D_A6_6028454[];
extern f32 D_A6_6028578[];
extern EnvSettings D_A6_6028760;
extern u16* D_A6_60289FC[];
extern u16 D_6028A60[];
extern u16 D_6029170[];
extern u8 D_6029220[];
extern Animation D_6029528;
extern Limb* D_6029674[];
extern Gfx D_6029890[];
@@ -417,8 +350,6 @@ extern Gfx D_602A720[];
extern u16* D_602AAC0[];
extern u16 D_602AC50[];
extern ObjectInit* D_602B148[];
extern u16 D_602B620[];
extern u8 D_602B6D0[];
extern f32 D_602B9EC[];
extern f32 D_602BA20[];
extern f32 D_602BAE4[];
@@ -440,9 +371,7 @@ extern Triangle D_602CACC[];
extern Vec3f D_602CB80[];
extern Gfx D_602D5F0[];
extern Gfx D_602DA20[];
extern u16 D_602DAD0[];
extern Gfx D_602DAE0[];
extern u8 D_602DB60[];
extern Gfx D_602DB80[];
extern Gfx D_602DC20[];
extern Gfx D_602DCA0[];
@@ -465,8 +394,6 @@ extern f32 D_602F75C[];
extern Gfx D_602F7C0[];
extern f32 D_602FA50[];
extern CollisionPoly D_602FA9C[];
extern u16 D_602FF60[];
extern u8 D_602FFD0[];
extern Vec3s D_60300C8[];
extern CollisionPoly D_6030208[];
extern Gfx D_6030500[];
@@ -489,15 +416,11 @@ extern Vec3f D_6030F7C[];
extern Triangle D_6030FC4[];
extern Vec3s D_603184C[];
extern Gfx D_60320E0[];
extern u16 D_60323D0[];
extern u16 D_6032440[];
extern Gfx D_6032580[];
extern u16 D_6032A60[];
extern Gfx D_6032BC0[];
extern u16* D_6032E18[];
extern Gfx D_6033000[];
extern CollisionPoly D_6033070[];
extern u16 D_6033080[];
extern Vec3s D_6033E08[];
extern f32 D_603405C[];
extern f32 D_6034368[];
@@ -510,7 +433,6 @@ extern f32 D_60347D4[];
extern f32 D_60347F0[];
extern f32 D_603486C[];
extern Gfx D_6034B90[];
extern u16 D_6035780[];
extern f32 D_60359C8[];
extern f32 D_6035A14[];
extern f32 D_6035A48[];
@@ -557,12 +479,8 @@ extern f32 D_6036968[];
extern Gfx D_6036CD0[];
extern EnvSettings D_6037160;
extern Gfx D_6037CF0[];
extern u16 D_6037E80[];
extern u16* D_60381D8[];
extern u16 D_603A580[];
extern u16 D_603A580[];
extern ObjectInit D_603B074[];
extern u16 D_603CC80[];
extern u16* D_603D9E8[];
extern f32 D_603DCA4[];
extern f32 D_603DD40[];
@@ -585,8 +503,6 @@ extern Gfx D_6019670[];
extern Gfx D_60185E0[];
extern Gfx D_6017550[];
// fox_map, to be ordered later
extern f32 D_603E118[];
extern f32 D_603E14C[];
extern f32 D_603E1B4[];
@@ -618,25 +534,9 @@ extern f32 D_603EAE0[];
extern f32 D_603EB0C[];
extern u16 D_603EB38[];
extern Triangle D_603F338[];
extern u16 D_603F380[];
extern Vec3f D_603F388[];
extern Triangle D_603F40C[];
extern Vec3f D_603F4E4[];
extern Gfx D_6041070[];
extern u16 D_6041A80[];
extern u16 D_6044180[];
extern u16 D_60447A0[];
extern u16 D_6047550[];
extern Gfx D_6049F80[];
extern Gfx D_604A190[];
extern Gfx D_604A400[];
extern Gfx D_604A710[];
extern Gfx D_604A9F0[];
extern Gfx D_604B750[];
extern Gfx D_604DB10[];
extern Gfx D_6051D20[];
extern Gfx D_6055F20[];
extern Gfx D_605C230[];
extern Gfx D_6060610[];
#endif // ASSETS_H
include/assets/ast_ending.h
+26
View File
@@ -5,4 +5,30 @@
#include "sf64object.h"
#include "structs.h"
extern Gfx D_END_7010970[];
extern Animation D_END_70111D0;
extern Animation D_END_70143C0;
extern Animation D_END_7018708;
extern Limb* D_END_70187B4[];
extern Gfx D_END_700C620[];
extern Gfx D_END_700C8B0[];
extern Gfx D_END_700F240[];
extern Gfx D_END_700F320[];
extern Gfx D_END_7010970[];
extern u8 D_END_7010E10[];
extern u16 D_END_7010EE0[];
extern u8 D_END_7010F00[];
extern u16 D_END_7010FD0[];
extern u8 D_END_7010FF0[];
extern u16 D_END_70110C0[];
extern u8 D_END_70110E0[];
extern u16 D_END_70111B0[];
extern Gfx D_END_7000000[];
extern Gfx D_END_7002120[];
extern Gfx D_END_7004240[];
extern Gfx D_END_700E9E0[];
extern u16 D_END_700EA38[];
extern Gfx D_END_7010970[];
extern Gfx D_END_7016540[];
#endif
include/assets/ast_enmy_planet.h
+16 -16
View File
@@ -5,21 +5,21 @@
#include "sf64object.h"
#include "structs.h"
extern Animation D_40001A4;
extern Limb* D_4000270[];
extern Gfx D_4000710[];
extern Gfx D_40018A0[];
extern Animation D_40057AC;
extern Limb* D_40058B8[];
extern Gfx D_40068F0[];
extern Gfx D_4006E90[];
extern Gfx D_40073C0[];
extern Gfx D_4007AF0[];
extern Gfx D_4008CE0[];
extern Gfx D_4008CE0[];
extern Gfx D_4008F70[];
extern Gfx D_4008F70[];
extern Gfx D_4009800[];
extern Gfx D_400AAE0[];
extern Animation D_ENMY_PLANET_40001A4;
extern Limb* D_ENMY_PLANET_4000270[];
extern Gfx D_ENMY_PLANET_4000710[];
extern Gfx D_ENMY_PLANET_40018A0[];
extern Animation D_ENMY_PLANET_40057AC;
extern Limb* D_ENMY_PLANET_40058B8[];
extern Gfx D_ENMY_PLANET_40068F0[];
extern Gfx D_ENMY_PLANET_4006E90[];
extern Gfx D_ENMY_PLANET_40073C0[];
extern Gfx D_ENMY_PLANET_4007AF0[];
extern Gfx D_ENMY_PLANET_4008CE0[];
extern Gfx D_ENMY_PLANET_4008CE0[];
extern Gfx D_ENMY_PLANET_4008F70[];
extern Gfx D_ENMY_PLANET_4008F70[];
extern Gfx D_ENMY_PLANET_4009800[];
extern Gfx D_ENMY_PLANET_400AAE0[];
#endif
include/fox_edisplay_assets.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef FOX_EDISPLAY_ASSETS_H
#define FOX_EDISPLAY_ASSETS_H
#include "global.h"
#include "sys.h"
extern Gfx D_6027960[];
extern Gfx D_60273A0[];
include/fox_enmy2_assets.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef FOX_ENMY2_ASSETS_H
#define FOX_ENMY2_ASSETS_H
#include "global.h"
#include "sys.h"
// Displaylists
include/fox_enmy_assets.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef FOX_ENMY_ASSETS_H
#define FOX_ENMY_ASSETS_H
#include "global.h"
#include "sf64object.h"
extern ObjectInit D_60371A4[];
extern ObjectInit D_6026CC4[];
include/global.h
-1
View File
@@ -20,6 +20,5 @@
#include "i5.h"
#include "i6.h"
#include "assets/ast_common.h"
#include "assets.h"
#endif // GLOBAL_H
include/hud.h
-43
View File
@@ -1,43 +0,0 @@
#ifndef HUD_H
#define HUD_H
#include "global.h"
typedef struct {
/* 0x00 */ u8* unk_00;
/* 0x04 */ s32 width;
/* 0x08 */ s32 height;
/* 0x0C */ u8* unk_0C;
/* 0x10 */ s32 unk_10;
/* 0x14 */ s32 unk_14;
} UnkStruct_D_800D1AEC;
void func_80084930(f32, f32, s32);
void func_80086444(void);
void func_80087788(void);
void func_80084E78(Gfx** gfxP, void* arg1, void* arg2, u32 arg3, u32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
f32 arg9, f32 argA);
void func_80085944(void);
void func_80086CC8(void);
void func_80086DCC(void);
void func_80087B5C(void);
void func_80089994(s32);
s32 func_8008A4DC(void);
void func_8008B044(void);
void func_8008B1B0(void);
void func_8008B2F0(void);
void func_8008B734(void);
void func_8008B9E8(void);
void func_8008BAE4(void);
void func_8008CBE4(void);
void func_8008D250(void);
void func_8008D31C(void);
void func_8008D4F0(f32, f32);
void func_8008D7F4(void);
void func_8008D984(void);
void func_8008DC34(void);
void func_8008E5E8(void);
s32 func_80090E8C(Actor*);
s32 func_800910C0(Actor*);
#endif
linker_scripts/us/symbol_addrs.txt
+1 -1
View File
@@ -31,7 +31,7 @@ D_800D0000 = 0x800D0000;//ignore:true
D_7FFFFFFE = 0x7FFFFFFE;//ignore:true
D_1000000 = 0x01000000;//ignore:true
D_TI_A000000 = 0x0A000000;//ignore:true
D_4000000 = 0x04000000;//ignore:true
D_ENMY_PLANET_4000000 = 0x04000000;//ignore:true
// constant for K1 access
D_TI_A0000000 = 0xA0000000;//ignore:true
linker_scripts/us/undefined_syms.ld
+102 -102
View File
@@ -537,10 +537,10 @@ D_6017550 = 0x06017550;
D_TI1_700AB70 = 0x0700AB70;
D_TI1_700BE00 = 0x0700BE00;
D_70111D0 = 0x070111D0;
D_70143C0 = 0x070143C0;
D_7018708 = 0x07018708;
D_70187B4 = 0x070187B4;
D_END_70111D0 = 0x070111D0;
D_END_70143C0 = 0x070143C0;
D_END_7018708 = 0x07018708;
D_END_70187B4 = 0x070187B4;
D_VE1_9018BD0 = 0x09018BD0;
D_VE1_901A4B8 = 0x0901A4B8;
@@ -728,7 +728,7 @@ D_C038954 = 0x0C038954;
// fox_end2
D_arwing_3016CC0 = 0x03016CC0;
D_50054B0 = 0x050054B0;
D_7016540 = 0x07016540;
D_END_7016540 = 0x07016540;
// fox_edisplay
D_6027960 = 0x06027960;
@@ -1030,7 +1030,7 @@ D_6014D94 = 0x006014D94;
// fox_enmy2
D_6011F90 = 0x06011F90;
D_4000710 = 0x04000710;
D_ENMY_PLANET_4000710 = 0x04000710;
D_601F2A0 = 0x0601F2A0;
D_A6_6016190 = 0x06016190;
D_SX_6023500 = 0x06023500;
@@ -1064,9 +1064,9 @@ D_600AC70 = 0x0600AC70;
D_6002500 = 0x06002500;
D_60043F0 = 0x060043F0;
D_6004310 = 0x06004310;
D_4006E90 = 0x04006E90;
D_4009800 = 0x04009800;
D_40073C0 = 0x040073C0;
D_ENMY_PLANET_4006E90 = 0x04006E90;
D_ENMY_PLANET_4009800 = 0x04009800;
D_ENMY_PLANET_40073C0 = 0x040073C0;
D_A6_60282A0 = 0x060282A0;
D_SX_603298C = 0x0603298C;
@@ -1108,21 +1108,21 @@ D_60368E0 = 0x060368E0;
// fox_option
D_8003B50 = 0x08003B50;
D_8003EB0 = 0x08003EB0;
D_8004270 = 0x08004270;
D_80043B0 = 0x080043B0;
D_80046B0 = 0x080046B0;
D_8004930 = 0x08004930;
D_8005010 = 0x08005010;
D_80054F0 = 0x080054F0;
D_8005910 = 0x08005910;
D_80143B0 = 0x080143B0;
D_80039D0 = 0x080039D0;
D_80147B0 = 0x080147B0;
D_8003A50 = 0x08003A50;
D_8013990 = 0x08013990;
D_80141B0 = 0x080141B0;
D_OPT_8003B50 = 0x08003B50;
D_OPT_8003EB0 = 0x08003EB0;
D_OPT_8004270 = 0x08004270;
D_OPT_80043B0 = 0x080043B0;
D_OPT_80046B0 = 0x080046B0;
D_OPT_8004930 = 0x08004930;
D_OPT_8005010 = 0x08005010;
D_OPT_80054F0 = 0x080054F0;
D_OPT_8005910 = 0x08005910;
D_OPT_80143B0 = 0x080143B0;
D_OPT_80039D0 = 0x080039D0;
D_OPT_80147B0 = 0x080147B0;
D_OPT_8003A50 = 0x08003A50;
D_OPT_8013990 = 0x08013990;
D_OPT_80141B0 = 0x080141B0;
D_VS_70030B0 = 0x070030B0;
D_VS_7003290 = 0x07003290;
D_VS_7003470 = 0x07003470;
@@ -1453,17 +1453,17 @@ D_vs_player_302E95C = 0x302E95C;
D_vs_player_302EA4C = 0x302EA4C;
D_vs_player_302EB3C = 0x302EB3C;
D_vs_player_302EC20 = 0x302EC20;
D_4000080 = 0x4000080;
D_400014C = 0x400014C;
D_40001A4 = 0x40001A4;
D_4000270 = 0x4000270;
D_40018A0 = 0x40018A0;
D_40057AC = 0x40057AC;
D_40058B8 = 0x40058B8;
D_40068F0 = 0x40068F0;
D_4007AF0 = 0x4007AF0;
D_4008CE0 = 0x4008CE0;
D_4008F70 = 0x4008F70;
D_ENMY_PLANET_4000080 = 0x4000080;
D_ENMY_PLANET_400014C = 0x400014C;
D_ENMY_PLANET_40001A4 = 0x40001A4;
D_ENMY_PLANET_4000270 = 0x4000270;
D_ENMY_PLANET_40018A0 = 0x40018A0;
D_ENMY_PLANET_40057AC = 0x40057AC;
D_ENMY_PLANET_40058B8 = 0x40058B8;
D_ENMY_PLANET_40068F0 = 0x40068F0;
D_ENMY_PLANET_4007AF0 = 0x4007AF0;
D_ENMY_PLANET_4008CE0 = 0x4008CE0;
D_ENMY_PLANET_4008F70 = 0x4008F70;
D_5000200 = 0x5000200;
D_5000300 = 0x5000300;
D_5000500 = 0x5000500;
@@ -2105,7 +2105,7 @@ D_VS_7001270 = 0x7001270;
D_WZ_7001540 = 0x7001540;
D_VS_7001DF0 = 0x7001DF0;
D_VS_7002110 = 0x7002110;
D_7002120 = 0x7002120;
D_END_7002120 = 0x7002120;
D_TI1_7002270 = 0x7002270;
D_TI1_7002490 = 0x7002490;
D_VS_7003650 = 0x7003650;
@@ -2118,7 +2118,7 @@ D_VS_7004010 = 0x7004010;
D_VS_7004050 = 0x7004050;
D_VS_7004150 = 0x7004150;
D_VS_70041F0 = 0x70041F0;
D_7004240 = 0x7004240;
D_END_7004240 = 0x7004240;
D_VS_70042F0 = 0x70042F0;
D_VS_7004360 = 0x7004360;
D_VS_7004460 = 0x7004460;
@@ -2143,8 +2143,8 @@ D_TI1_700A990 = 0x700A990;
D_TI1_700B9C0 = 0x700B9C0;
D_TI1_700BB10 = 0x700BB10;
D_TI1_700C4B0 = 0x700C4B0;
D_700C620 = 0x700C620;
D_700C8B0 = 0x700C8B0;
D_END_700C620 = 0x700C620;
D_END_700C8B0 = 0x700C8B0;
D_TI1_700C8D8 = 0x700C8D8;
D_TI1_700C964 = 0x700C964;
D_TI1_700C980 = 0x700C980;
@@ -2155,76 +2155,76 @@ D_TI1_700D700 = 0x700D700;
D_TI2_700E244 = 0x700E244;
D_TI1_700E3F0 = 0x700E3F0;
D_VS_700E9A0 = 0x700E9A0;
D_700E9E0 = 0x700E9E0;
D_700EA38 = 0x700EA38;
D_700F240 = 0x700F240;
D_700F320 = 0x700F320;
D_7010970 = 0x7010970;
D_7010E10 = 0x7010E10;
D_7010EE0 = 0x7010EE0;
D_7010F00 = 0x7010F00;
D_7010FD0 = 0x7010FD0;
D_7010FF0 = 0x7010FF0;
D_70110C0 = 0x70110C0;
D_70110E0 = 0x70110E0;
D_70111B0 = 0x70111B0;
D_END_700E9E0 = 0x700E9E0;
D_END_700EA38 = 0x700EA38;
D_END_700F240 = 0x700F240;
D_END_700F320 = 0x700F320;
D_END_7010970 = 0x7010970;
D_END_7010E10 = 0x7010E10;
D_END_7010EE0 = 0x7010EE0;
D_END_7010F00 = 0x7010F00;
D_END_7010FD0 = 0x7010FD0;
D_END_7010FF0 = 0x7010FF0;
D_END_70110C0 = 0x70110C0;
D_END_70110E0 = 0x70110E0;
D_END_70111B0 = 0x70111B0;
D_VS_70118E0 = 0x70118E0;
D_70122E0 = 0x70122E0;
D_END_70122E0 = 0x70122E0;
D_VS_70123F8 = 0x70123F8;
D_8000000 = 0x8000000;
D_8000400 = 0x8000400;
D_8000680 = 0x8000680;
D_80006A0 = 0x80006A0;
D_OPT_8000000 = 0x8000000;
D_OPT_8000400 = 0x8000400;
D_OPT_8000680 = 0x8000680;
D_OPT_80006A0 = 0x80006A0;
D_TI_8000708 = 0x8000708;
D_TI_8000D80 = 0x8000D80;
D_TI_8000D90 = 0x8000D90;
D_TI_8000FC0 = 0x8000FC0;
D_80016A0 = 0x80016A0;
D_80017A0 = 0x80017A0;
D_80017C0 = 0x80017C0;
D_80037C0 = 0x80037C0;
D_80038C0 = 0x80038C0;
D_80038E0 = 0x80038E0;
D_8003930 = 0x8003930;
D_8003950 = 0x8003950;
D_80039A8 = 0x80039A8;
D_8003A70 = 0x8003A70;
D_8003AB8 = 0x8003AB8;
D_8003AE0 = 0x8003AE0;
D_8003B28 = 0x8003B28;
D_8003B50 = 0x8003B50;
D_80046B0 = 0x80046B0;
D_8004C50 = 0x8004C50;
D_8005CD0 = 0x8005CD0;
D_8006280 = 0x8006280;
D_80064F0 = 0x80064F0;
D_80069C0 = 0x80069C0;
D_8006D10 = 0x8006D10;
D_8006E50 = 0x8006E50;
D_8007210 = 0x8007210;
D_80076E0 = 0x80076E0;
D_80079F0 = 0x80079F0;
D_80080F0 = 0x80080F0;
D_80084B0 = 0x80084B0;
D_8008A30 = 0x8008A30;
D_8008DA0 = 0x8008DA0;
D_OPT_80016A0 = 0x80016A0;
D_OPT_80017A0 = 0x80017A0;
D_OPT_80017C0 = 0x80017C0;
D_OPT_80037C0 = 0x80037C0;
D_OPT_80038C0 = 0x80038C0;
D_OPT_80038E0 = 0x80038E0;
D_OPT_8003930 = 0x8003930;
D_OPT_8003950 = 0x8003950;
D_OPT_80039A8 = 0x80039A8;
D_OPT_8003A70 = 0x8003A70;
D_OPT_8003AB8 = 0x8003AB8;
D_OPT_8003AE0 = 0x8003AE0;
D_OPT_8003B28 = 0x8003B28;
D_OPT_8003B50 = 0x8003B50;
D_OPT_80046B0 = 0x80046B0;
D_OPT_8004C50 = 0x8004C50;
D_OPT_8005CD0 = 0x8005CD0;
D_OPT_8006280 = 0x8006280;
D_OPT_80064F0 = 0x80064F0;
D_OPT_80069C0 = 0x80069C0;
D_OPT_8006D10 = 0x8006D10;
D_OPT_8006E50 = 0x8006E50;
D_OPT_8007210 = 0x8007210;
D_OPT_80076E0 = 0x80076E0;
D_OPT_80079F0 = 0x80079F0;
D_OPT_80080F0 = 0x80080F0;
D_OPT_80084B0 = 0x80084B0;
D_OPT_8008A30 = 0x8008A30;
D_OPT_8008DA0 = 0x8008DA0;
D_TI_8008FE8 = 0x8008FE8;
D_80098E0 = 0x80098E0;
D_8009980 = 0x8009980;
D_8009B00 = 0x8009B00;
D_8009CE0 = 0x8009CE0;
D_800B5E0 = 0x800B5E0;
D_800B680 = 0x800B680;
D_800C640 = 0x800C640;
D_800CD90 = 0x800CD90;
D_800D070 = 0x800D070;
D_800D170 = 0x800D170;
D_800D1F0 = 0x800D1F0;
D_800E130 = 0x800E130;
D_800E170 = 0x800E170;
D_8015550 = 0x8015550;
D_8015DF0 = 0x8015DF0;
D_8025080 = 0x8025080;
D_OPT_80098E0 = 0x80098E0;
D_OPT_8009980 = 0x8009980;
D_OPT_8009B00 = 0x8009B00;
D_OPT_8009CE0 = 0x8009CE0;
D_OPT_800B5E0 = 0x800B5E0;
D_OPT_800B680 = 0x800B680;
D_OPT_800C640 = 0x800C640;
D_OPT_800CD90 = 0x800CD90;
D_OPT_800D070 = 0x800D070;
D_OPT_800D170 = 0x800D170;
D_OPT_800D1F0 = 0x800D1F0;
D_OPT_800E130 = 0x800E130;
D_OPT_800E170 = 0x800E170;
D_OPT_8015550 = 0x8015550;
D_OPT_8015DF0 = 0x8015DF0;
D_OPT_8025080 = 0x8025080;
D_VE1_9002CF0 = 0x9002CF0;
D_VE1_9003330 = 0x9003330;
D_VE1_9003890 = 0x9003890;
src/libultra/gu/lookat.c
+1 -1
View File
@@ -1,4 +1,4 @@
#include "global.h"
#include "PR/ultratypes.h"
#include "PR/gbi.h"
#include "PR/gu.h"
src/libultra/gu/ortho.c
+1 -1
View File
@@ -1,4 +1,4 @@
#include "global.h"
#include "PR/ultratypes.h"
#include "PR/gu.h"
void guOrthoF(float mf[4][4], float l, float r, float b, float t, float n, float f, float scale) {
src/libultra/gu/sqrtf.c
+2 -1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "PR/ultratypes.h"
#include "libc/math.h"
f32 guSqrtf(f32 value) {
return sqrtf(value);
src/libultra/io/ai.c
+1 -1
View File
@@ -1,4 +1,4 @@
#include "global.h"
#include "libc/stdbool.h"
#include "PR/rcp.h"
s32 __osAiDeviceBusy(void) {
src/libultra/io/aigetlen.c
+1 -1
View File
@@ -1,4 +1,4 @@
#include "global.h"
#include "PR/rcp.h"
u32 osAiGetLength() {
return IO_READ(AI_LEN_REG);
src/libultra/io/aisetfreq.c
+1 -1
View File
@@ -1,4 +1,4 @@
#include "global.h"
#include "PR/rcp.h"
extern s32 osViClock;
src/libultra/io/controller.c
-1
View File
@@ -1,4 +1,3 @@
#include "global.h"
#include "PR/controller.h"
#include "siint.h"
src/libultra/io/motor.c
+1 -1
View File
@@ -1,4 +1,4 @@
#include "global.h"
#include "PR/controller.h"
#include "siint.h"
OSPifRam _MotorStopData[MAXCONTROLLERS] ALIGNED(8);
src/libultra/io/pidma.c
-1
View File
@@ -1,4 +1,3 @@
#include "global.h"
#include "piint.h"
s32 osPiStartDma(OSIoMesg* mb, s32 pri, s32 rw, u32 devAddr, void* dramAddr, u32 size, OSMesgQueue* piHandle) {

Some files were not shown because too many files have changed in this diff Show More