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

finish export on segment 7, rename the versus assets (#187)

Browse Source 
* versus

* ending

* ending

* header

* vs names

* errant header
This commit is contained in:
petrie911
2024-03-29 20:19:29 -03:00
committed by GitHub
parent 576d42fabd
commit 4255ef5519
25 changed files with 1447 additions and 1202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/yaml/us/ast_ending.yaml
+126
View File
@@ -0,0 +1,126 @@
:config:
segments:
- [0x07, 0xD27600]
header:
code:
- '#include "assets/ast_ending.h"'
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
- '#include "structs.h"'
D_END_7000000: { type: GFX, offset: 0x7000000, symbol: D_END_7000000}
D_END_7000118: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7000118, symbol: D_END_7000118}
D_END_7001118: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7001118, symbol: D_END_7001118}
D_END_7002120: { type: GFX, offset: 0x7002120, symbol: D_END_7002120}
D_END_7002238: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7002238, symbol: D_END_7002238}
D_END_7003238: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7003238, symbol: D_END_7003238}
D_END_7004240: { type: GFX, offset: 0x7004240, symbol: D_END_7004240}
D_END_7004620: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x7004620, symbol: D_END_7004620}
D_END_7005620: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x7005620, symbol: D_END_7005620}
D_END_7006620: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x7006620, symbol: D_END_7006620}
D_END_7007620: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x7007620, symbol: D_END_7007620}
D_END_7008620: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x7008620, symbol: D_END_7008620}
D_END_7009620: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x7009620, symbol: D_END_7009620}
D_END_700A620: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x700A620, symbol: D_END_700A620}
D_END_700B620: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x700B620, symbol: D_END_700B620}
D_END_700C620: { type: GFX, offset: 0x700C620, symbol: D_END_700C620}
D_END_700C6A8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x700C6A8, symbol: D_END_700C6A8}
D_END_700C8B0: { type: GFX, offset: 0x700C8B0, symbol: D_END_700C8B0}
D_END_700C940: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x700C940, symbol: D_END_700C940}
D_END_700D940: { type: GFX, offset: 0x700D940, symbol: D_END_700D940}
D_END_700D9D8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x700D9D8, symbol: D_END_700D9D8}
D_END_700E9E0: { type: GFX, offset: 0x700E9E0, symbol: D_END_700E9E0}
D_END_700EA38: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x700EA38, symbol: D_END_700EA38}
D_END_700F240: { type: GFX, offset: 0x700F240, symbol: D_END_700F240}
D_END_700F320: { type: GFX, offset: 0x700F320, symbol: D_END_700F320}
D_END_7010070: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x7010070, symbol: D_END_7010070}
D_END_70100F0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x70100F0, symbol: D_END_70100F0}
D_END_7010170: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x7010170, symbol: D_END_7010170}
D_END_7010970: { type: GFX, offset: 0x7010970, symbol: D_END_7010970}
D_END_7010A08: {type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x7010A08, symbol: D_END_7010A08}
D_END_7010E10: {type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 26, offset: 0x7010E10, symbol: D_END_7010E10, tlut: 0x7010EE0}
D_END_7010EE0: {type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x7010EE0, symbol: D_END_7010EE0}
D_END_7010F00: {type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 26, offset: 0x7010F00, symbol: D_END_7010F00, tlut: 0x7010FD0}
D_END_7010FD0: {type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x7010FD0, symbol: D_END_7010FD0}
D_END_7010FF0: {type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 26, offset: 0x7010FF0, symbol: D_END_7010FF0, tlut: 0x70110C0}
D_END_70110C0: {type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x70110C0, symbol: D_END_70110C0}
D_END_70110E0: {type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 26, offset: 0x70110E0, symbol: D_END_70110E0, tlut: 0x70111B0}
D_END_70111B0: {type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x70111B0, symbol: D_END_70111B0}
D_END_70111D0: { type: GFX, offset: 0x70111D0, symbol: D_END_70111D0}
D_END_70113B8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x70113B8, symbol: D_END_70113B8}
D_END_70123B8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x70123B8, symbol: D_END_70123B8}
D_END_70133B8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x70133B8, symbol: D_END_70133B8}
D_END_70143C0: { type: GFX, offset: 0x70143C0, symbol: D_END_70143C0}
D_END_7014540: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7014540, symbol: D_END_7014540}
D_END_7015540: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7015540, symbol: D_END_7015540}
D_END_7016540: { type: GFX, offset: 0x7016540, symbol: D_END_7016540}
D_END_7016658: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7016658, symbol: D_END_7016658}
D_END_7017658: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7017658, symbol: D_END_7017658}
D_END_7018708: { type: SF64:ANIM, offset: 0x7018708, symbol: D_END_7018708}
D_END_70187B4: { type: SF64:SKELETON, offset: 0x70187B4, symbol: D_END_70187B4}
D_END_7019C90: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x7019C90, symbol: D_END_7019C90}
D_END_7019D10: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x7019D10, symbol: D_END_7019D10}
D_END_7019D90: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x7019D90, symbol: D_END_7019D90}
D_END_7019E10: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x7019E10, symbol: D_END_7019E10}
D_END_7019E90: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x7019E90, symbol: D_END_7019E90}
D_END_7019F10: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x7019F10, symbol: D_END_7019F10}
D_END_7019F90: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x7019F90, symbol: D_END_7019F90}
D_END_701A010: {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x701A010, symbol: D_END_701A010}
assets/yaml/us/ast_versus.yaml
+760
View File
File diff suppressed because it is too large Load Diff
assets/yaml/us/ast_vs_menu.yaml
+208
View File
@@ -0,0 +1,208 @@
:config:
segments:
- [0x07, 0xCBFE70]
header:
code:
- '#include "assets/ast_vs_menu.h"'
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
- '#include "structs.h"'
D_VS_MENU_7000000:
{ type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 13, offset: 0x7000000, symbol: D_VS_MENU_7000000}
D_VS_MENU_70000D0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 24, height: 13, offset: 0x70000D0, symbol: D_VS_MENU_70000D0}
D_VS_MENU_7000210:
{ type: TEXTURE, ctype: u8, format: IA8, width: 24, height: 13, offset: 0x7000210, symbol: D_VS_MENU_7000210}
D_VS_MENU_7000350:
{ type: TEXTURE, ctype: u8, format: IA8, width: 24, height: 13, offset: 0x7000350, symbol: D_VS_MENU_7000350}
D_VS_MENU_7000490:
{ type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 42, offset: 0x7000490, symbol: D_VS_MENU_7000490}
D_VS_MENU_7000F10:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 7, offset: 0x7000F10, symbol: D_VS_MENU_7000F10}
D_VS_MENU_7001030:
{ type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 9, offset: 0x7001030, symbol: D_VS_MENU_7001030}
D_VS_MENU_7001270:
{ type: TEXTURE, ctype: u8, format: IA8, width: 112, height: 12, offset: 0x7001270, symbol: D_VS_MENU_7001270}
D_VS_MENU_70017B0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 10, offset: 0x70017B0, symbol: D_VS_MENU_70017B0}
D_VS_MENU_70019E0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 10, offset: 0x70019E0, symbol: D_VS_MENU_70019E0}
D_VS_MENU_7001C10:
{ type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 10, offset: 0x7001C10, symbol: D_VS_MENU_7001C10}
D_VS_MENU_7001DF0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 10, offset: 0x7001DF0, symbol: D_VS_MENU_7001DF0}
D_VS_MENU_7002110:
{ type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x7002110, symbol: D_VS_MENU_7002110}
D_VS_MENU_70024D0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 15, offset: 0x70024D0, symbol: D_VS_MENU_70024D0}
D_VS_MENU_7002730:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 15, offset: 0x7002730, symbol: D_VS_MENU_7002730}
D_VS_MENU_7002990:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 15, offset: 0x7002990, symbol: D_VS_MENU_7002990}
D_VS_MENU_7002BF0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 15, offset: 0x7002BF0, symbol: D_VS_MENU_7002BF0}
D_VS_MENU_7002E50:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 15, offset: 0x7002E50, symbol: D_VS_MENU_7002E50}
D_VS_MENU_70030B0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 12, offset: 0x70030B0, symbol: D_VS_MENU_70030B0}
D_VS_MENU_7003290:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 12, offset: 0x7003290, symbol: D_VS_MENU_7003290}
D_VS_MENU_7003470:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 12, offset: 0x7003470, symbol: D_VS_MENU_7003470}
D_VS_MENU_7003650:
{ type: TEXTURE, ctype: u8, format: IA8, width: 40, height: 12, offset: 0x7003650, symbol: D_VS_MENU_7003650}
D_VS_MENU_7003830:
{ type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 17, offset: 0x7003830, symbol: D_VS_MENU_7003830}
D_VS_MENU_7003C70:
{ type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x7003C70, symbol: D_VS_MENU_7003C70}
D_VS_MENU_7003D70:
{ type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 5, offset: 0x7003D70, symbol: D_VS_MENU_7003D70}
D_VS_MENU_7003E10:
{ type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x7003E10, symbol: D_VS_MENU_7003E10}
D_VS_MENU_7003F10:
{ type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x7003F10, symbol: D_VS_MENU_7003F10}
D_VS_MENU_7004010:
{ type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x7004010, symbol: D_VS_MENU_7004010}
D_VS_MENU_7004050:
{ type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x7004050, symbol: D_VS_MENU_7004050, tlut: 0x7004150}
D_VS_MENU_7004150:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 76, offset: 0x7004150, symbol: D_VS_MENU_7004150}
D_VS_MENU_70041F0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x70041F0, symbol: D_VS_MENU_70041F0, tlut: 0x70042F0}
D_VS_MENU_70042F0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 53, offset: 0x70042F0, symbol: D_VS_MENU_70042F0}
D_VS_MENU_7004360:
{ type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x7004360, symbol: D_VS_MENU_7004360, tlut: 0x7004460}
D_VS_MENU_7004460:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 50, offset: 0x7004460, symbol: D_VS_MENU_7004460}
D_VS_MENU_70044D0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 64, height: 19, offset: 0x70044D0, symbol: D_VS_MENU_70044D0, tlut: 0x7004990}
D_VS_MENU_7004990:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 17, offset: 0x7004990, symbol: D_VS_MENU_7004990}
D_VS_MENU_70049C0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 56, height: 8, offset: 0x70049C0, symbol: D_VS_MENU_70049C0, tlut: 0x7004B80}
D_VS_MENU_7004B80:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 18, offset: 0x7004B80, symbol: D_VS_MENU_7004B80}
D_VS_MENU_7004BB0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 48, height: 10, offset: 0x7004BB0, symbol: D_VS_MENU_7004BB0, tlut: 0x7004D90}
D_VS_MENU_7004D90:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 18, offset: 0x7004D90, symbol: D_VS_MENU_7004D90}
D_VS_MENU_7004DC0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 56, height: 10, offset: 0x7004DC0, symbol: D_VS_MENU_7004DC0, tlut: 0x7004FF0}
D_VS_MENU_7004FF0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 18, offset: 0x7004FF0, symbol: D_VS_MENU_7004FF0}
D_VS_MENU_7005020:
{ type: TEXTURE, ctype: u8, format: CI8, width: 48, height: 8, offset: 0x7005020, symbol: D_VS_MENU_7005020, tlut: 0x70051A0}
D_VS_MENU_70051A0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 18, offset: 0x70051A0, symbol: D_VS_MENU_70051A0}
D_VS_MENU_70051D0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x70051D0, symbol: D_VS_MENU_70051D0, tlut: 0x70055D0}
D_VS_MENU_70055D0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 20, offset: 0x70055D0, symbol: D_VS_MENU_70055D0}
D_VS_MENU_7005600:
{ type: TEXTURE, ctype: u8, format: CI8, width: 48, height: 38, offset: 0x7005600, symbol: D_VS_MENU_7005600, tlut: 0x7005D20}
D_VS_MENU_7005D20:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x7005D20, symbol: D_VS_MENU_7005D20}
D_VS_MENU_7005F10:
{ type: TEXTURE, ctype: u8, format: CI8, width: 48, height: 38, offset: 0x7005F10, symbol: D_VS_MENU_7005F10, tlut: 0x7006630}
D_VS_MENU_7006630:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 168, offset: 0x7006630, symbol: D_VS_MENU_7006630}
D_VS_MENU_7006780:
{ type: TEXTURE, ctype: u8, format: CI8, width: 48, height: 38, offset: 0x7006780, symbol: D_VS_MENU_7006780, tlut: 0x7006EA0}
D_VS_MENU_7006EA0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x7006EA0, symbol: D_VS_MENU_7006EA0}
D_VS_MENU_70070A0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x70070A0, symbol: D_VS_MENU_70070A0}
D_VS_MENU_7007FC0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x7007FC0, symbol: D_VS_MENU_7007FC0}
D_VS_MENU_7008EE0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x7008EE0, symbol: D_VS_MENU_7008EE0}
D_VS_MENU_7009E00:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x7009E00, symbol: D_VS_MENU_7009E00}
D_VS_MENU_700AD20:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x700AD20, symbol: D_VS_MENU_700AD20}
D_VS_MENU_700BC40:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x700BC40, symbol: D_VS_MENU_700BC40}
D_VS_MENU_700CB60:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x700CB60, symbol: D_VS_MENU_700CB60}
D_VS_MENU_700DA80:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x700DA80, symbol: D_VS_MENU_700DA80}
D_VS_MENU_700E9A0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 144, height: 42, offset: 0x700E9A0, symbol: D_VS_MENU_700E9A0}
D_VS_MENU_70118E0:
{ type: TEXTURE, ctype: u8, format: CI4, width: 80, height: 71, offset: 0x70118E0, symbol: D_VS_MENU_70118E0, tlut: 0x70123F8}
D_VS_MENU_70123F8:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 5, offset: 0x70123F8, symbol: D_VS_MENU_70123F8}
D_VS_MENU_7012410:
{ type: GFX, offset: 0x7012410, symbol: D_VS_MENU_7012410}
D_VS_MENU_70124E8:
{ type: TEXTURE, ctype: u8, format: CI8, width: 8, height: 16, offset: 0x70124E8, symbol: D_VS_MENU_70124E8, tlut: 0x7012568}
D_VS_MENU_7012568:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 24, offset: 0x7012568, symbol: D_VS_MENU_7012568}
assets/yaml/us/ast_vs_player.yaml
-760
View File
File diff suppressed because it is too large Load Diff
include/assets/ast_ending.h
-34
View File
@@ -1,34 +0,0 @@
#ifndef AST_ENDING_H
#define AST_ENDING_H
#include "gfx.h"
#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_versus.h
-64
View File
@@ -1,64 +0,0 @@
#ifndef AST_VERSUS_H
#define AST_VERSUS_H
#include "gfx.h"
#include "sf64object.h"
#include "structs.h"
extern u8 D_VS_7000000[];
extern u8 D_VS_70000D0[];
extern u8 D_VS_7000210[];
extern u8 D_VS_7000350[];
extern u8 D_VS_7000F10[]; // fox_option
extern u8 D_VS_7001030[]; // fox_option
extern u8 D_VS_7001270[]; // fox_option
extern u8 D_VS_70017B0[];
extern u8 D_VS_70019E0[];
extern u8 D_VS_7001C10[];
extern u8 D_VS_7001DF0[]; // fox_option
extern u8 D_VS_7002110[]; // fox_option
extern u8 D_VS_70024D0[];
extern u8 D_VS_7002730[];
extern u8 D_VS_7002990[];
extern u8 D_VS_7002BF0[];
extern u8 D_VS_7002E50[];
extern u8 D_VS_70030B0[];
extern u8 D_VS_7003290[];
extern u8 D_VS_7003470[];
extern u8 D_VS_7003650[]; // fox_option
extern u8 D_VS_7003830[]; // fox_versus
extern u8 D_VS_7003C70[]; // fox_versus
extern u8 D_VS_7003E10[]; // fox_versus
extern u8 D_VS_7003F10[]; // fox_versus
extern u8 D_VS_7004010[]; // fox_option
extern u8 D_VS_7004050[]; // fox_versus
extern u16 D_VS_7004150[]; // fox_versus
extern u8 D_VS_70041F0[]; // fox_versus
extern u16 D_VS_70042F0[]; // fox_versus
extern u8 D_VS_7004360[]; // fox_versus
extern u16 D_VS_7004460[]; // fox_versus
extern u8 D_VS_70044D0[]; // fox_versus
extern u16 D_VS_7004990[]; // fox_versus
extern u8 D_VS_70049C0[];
extern u16 D_VS_7004B80[];
extern u8 D_VS_7004BB0[];
extern u16 D_VS_7004D90[];
extern u8 D_VS_7004DC0[];
extern u16 D_VS_7004FF0[];
extern u8 D_VS_7005020[];
extern u16 D_VS_70051A0[];
extern u8 D_VS_7005600[];
extern u16 D_VS_7005D20[];
extern u8 D_VS_7005F10[];
extern u16 D_VS_7006630[];
extern u8 D_VS_7006780[];
extern u16 D_VS_7006EA0[];
extern u16 D_VS_70070A0[];
extern u16 D_VS_7008EE0[];
extern u16 D_VS_700AD20[];
extern u16 D_VS_700CB60[];
extern u16 D_VS_700E9A0[]; // fox_option
extern u8 D_VS_70118E0[]; // fox_versus, fox_option
extern u16 D_VS_70123F8[]; // fox_versus, fox_option
#endif
include/sf64dma.h
+2 -2
View File
@@ -133,7 +133,7 @@ DECLARE_SEGMENT(ast_bg_planet);
DECLARE_SEGMENT(ast_arwing);
DECLARE_SEGMENT(ast_landmaster);
DECLARE_SEGMENT(ast_blue_marine);
DECLARE_SEGMENT(ast_vs_player);
DECLARE_SEGMENT(ast_versus);
DECLARE_SEGMENT(ast_enmy_planet);
DECLARE_SEGMENT(ast_enmy_space);
DECLARE_SEGMENT(ast_great_fox);
@@ -165,7 +165,7 @@ DECLARE_SEGMENT(ast_warp_zone);
DECLARE_SEGMENT(ast_title);
DECLARE_SEGMENT(ast_map);
DECLARE_SEGMENT(ast_option);
DECLARE_SEGMENT(ast_versus);
DECLARE_SEGMENT(ast_vs_menu);
DECLARE_SEGMENT(ast_font);
DECLARE_SEGMENT(ast_font_3d);
DECLARE_SEGMENT(ast_andross);
linker_scripts/us/undefined_syms.ld
+159 -159
View File
@@ -90,29 +90,29 @@ D_BG_PLANET_20101A0 = 0x020101A0;
D_arwing_3001C90 = 0x03001C90;
D_arwing_3003CE0 = 0x03003CE0;
D_arwing_3007650 = 0x03007650;
D_vs_player_3012ED0 = 0x03012ED0;
D_vs_player_3013580 = 0x03013580;
D_vs_player_3013780 = 0x03013780;
D_vs_player_3016B00 = 0x03016B00;
D_versus_3012ED0 = 0x03012ED0;
D_versus_3013580 = 0x03013580;
D_versus_3013780 = 0x03013780;
D_versus_3016B00 = 0x03016B00;
D_arwing_3016CC0 = 0x03016CC0;
D_vs_player_30173C0 = 0x030173C0;
D_vs_player_30174E0 = 0x030174E0;
D_vs_player_3017600 = 0x03017600;
D_vs_player_301B080 = 0x0301B080;
D_vs_player_302ED4C = 0x0302ED4C;
D_vs_player_302ED98 = 0x0302ED98;
D_vs_player_302EDB4 = 0x0302EDB4;
D_vs_player_302EE00 = 0x0302EE00;
D_vs_player_302EE64 = 0x0302EE64;
D_vs_player_302EE80 = 0x0302EE80;
D_vs_player_302EE9C = 0x0302EE9C;
D_vs_player_302EEE8 = 0x0302EEE8;
D_versus_30173C0 = 0x030173C0;
D_versus_30174E0 = 0x030174E0;
D_versus_3017600 = 0x03017600;
D_versus_301B080 = 0x0301B080;
D_versus_302ED4C = 0x0302ED4C;
D_versus_302ED98 = 0x0302ED98;
D_versus_302EDB4 = 0x0302EDB4;
D_versus_302EE00 = 0x0302EE00;
D_versus_302EE64 = 0x0302EE64;
D_versus_302EE80 = 0x0302EE80;
D_versus_302EE9C = 0x0302EE9C;
D_versus_302EEE8 = 0x0302EEE8;
D_arwing_302EF00 = 0x0302EF00;
D_vs_player_302EF6C = 0x0302EF6C;
D_versus_302EF6C = 0x0302EF6C;
D_arwing_302EF84 = 0x0302EF84;
D_vs_player_302EFF0 = 0x0302EFF0;
D_versus_302EFF0 = 0x0302EFF0;
D_arwing_302F008 = 0x0302F008;
D_vs_player_302F044 = 0x0302F044;
D_versus_302F044 = 0x0302F044;
D_arwing_302F098 = 0x0302F098;
D_5000000 = 0x05000000;
@@ -573,20 +573,20 @@ D_FONT3D_9004230 = 0x09004230;
// fox_versus
D_vs_player_30087A0 = 0x030087A0;
D_vs_player_3008DE0 = 0x03008DE0;
D_vs_player_3008EC0 = 0x03008EC0;
D_vs_player_30098C0 = 0x030098C0;
D_vs_player_3009990 = 0x03009990;
D_vs_player_300A390 = 0x0300A390;
D_vs_player_3006A68 = 0x03006A68;
D_vs_player_3008598 = 0x03008598;
D_vs_player_300C458 = 0x0300C458;
D_vs_player_3005E38 = 0x03005E38;
D_vs_player_3006040 = 0x03006040;
D_vs_player_30076C0 = 0x030076C0;
D_vs_player_300B3F0 = 0x0300B3F0;
D_vs_player_3004F60 = 0x03004F60;
D_versus_30087A0 = 0x030087A0;
D_versus_3008DE0 = 0x03008DE0;
D_versus_3008EC0 = 0x03008EC0;
D_versus_30098C0 = 0x030098C0;
D_versus_3009990 = 0x03009990;
D_versus_300A390 = 0x0300A390;
D_versus_3006A68 = 0x03006A68;
D_versus_3008598 = 0x03008598;
D_versus_300C458 = 0x0300C458;
D_versus_3005E38 = 0x03005E38;
D_versus_3006040 = 0x03006040;
D_versus_30076C0 = 0x030076C0;
D_versus_300B3F0 = 0x0300B3F0;
D_versus_3004F60 = 0x03004F60;
// fox_hud, to be ordered later
D_101C170 = 0x0101C170;
@@ -998,26 +998,26 @@ 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;
D_VS_MENU_70030B0 = 0x070030B0;
D_VS_MENU_7003290 = 0x07003290;
D_VS_MENU_7003470 = 0x07003470;
D_TI2_70049C0 = 0x070049C0;
D_VS_7004BB0 = 0x07004BB0;
D_VS_7004DC0 = 0x07004DC0;
D_VS_7005020 = 0x07005020;
D_VS_7004B80 = 0x07004B80;
D_VS_7004D90 = 0x07004D90;
D_VS_7004FF0 = 0x07004FF0;
D_VS_70051A0 = 0x070051A0;
D_VS_7008EE0 = 0x07008EE0;
D_VS_700AD20 = 0x0700AD20;
D_VS_700CB60 = 0x0700CB60;
D_VS_70070A0 = 0x070070A0;
D_VS_7000000 = 0x07000000;
D_VS_MENU_7004BB0 = 0x07004BB0;
D_VS_MENU_7004DC0 = 0x07004DC0;
D_VS_MENU_7005020 = 0x07005020;
D_VS_MENU_7004B80 = 0x07004B80;
D_VS_MENU_7004D90 = 0x07004D90;
D_VS_MENU_7004FF0 = 0x07004FF0;
D_VS_MENU_70051A0 = 0x070051A0;
D_VS_MENU_7008EE0 = 0x07008EE0;
D_VS_MENU_700AD20 = 0x0700AD20;
D_VS_MENU_700CB60 = 0x0700CB60;
D_VS_MENU_70070A0 = 0x070070A0;
D_VS_MENU_7000000 = 0x07000000;
D_END_7000000 = 0x07000000;
D_VS_70000D0 = 0x070000D0;
D_VS_7000210 = 0x07000210;
D_VS_7000350 = 0x07000350;
D_VS_MENU_70000D0 = 0x070000D0;
D_VS_MENU_7000210 = 0x07000210;
D_VS_MENU_7000350 = 0x07000350;
D_FONT3D_90086F0 = 0x090086F0;
D_FONT3D_9007FD0 = 0x09007FD0;
D_FONT3D_9007BB0 = 0x09007BB0;
@@ -1055,24 +1055,24 @@ D_FONT3D_9009990 = 0x09009990;
D_FONT3D_9009280 = 0x09009280;
D_FONT3D_9008C60 = 0x09008C60;
D_FONT3D_9000000 = 0x09000000;
D_VS_70017B0 = 0x070017B0;
D_VS_70019E0 = 0x070019E0;
D_VS_7005600 = 0x07005600;
D_VS_7005F10 = 0x07005F10;
D_VS_7005D20 = 0x07005D20;
D_VS_7006630 = 0x07006630;
D_VS_7001C10 = 0x07001C10;
D_VS_7006780 = 0x07006780;
D_VS_70019E0 = 0x070019E0;
D_VS_7005F10 = 0x07005F10;
D_VS_7006EA0 = 0x07006EA0;
D_VS_7006630 = 0x07006630;
D_VS_70024D0 = 0x070024D0;
D_VS_MENU_70017B0 = 0x070017B0;
D_VS_MENU_70019E0 = 0x070019E0;
D_VS_MENU_7005600 = 0x07005600;
D_VS_MENU_7005F10 = 0x07005F10;
D_VS_MENU_7005D20 = 0x07005D20;
D_VS_MENU_7006630 = 0x07006630;
D_VS_MENU_7001C10 = 0x07001C10;
D_VS_MENU_7006780 = 0x07006780;
D_VS_MENU_70019E0 = 0x070019E0;
D_VS_MENU_7005F10 = 0x07005F10;
D_VS_MENU_7006EA0 = 0x07006EA0;
D_VS_MENU_7006630 = 0x07006630;
D_VS_MENU_70024D0 = 0x070024D0;
D_TI1_7002730 = 0x07002730;
D_VS_7002730 = 0x07002730;
D_VS_7002990 = 0x07002990;
D_VS_7002BF0 = 0x07002BF0;
D_VS_7002E50 = 0x07002E50;
D_VS_MENU_7002730 = 0x07002730;
D_VS_MENU_7002990 = 0x07002990;
D_VS_MENU_7002BF0 = 0x07002BF0;
D_VS_MENU_7002E50 = 0x07002E50;
// fox_ti
D_TI1_700DDF0 = 0x0700DDF0;
@@ -1098,7 +1098,7 @@ D_TI2_7009700 = 0x07009700;
D_TI2_7004E80 = 0x07004E80;
D_TI2_70049C0 = 0x070049C0;
D_TI2_70045D0 = 0x070045D0;
D_VS_70049C0 = 0x070049C0;
D_VS_MENU_70049C0 = 0x070049C0;
D_TI_A001FA0 = 0x0A001FA0;
D_TI_900FE80 = 0x0900FE80;
D_TI_80018D0 = 0x080018D0;
@@ -1236,98 +1236,98 @@ D_BG_PLANET_200D750 = 0x200D750;
D_BG_PLANET_2010A30 = 0x2010A30;
D_BG_PLANET_20112C0 = 0x20112C0;
D_arwing_3000090 = 0x3000090;
D_vs_player_3000120 = 0x3000120;
D_versus_3000120 = 0x3000120;
D_blue_marine_3000130 = 0x3000130;
D_vs_player_30001E0 = 0x30001E0;
D_vs_player_3000380 = 0x3000380;
D_vs_player_30003A0 = 0x30003A0;
D_versus_30001E0 = 0x30001E0;
D_versus_3000380 = 0x3000380;
D_versus_30003A0 = 0x30003A0;
D_blue_marine_3000470 = 0x3000470;
D_vs_player_30004E0 = 0x30004E0;
D_vs_player_3000510 = 0x3000510;
D_versus_30004E0 = 0x30004E0;
D_versus_3000510 = 0x3000510;
D_blue_marine_3000660 = 0x3000660;
D_vs_player_30006A0 = 0x30006A0;
D_vs_player_30006D0 = 0x30006D0;
D_vs_player_3000810 = 0x3000810;
D_versus_30006A0 = 0x30006A0;
D_versus_30006D0 = 0x30006D0;
D_versus_3000810 = 0x3000810;
D_blue_marine_3000AF0 = 0x3000AF0;
D_vs_player_3000B20 = 0x3000B20;
D_vs_player_3000BC0 = 0x3000BC0;
D_versus_3000B20 = 0x3000B20;
D_versus_3000BC0 = 0x3000BC0;
D_blue_marine_3000C70 = 0x3000C70;
D_vs_player_30013E0 = 0x30013E0;
D_vs_player_3001420 = 0x3001420;
D_vs_player_3003E20 = 0x3003E20;
D_vs_player_3004010 = 0x3004010;
D_vs_player_3004D58 = 0x3004D58;
D_versus_30013E0 = 0x30013E0;
D_versus_3001420 = 0x3001420;
D_versus_3003E20 = 0x3003E20;
D_versus_3004010 = 0x3004010;
D_versus_3004D58 = 0x3004D58;
D_blue_marine_3005980 = 0x3005980;
D_arwing_3005AB0 = 0x3005AB0;
D_blue_marine_3006AF0 = 0x3006AF0;
D_vs_player_3006C60 = 0x3006C60;
D_versus_3006C60 = 0x3006C60;
D_blue_marine_3006C70 = 0x3006C70;
D_vs_player_3007500 = 0x3007500;
D_vs_player_300A470 = 0x300A470;
D_vs_player_300B218 = 0x300B218;
D_vs_player_300D350 = 0x300D350;
D_vs_player_300D398 = 0x300D398;
D_vs_player_300D3C0 = 0x300D3C0;
D_vs_player_300D408 = 0x300D408;
D_vs_player_300D440 = 0x300D440;
D_vs_player_300D500 = 0x300D500;
D_vs_player_300D550 = 0x300D550;
D_vs_player_300EE80 = 0x300EE80;
D_vs_player_300FB80 = 0x300FB80;
D_vs_player_3010A90 = 0x3010A90;
D_vs_player_3011470 = 0x3011470;
D_versus_3007500 = 0x3007500;
D_versus_300A470 = 0x300A470;
D_versus_300B218 = 0x300B218;
D_versus_300D350 = 0x300D350;
D_versus_300D398 = 0x300D398;
D_versus_300D3C0 = 0x300D3C0;
D_versus_300D408 = 0x300D408;
D_versus_300D440 = 0x300D440;
D_versus_300D500 = 0x300D500;
D_versus_300D550 = 0x300D550;
D_versus_300EE80 = 0x300EE80;
D_versus_300FB80 = 0x300FB80;
D_versus_3010A90 = 0x3010A90;
D_versus_3011470 = 0x3011470;
D_arwing_3011720 = 0x3011720;
D_vs_player_3011E40 = 0x3011E40;
D_versus_3011E40 = 0x3011E40;
D_arwing_30131F0 = 0x30131F0;
D_vs_player_30146B0 = 0x30146B0;
D_versus_30146B0 = 0x30146B0;
D_arwing_3014BF0 = 0x3014BF0;
D_arwing_3015120 = 0x3015120;
D_arwing_30155E0 = 0x30155E0;
D_vs_player_3015740 = 0x3015740;
D_versus_3015740 = 0x3015740;
D_arwing_3015AF4 = 0x3015AF4;
D_arwing_3015C28 = 0x3015C28;
D_arwing_3015D80 = 0x3015D80;
D_vs_player_30160A0 = 0x30160A0;
D_versus_30160A0 = 0x30160A0;
D_arwing_30163C4 = 0x30163C4;
D_arwing_3016610 = 0x3016610;
D_arwing_3016660 = 0x3016660;
D_arwing_3016B30 = 0x3016B30;
D_arwing_30183D0 = 0x30183D0;
D_arwing_30184D8 = 0x30184D8;
D_vs_player_3018800 = 0x3018800;
D_versus_3018800 = 0x3018800;
D_arwing_30194E0 = 0x30194E0;
D_vs_player_301AD60 = 0x301AD60;
D_vs_player_301AEF0 = 0x301AEF0;
D_vs_player_301B6E0 = 0x301B6E0;
D_vs_player_301C3A8 = 0x301C3A8;
D_vs_player_301C614 = 0x301C614;
D_vs_player_301CFEC = 0x301CFEC;
D_vs_player_301D258 = 0x301D258;
D_vs_player_301D888 = 0x301D888;
D_vs_player_301DB94 = 0x301DB94;
D_vs_player_301E19C = 0x301E19C;
D_vs_player_301E3E8 = 0x301E3E8;
D_vs_player_301E570 = 0x301E570;
D_vs_player_301F140 = 0x301F140;
D_vs_player_301FD20 = 0x301FD20;
D_vs_player_302D120 = 0x302D120;
D_vs_player_302D240 = 0x302D240;
D_vs_player_302D4D0 = 0x302D4D0;
D_vs_player_302DD70 = 0x302DD70;
D_vs_player_302DDB4 = 0x302DDB4;
D_vs_player_302DDF8 = 0x302DDF8;
D_vs_player_302DE3C = 0x302DE3C;
D_vs_player_302E0E4 = 0x302E0E4;
D_vs_player_302E170 = 0x302E170;
D_vs_player_302E378 = 0x302E378;
D_vs_player_302E56C = 0x302E56C;
D_vs_player_302E65C = 0x302E65C;
D_vs_player_302E74C = 0x302E74C;
D_vs_player_302E830 = 0x302E830;
D_vs_player_302E95C = 0x302E95C;
D_vs_player_302EA4C = 0x302EA4C;
D_vs_player_302EB3C = 0x302EB3C;
D_vs_player_302EC20 = 0x302EC20;
D_versus_301AD60 = 0x301AD60;
D_versus_301AEF0 = 0x301AEF0;
D_versus_301B6E0 = 0x301B6E0;
D_versus_301C3A8 = 0x301C3A8;
D_versus_301C614 = 0x301C614;
D_versus_301CFEC = 0x301CFEC;
D_versus_301D258 = 0x301D258;
D_versus_301D888 = 0x301D888;
D_versus_301DB94 = 0x301DB94;
D_versus_301E19C = 0x301E19C;
D_versus_301E3E8 = 0x301E3E8;
D_versus_301E570 = 0x301E570;
D_versus_301F140 = 0x301F140;
D_versus_301FD20 = 0x301FD20;
D_versus_302D120 = 0x302D120;
D_versus_302D240 = 0x302D240;
D_versus_302D4D0 = 0x302D4D0;
D_versus_302DD70 = 0x302DD70;
D_versus_302DDB4 = 0x302DDB4;
D_versus_302DDF8 = 0x302DDF8;
D_versus_302DE3C = 0x302DE3C;
D_versus_302E0E4 = 0x302E0E4;
D_versus_302E170 = 0x302E170;
D_versus_302E378 = 0x302E378;
D_versus_302E56C = 0x302E56C;
D_versus_302E65C = 0x302E65C;
D_versus_302E74C = 0x302E74C;
D_versus_302E830 = 0x302E830;
D_versus_302E95C = 0x302E95C;
D_versus_302EA4C = 0x302EA4C;
D_versus_302EB3C = 0x302EB3C;
D_versus_302EC20 = 0x302EC20;
D_ENMY_PLANET_4000080 = 0x4000080;
D_ENMY_PLANET_400014C = 0x400014C;
D_5000200 = 0x5000200;
@@ -1869,31 +1869,31 @@ D_604D680 = 0x604D680;
D_605A120 = 0x605A120;
D_605C230 = 0x605C230;
D_TI1_7000A80 = 0x7000A80;
D_VS_7000F10 = 0x7000F10;
D_VS_7001030 = 0x7001030;
D_VS_7001270 = 0x7001270;
D_VS_MENU_7000F10 = 0x7000F10;
D_VS_MENU_7001030 = 0x7001030;
D_VS_MENU_7001270 = 0x7001270;
D_WZ_7001540 = 0x7001540;
D_VS_7001DF0 = 0x7001DF0;
D_VS_7002110 = 0x7002110;
D_VS_MENU_7001DF0 = 0x7001DF0;
D_VS_MENU_7002110 = 0x7002110;
D_END_7002120 = 0x7002120;
D_TI1_7002270 = 0x7002270;
D_TI1_7002490 = 0x7002490;
D_VS_7003650 = 0x7003650;
D_VS_7003830 = 0x7003830;
D_VS_7003C70 = 0x7003C70;
D_VS_7003E10 = 0x7003E10;
D_VS_MENU_7003650 = 0x7003650;
D_VS_MENU_7003830 = 0x7003830;
D_VS_MENU_7003C70 = 0x7003C70;
D_VS_MENU_7003E10 = 0x7003E10;
D_TI2_7003EE8 = 0x7003EE8;
D_VS_7003F10 = 0x7003F10;
D_VS_7004010 = 0x7004010;
D_VS_7004050 = 0x7004050;
D_VS_7004150 = 0x7004150;
D_VS_70041F0 = 0x70041F0;
D_VS_MENU_7003F10 = 0x7003F10;
D_VS_MENU_7004010 = 0x7004010;
D_VS_MENU_7004050 = 0x7004050;
D_VS_MENU_7004150 = 0x7004150;
D_VS_MENU_70041F0 = 0x70041F0;
D_END_7004240 = 0x7004240;
D_VS_70042F0 = 0x70042F0;
D_VS_7004360 = 0x7004360;
D_VS_7004460 = 0x7004460;
D_VS_70044D0 = 0x70044D0;
D_VS_7004990 = 0x7004990;
D_VS_MENU_70042F0 = 0x70042F0;
D_VS_MENU_7004360 = 0x7004360;
D_VS_MENU_7004460 = 0x7004460;
D_VS_MENU_70044D0 = 0x70044D0;
D_VS_MENU_7004990 = 0x7004990;
D_TI2_7005300 = 0x7005300;
D_TI1_70067C4 = 0x70067C4;
D_TI1_7006990 = 0x7006990;
@@ -1924,7 +1924,7 @@ D_TI1_700D534 = 0x700D534;
D_TI1_700D700 = 0x700D700;
D_TI2_700E244 = 0x700E244;
D_TI1_700E3F0 = 0x700E3F0;
D_VS_700E9A0 = 0x700E9A0;
D_VS_MENU_700E9A0 = 0x700E9A0;
D_END_700E9E0 = 0x700E9E0;
D_END_700EA38 = 0x700EA38;
D_END_700F240 = 0x700F240;
@@ -1938,9 +1938,9 @@ D_END_7010FF0 = 0x7010FF0;
D_END_70110C0 = 0x70110C0;
D_END_70110E0 = 0x70110E0;
D_END_70111B0 = 0x70111B0;
D_VS_70118E0 = 0x70118E0;
D_VS_MENU_70118E0 = 0x70118E0;
D_END_70122E0 = 0x70122E0;
D_VS_70123F8 = 0x70123F8;
D_VS_MENU_70123F8 = 0x70123F8;
D_OPT_8000000 = 0x8000000;
D_OPT_8000400 = 0x8000400;
D_OPT_8000680 = 0x8000680;
src/main/dmatable.c
+2 -2
View File
@@ -22,7 +22,7 @@ DmaEntry gDmaTable[90] = {
{ SEGMENT_ROM_START(ast_blue_marine),
{ SEGMENT_ROM_START(ast_blue_marine), SEGMENT_ROM_END(ast_blue_marine) },
false },
{ SEGMENT_ROM_START(ast_vs_player), { SEGMENT_ROM_START(ast_vs_player), SEGMENT_ROM_END(ast_vs_player) }, false },
{ SEGMENT_ROM_START(ast_versus), { SEGMENT_ROM_START(ast_versus), SEGMENT_ROM_END(ast_versus) }, false },
{ SEGMENT_ROM_START(ast_enmy_planet),
{ SEGMENT_ROM_START(ast_enmy_planet), SEGMENT_ROM_END(ast_enmy_planet) },
false },
@@ -58,7 +58,7 @@ DmaEntry gDmaTable[90] = {
{ SEGMENT_ROM_START(ast_title), { SEGMENT_ROM_START(ast_title), SEGMENT_ROM_END(ast_title) }, false },
{ SEGMENT_ROM_START(ast_map), { SEGMENT_ROM_START(ast_map), SEGMENT_ROM_END(ast_map) }, false },
{ SEGMENT_ROM_START(ast_option), { SEGMENT_ROM_START(ast_option), SEGMENT_ROM_END(ast_option) }, false },
{ SEGMENT_ROM_START(ast_versus), { SEGMENT_ROM_START(ast_versus), SEGMENT_ROM_END(ast_versus) }, false },
{ SEGMENT_ROM_START(ast_vs_menu), { SEGMENT_ROM_START(ast_vs_menu), SEGMENT_ROM_END(ast_vs_menu) }, false },
{ SEGMENT_ROM_START(ast_font), { SEGMENT_ROM_START(ast_font), SEGMENT_ROM_END(ast_font) }, false },
{ SEGMENT_ROM_START(ast_font_3d), { SEGMENT_ROM_START(ast_font_3d), SEGMENT_ROM_END(ast_font_3d) }, false },
{ SEGMENT_ROM_START(ast_andross), { SEGMENT_ROM_START(ast_andross), SEGMENT_ROM_END(ast_andross) }, false },
src/main/fox_360.c
+2 -2
View File
@@ -3,7 +3,7 @@
#include "assets.h"
#include "assets/ast_star_wolf.h"
#include "assets/ast_allies.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_enmy_planet.h"
#include "assets/ast_sector_z.h"
@@ -2274,7 +2274,7 @@ void func_80035448(Actor* actor) {
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1);
Animation_DrawSkeleton(0, D_600C2AC, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
} else if (gCurrentLevel == LEVEL_VERSUS) {
gSPDisplayList(gMasterDisp++, D_vs_player_3015740);
gSPDisplayList(gMasterDisp++, D_versus_3015740);
} else if (gCurrentLevel == LEVEL_TRAINING) {
if (actor->unk_0E6 == 0) {
gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F00F200);
src/main/fox_A4290_colheaders.c
+9 -9
View File
@@ -7,7 +7,7 @@
#include "assets/ast_macbeth.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
static Vec3f D_800D2920[16] = {
{ 1075.0f, 0.0f, 0.0f }, { 746.0f, 0.0f, -746.0f }, { 202.0f, 361.0f, -202.0f }, { 0.0f, 0.0f, -1075.0f },
@@ -137,22 +137,22 @@ CollisionHeader2 D_800D2CA0[19] = {
{ -498.0f, -10.0f, -498.0f },
{ 498.0f, 705.0f, 498.0f },
4,
D_vs_player_302EEE8,
D_vs_player_302EF00,
D_versus_302EEE8,
D_versus_302EF00,
},
{
{ -1494.0f, -30.0f, -1494.0f },
{ 1494.0f, 2115.0f, 1494.0f },
4,
D_vs_player_302EF6C,
D_vs_player_302EF84,
D_versus_302EF6C,
D_versus_302EF84,
},
{
{ -623.0f, -10.0f, -623.0f },
{ 623.0f, 200.0f, 623.0f },
4,
D_vs_player_302EFF0,
D_vs_player_302F008,
D_versus_302EFF0,
D_versus_302F008,
},
{
{ -488.0f, 0.0f, -568.0f },
@@ -228,8 +228,8 @@ CollisionHeader2 D_800D2CA0[19] = {
{ -2965.0f, -16.0f, -2965.0f },
{ 2965.0f, 544.0f, 2965.0f },
14,
D_vs_player_302F044,
D_vs_player_302F098,
D_versus_302F044,
D_versus_302F098,
},
{
{ -814.0f, 0.0f, -691.0f },
src/main/fox_beam.c
+10 -10
View File
@@ -2,7 +2,7 @@
#include "assets/ast_landmaster.h"
#include "assets/ast_aquas.h"
#include "assets/ast_great_fox.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
static Vec3f D_8015F950;
@@ -1189,12 +1189,12 @@ void func_80039210(PlayerShot* shot) {
if (gLaserStrength[shot->playerNum] != LASERS_SINGLE) {
Matrix_Translate(gGfxMatrix, 6.0f, 0.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_302D120);
gSPDisplayList(gMasterDisp++, D_versus_302D120);
Matrix_Translate(gGfxMatrix, -12.0f, 0.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_302D120);
gSPDisplayList(gMasterDisp++, D_versus_302D120);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_302D120);
gSPDisplayList(gMasterDisp++, D_versus_302D120);
}
}
}
@@ -1324,13 +1324,13 @@ void func_80039A50(PlayerShot* shot) {
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 70.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_301AD60);
gSPDisplayList(gMasterDisp++, D_versus_301AD60);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, -50.0f, 0.0f, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 70.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_301AD60);
gSPDisplayList(gMasterDisp++, D_versus_301AD60);
} else {
if (!(gGameFrameCount & 1)) {
var_fv1 = M_PI;
@@ -1341,7 +1341,7 @@ void func_80039A50(PlayerShot* shot) {
Matrix_RotateZ(gGfxMatrix, 30.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_301AD60);
gSPDisplayList(gMasterDisp++, D_versus_301AD60);
}
} else {
if (!(gGameFrameCount & 1)) {
@@ -1373,13 +1373,13 @@ void func_80039A50(PlayerShot* shot) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.f, 40.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_301AEF0);
gSPDisplayList(gMasterDisp++, D_versus_301AEF0);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.f, -40.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_301AEF0);
gSPDisplayList(gMasterDisp++, D_versus_301AEF0);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_301AEF0);
gSPDisplayList(gMasterDisp++, D_versus_301AEF0);
}
break;
case PLAYERSHOT_8:
src/main/fox_bg.c
+9 -9
View File
@@ -18,7 +18,7 @@ UNK_TYPE D_8015F988[0x683]; // Unused? Close to being [13][0x80]
f32 D_80161394; // can be static
#include "assets/ast_bg_planet.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
@@ -278,11 +278,11 @@ void func_8003E1E8(void) {
switch (gCurrentLevel) {
case LEVEL_VERSUS:
if (gVersusStage == VS_STAGE_CORNERIA) {
gSPDisplayList(gMasterDisp++, D_vs_player_302D4D0);
gSPDisplayList(gMasterDisp++, D_versus_302D4D0);
} else if (gVersusStage == VS_STAGE_KATINA) {
gSPDisplayList(gMasterDisp++, D_vs_player_30146B0);
gSPDisplayList(gMasterDisp++, D_versus_30146B0);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_3011E40);
gSPDisplayList(gMasterDisp++, D_versus_3011E40);
}
break;
case LEVEL_FORTUNA:
@@ -300,11 +300,11 @@ void func_8003E1E8(void) {
switch (gCurrentLevel) {
case LEVEL_VERSUS:
if (gVersusStage == VS_STAGE_CORNERIA) {
gSPDisplayList(gMasterDisp++, D_vs_player_302D4D0);
gSPDisplayList(gMasterDisp++, D_versus_302D4D0);
} else if (gVersusStage == VS_STAGE_KATINA) {
gSPDisplayList(gMasterDisp++, D_vs_player_30146B0);
gSPDisplayList(gMasterDisp++, D_versus_30146B0);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_3011E40);
gSPDisplayList(gMasterDisp++, D_versus_3011E40);
}
break;
case LEVEL_FORTUNA:
@@ -1081,9 +1081,9 @@ void func_80040CE4(void) {
Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gVersusStage == VS_STAGE_CORNERIA) {
gSPDisplayList(gMasterDisp++, D_vs_player_3018800);
gSPDisplayList(gMasterDisp++, D_versus_3018800);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_30160A0);
gSPDisplayList(gMasterDisp++, D_versus_30160A0);
}
Matrix_Pop(&gGfxMatrix);
}
src/main/fox_display.c
+16 -16
View File
@@ -16,7 +16,7 @@ f32 D_801615B8[4];
#include "assets/ast_arwing.h"
#include "assets/ast_allies.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_sector_z.h"
s32 D_800CA220 = 0;
@@ -244,7 +244,7 @@ void func_80052584(Player* player) {
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_40();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_vs_player_302D240);
gSPDisplayList(gMasterDisp++, D_versus_302D240);
}
Matrix_Pop(&gGfxMatrix);
}
@@ -255,19 +255,19 @@ void func_800526B8(Player* player) {
Matrix_Translate(gCalcMatrix, 0.0f, 35.0f, 0.0f, 1);
switch (player->num) {
case 0:
Animation_DrawSkeleton(5, D_vs_player_301D258, player->jointTable, func_800520FC, func_800523A8, player,
Animation_DrawSkeleton(5, D_versus_301D258, player->jointTable, func_800520FC, func_800523A8, player,
gCalcMatrix);
break;
case 1:
Animation_DrawSkeleton(5, D_vs_player_301DB94, player->jointTable, func_800520FC, func_80052420, player,
Animation_DrawSkeleton(5, D_versus_301DB94, player->jointTable, func_800520FC, func_80052420, player,
gCalcMatrix);
break;
case 2:
Animation_DrawSkeleton(5, D_vs_player_301E3E8, player->jointTable, func_800520FC, func_80052498, player,
Animation_DrawSkeleton(5, D_versus_301E3E8, player->jointTable, func_800520FC, func_80052498, player,
gCalcMatrix);
break;
case 3:
Animation_DrawSkeleton(5, D_vs_player_301C614, player->jointTable, func_800520FC, func_8005250C, player,
Animation_DrawSkeleton(5, D_versus_301C614, player->jointTable, func_800520FC, func_8005250C, player,
gCalcMatrix);
break;
}
@@ -287,7 +287,7 @@ void func_80052884(Player* player) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_arwing_3000090);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_300FB80);
gSPDisplayList(gMasterDisp++, D_versus_300FB80);
}
Matrix_MultVec3f(gGfxMatrix, &sp40, &D_80161518[player->num]);
Matrix_Translate(gGfxMatrix, 0.0f, 51.0f, -10.0f, 1);
@@ -313,7 +313,7 @@ void func_80052884(Player* player) {
}
gSPDisplayList(gMasterDisp++, D_landmaster_3004680);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_301F140);
gSPDisplayList(gMasterDisp++, D_versus_301F140);
}
Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_80161548[player->num]);
Matrix_Pop(&gGfxMatrix);
@@ -338,7 +338,7 @@ void func_80052B80(Player* player) {
if (gVersusMode) {
RCP_SetupDL_40();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_vs_player_301FD20);
gSPDisplayList(gMasterDisp++, D_versus_301FD20);
} else {
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -383,7 +383,7 @@ void func_80052D48(Player* player) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_landmaster_30066B0);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_301B6E0);
gSPDisplayList(gMasterDisp++, D_versus_301B6E0);
}
Matrix_Pop(&gGfxMatrix);
}
@@ -406,7 +406,7 @@ void func_80052D48(Player* player) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_landmaster_30066B0);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_301B6E0);
gSPDisplayList(gMasterDisp++, D_versus_301B6E0);
}
Matrix_Pop(&gGfxMatrix);
}
@@ -635,15 +635,15 @@ void func_80053C38(Player* player, s32 arg1) {
} else {
if (gVersusMode) {
if ((player->wings.rightState == WINGSTATE_INTACT) && (player->wings.leftState == WINGSTATE_INTACT)) {
gSPDisplayList(gMasterDisp++, D_vs_player_300EE80);
gSPDisplayList(gMasterDisp++, D_versus_300EE80);
} else if ((player->wings.rightState <= WINGSTATE_BROKEN) &&
(player->wings.leftState == WINGSTATE_INTACT)) {
gSPDisplayList(gMasterDisp++, D_vs_player_3010A90);
gSPDisplayList(gMasterDisp++, D_versus_3010A90);
} else if ((player->wings.rightState == WINGSTATE_INTACT) &&
(player->wings.leftState <= WINGSTATE_BROKEN)) {
gSPDisplayList(gMasterDisp++, D_vs_player_3011470);
gSPDisplayList(gMasterDisp++, D_versus_3011470);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_300D550);
gSPDisplayList(gMasterDisp++, D_versus_300D550);
}
} else {
if ((gLevelType == LEVELTYPE_SPACE) || (gCurrentLevel == LEVEL_BOLSE)) {
@@ -741,7 +741,7 @@ void func_80054300(Player* player) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_landmaster_3008100);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_301E570);
gSPDisplayList(gMasterDisp++, D_versus_301E570);
}
Matrix_Pop(&gGfxMatrix);
break;
src/main/fox_edata_1C.c
+10 -10
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "assets.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_arwing.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
@@ -224,15 +224,15 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_137 */ {(void*) D_6004170, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 },
/* OBJ_80_138 */ {(void*) D_vs_player_3017600, 0, (ObjectFunc) NULL, D_vs_player_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_139 */ {(void*) D_vs_player_3017600, 0, (ObjectFunc) NULL, D_vs_player_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_140 */ {(void*) D_vs_player_30173C0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_141 */ {(void*) D_vs_player_30174E0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_142 */ {(void*) D_vs_player_301B080, 0, (ObjectFunc) NULL, D_vs_player_302EE9C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_143 */ {(void*) D_vs_player_3016B00, 0, (ObjectFunc) NULL, D_vs_player_302EE00, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_144 */ {(void*) D_vs_player_3013780, 0, (ObjectFunc) NULL, D_vs_player_302ED4C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_145 */ {(void*) D_vs_player_3013580, 0, (ObjectFunc) NULL, D_vs_player_302ED98, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_146 */ {(void*) D_vs_player_3012ED0, 0, (ObjectFunc) NULL, D_vs_player_302EDB4, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_138 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_139 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_140 */ {(void*) D_versus_30173C0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_141 */ {(void*) D_versus_30174E0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_142 */ {(void*) D_versus_301B080, 0, (ObjectFunc) NULL, D_versus_302EE9C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_143 */ {(void*) D_versus_3016B00, 0, (ObjectFunc) NULL, D_versus_302EE00, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_144 */ {(void*) D_versus_3013780, 0, (ObjectFunc) NULL, D_versus_302ED4C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_145 */ {(void*) D_versus_3013580, 0, (ObjectFunc) NULL, D_versus_302ED98, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_146 */ {(void*) D_versus_3012ED0, 0, (ObjectFunc) NULL, D_versus_302EDB4, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_147 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_148 */ {(void*) D_60079B0, 0, (ObjectFunc) NULL, D_600FF80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_149 */ {(void*) D_6007D80, 0, (ObjectFunc) NULL, D_600FFA0, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
src/main/fox_edisplay.c
+1 -1
View File
@@ -18,7 +18,7 @@ WingInfo D_80161630;
#include "assets/ast_star_wolf.h"
#include "assets/ast_arwing.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_enmy_space.h"
#include "assets/ast_enmy_planet.h"
#include "assets/ast_ve1_boss.h"
src/main/fox_enmy.c
+2 -2
View File
@@ -11,7 +11,7 @@
#include "assets/ast_andross.h"
#include "assets/ast_area_6.h"
#include "assets/ast_training.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
s32 D_Timer_80161670[4];
s32 D_80161680;
@@ -22,7 +22,7 @@ u8 D_80161684;
ObjectInit* D_800CFDA0[] = {
D_CO_60371A4, D_ME_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_VE1_6007E74,
D_SO_601F234, D_ZO_6026714, D_C035154, D_TR_6006AA4, D_MA_6031000, D_TI_6006C60, D_AQ_602E5C8,
D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_vs_player_302DE3C,
D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_versus_302DE3C,
};
s32 D_800CFDF4[] = {
OBJ_80_0,
src/main/fox_hud.c
+9 -9
View File
@@ -77,7 +77,7 @@ s32 D_80161900[20];
#include "assets/ast_arwing.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_font.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
@@ -300,7 +300,7 @@ void func_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
if (gVersusMode) {
TextureRect_8bIA(&gMasterDisp, D_vs_player_3000B20, 32, 5, arg0, arg1, arg2, arg3);
TextureRect_8bIA(&gMasterDisp, D_versus_3000B20, 32, 5, arg0, arg1, arg2, arg3);
} else {
TextureRect_8bIA(&gMasterDisp, D_1000E80, 48, 9, arg0, arg1, arg2, arg3);
}
@@ -308,7 +308,7 @@ void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
void func_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
if (gVersusMode) {
TextureRect_8bCI(&gMasterDisp, D_vs_player_300D3C0, D_vs_player_300D408, 24, 3, arg0, arg1, arg2, arg3);
TextureRect_8bCI(&gMasterDisp, D_versus_300D3C0, D_versus_300D408, 24, 3, arg0, arg1, arg2, arg3);
} else {
TextureRect_8bCI(&gMasterDisp, D_10128C0, D_1012988, 40, 5, arg0, arg1, arg2, arg3);
}
@@ -316,7 +316,7 @@ void func_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
void func_80085890(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
if (gVersusMode) {
TextureRect_8bCI(&gMasterDisp, D_vs_player_300D350, D_vs_player_300D398, 24, 3, arg0, arg1, arg2, arg3);
TextureRect_8bCI(&gMasterDisp, D_versus_300D350, D_versus_300D398, 24, 3, arg0, arg1, arg2, arg3);
} else {
TextureRect_8bCI(&gMasterDisp, D_10127D0, D_1012898, 40, 5, arg0, arg1, arg2, arg3);
}
@@ -2817,7 +2817,7 @@ s32 func_8008CB8C(void) {
}
void func_8008CB98(f32 arg0, f32 arg1, f32 arg2) {
TextureRect_8bIA(&gMasterDisp, D_vs_player_30013E0, 8, 8, arg0, arg1, arg2, arg2);
TextureRect_8bIA(&gMasterDisp, D_versus_30013E0, 8, 8, arg0, arg1, arg2, arg2);
}
void func_8008CBE4(void) {
@@ -2891,17 +2891,17 @@ void func_8008CFB8(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
s32 i;
for (i = 0; i < 3; i++) {
TextureRect_8bIA(&gMasterDisp, D_vs_player_3000BC0 + 2 * ((640 * i) / 2), 80, 8, arg0, (8 * i * arg3) + arg1,
arg2, arg3);
TextureRect_8bIA(&gMasterDisp, D_versus_3000BC0 + 2 * ((640 * i) / 2), 80, 8, arg0, (8 * i * arg3) + arg1, arg2,
arg3);
}
TextureRect_8bIA(&gMasterDisp, D_vs_player_3000BC0 + 2 * ((640 * i) / 2), 80, 2, arg0, (8 * i * arg3) + arg1, arg2,
TextureRect_8bIA(&gMasterDisp, D_versus_3000BC0 + 2 * ((640 * i) / 2), 80, 2, arg0, (8 * i * arg3) + arg1, arg2,
arg3);
}
void func_8008D0DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
u32 var_t8 = 48.0f * arg4;
func_80084E78(&gMasterDisp, D_vs_player_300D440, D_vs_player_300D500, 48, 4, arg0, arg1, arg2, arg3, var_t8, 4);
func_80084E78(&gMasterDisp, D_versus_300D440, D_versus_300D500, 48, 4, arg0, arg1, arg2, arg3, var_t8, 4);
}
void func_8008D1F0(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
src/main/fox_load_inits.c
+5 -5
View File
@@ -166,7 +166,7 @@ OverlayInit sOvlmenu_Option[1] = {
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ ROM_SEGMENT(ast_map),
/* 0x7 */ ROM_SEGMENT(ast_versus),
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ ROM_SEGMENT(ast_option),
/* 0x9 */ ROM_SEGMENT(ast_font_3d),
/* 0xA */ NO_SEGMENT,
@@ -759,11 +759,11 @@ OverlayInit sOvli2_Versus[2] = {
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_vs_player),
/* 0x3 */ ROM_SEGMENT(ast_versus),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_versus),
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
@@ -775,11 +775,11 @@ OverlayInit sOvli2_Versus[2] = {
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_vs_player),
/* 0x3 */ ROM_SEGMENT(ast_versus),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_versus),
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
src/main/fox_play.c
+26 -26
View File
@@ -12,7 +12,7 @@
#include "assets/ast_titania.h"
#include "assets/ast_andross.h"
#include "assets/ast_arwing.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_area_6.h"
UNK_TYPE D_800D2F50 = 0;
@@ -276,16 +276,16 @@ void func_800A4F7C(void) {
switch (gVersusStage) {
case VS_STAGE_CORNERIA:
D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302DE3C);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302DE3C);
break;
case VS_STAGE_KATINA:
D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E0E4);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E0E4);
break;
case VS_STAGE_SECTOR_Z:
if (D_801778AC == 2) {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E378);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E378);
} else {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E170);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E170);
}
break;
}
@@ -468,20 +468,20 @@ void func_800A5844(void) {
EnvSettings* D_800D2F98[21] = {
&D_CO_6037160, &D_ME_6026C80, &D_SX_602A120, &D_A6_6023F20, &D_A6_6028760, &D_SY_602E4B0, &D_VE1_6007E30,
&D_SO_601F1F0, &D_ZO_60266D0, &D_C035110, &D_TR_6006A60, &D_MA_6030E30, &D_TI_6005000, &D_AQ_602E540,
&D_FO_600EA90, NULL, &D_KA_6011000, &D_BO_600FF30, &D_SZ_6006E70, &D_VE2_6014D50, &D_vs_player_302DD70,
&D_FO_600EA90, NULL, &D_KA_6011000, &D_BO_600FF30, &D_SZ_6006E70, &D_VE2_6014D50, &D_versus_302DD70,
};
void func_800A594C(void) {
if (gVersusMode) {
switch (gVersusStage) {
case 0:
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_vs_player_302DD70);
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_versus_302DD70);
break;
case 1:
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_vs_player_302DDB4);
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_versus_302DDB4);
break;
case 2:
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_vs_player_302DDF8);
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_versus_302DDF8);
break;
}
} else {
@@ -3923,7 +3923,7 @@ void func_800B0194(Player* player) {
if (player->unk_1D4 != 0) {
if (player->unk_0D0 > 1.0f) {
player->unk_00C += player->unk_008;
if ((s32) player->unk_00C >= Animation_GetFrameCount(&D_vs_player_301CFEC)) {
if ((s32) player->unk_00C >= Animation_GetFrameCount(&D_versus_301CFEC)) {
player->unk_00C = 0.0f;
}
player->unk_080 = 2.0f * SIN_DEG((player->unk_20C + 7) * 24.0f);
@@ -3934,16 +3934,16 @@ void func_800B0194(Player* player) {
player->unk_20C = player->unk_00C;
switch (gPlayerNum) {
case 0:
sp44 = Animation_GetFrameData(&D_vs_player_301CFEC, player->unk_20C, sp78);
sp44 = Animation_GetFrameData(&D_versus_301CFEC, player->unk_20C, sp78);
break;
case 1:
sp44 = Animation_GetFrameData(&D_vs_player_301D888, player->unk_20C, sp78);
sp44 = Animation_GetFrameData(&D_versus_301D888, player->unk_20C, sp78);
break;
case 2:
sp44 = Animation_GetFrameData(&D_vs_player_301E19C, player->unk_20C, sp78);
sp44 = Animation_GetFrameData(&D_versus_301E19C, player->unk_20C, sp78);
break;
case 3:
sp44 = Animation_GetFrameData(&D_vs_player_301C3A8, player->unk_20C, sp78);
sp44 = Animation_GetFrameData(&D_versus_301C3A8, player->unk_20C, sp78);
break;
}
Math_SmoothStepToVec3fArray(sp78, player->jointTable, 1, sp44, 1.0f, player->unk_010, 0.01f);
@@ -3965,16 +3965,16 @@ void func_800B0194(Player* player) {
}
switch (gPlayerNum) {
case 0:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E56C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E56C);
break;
case 1:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E830);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E830);
break;
case 2:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E74C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E74C);
break;
case 3:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E65C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E65C);
break;
}
Math_SmoothStepToVec3fArray(sp48, player->jointTable, 1, 0x18, 0.2f, 10.0f, 0.01f);
@@ -3988,16 +3988,16 @@ void func_800B0194(Player* player) {
if (player->unk_1D4 == 0) {
switch (gPlayerNum) {
case 0:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E95C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E95C);
break;
case 1:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302EC20);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302EC20);
break;
case 2:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302EB3C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302EB3C);
break;
case 3:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302EA4C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302EA4C);
break;
}
Math_SmoothStepToVec3fArray(sp48, player->jointTable, 1, 0x18, 0.2f, 10.0f, 0.01f);
@@ -4209,16 +4209,16 @@ void func_800B0F50(Player* playerx) {
player->unk_068 = 0;
switch (gPlayerNum) {
case 0:
sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E56C);
sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E56C);
break;
case 1:
sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E830);
sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E830);
break;
case 2:
sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E74C);
sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E74C);
break;
case 3:
sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E65C);
sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E65C);
break;
}
for (j = 0; j < 30; j++, sp38++) {

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