PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 05:25:01 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

export configuration for ast_corneria (#184)

Browse Source 
* complete?

* done

* remove header

* ast_corneria.yaml prepared

* progress

* more progress

* progress

* finished?

* fix duplicated symbol

* matchpoint

* add torch.hash.yml to git ignore

* progress replacing symbol use

* Ready ?

* fix bss reordering issues

* remove redundant entry in gitignore

* remove externs

* we don't need these anymore, libultra is finished
This commit is contained in:
Alejandro Asenjo Nitti 2024-03-29 16:09:14 -03:00 committed by GitHub
parent 09541d8ad3
commit 7ee062df9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
25 changed files with 748 additions and 1348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

569
assets/yaml/us/ast_corneria.yaml Normal file
View File

@ -0,0 +1,569 @@
:config:
segments:
- [0x06, 0x961CE0]
header:
code:
- '#include "assets/ast_corneria.h"'
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
- '#include "structs.h"'
- '#include "sf64level.h"'
# Corneria
# Former Army Base
D_CO_6000000:
{ type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 28, offset: 0x6000000, symbol: D_CO_6000000 }
D_CO_6000E00:
{ type: GFX, offset: 0x6000E00, symbol: D_CO_6000E00 }
D_CO_60018F8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060018F8, symbol: D_CO_60018F8 }
D_CO_60020F8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060020F8, symbol: D_CO_60020F8 }
D_CO_60028F8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x060028F8, symbol: D_CO_60028F8 }
D_CO_60038F8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060038F8, symbol: D_CO_60038F8 }
D_CO_60040F8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060040F8, symbol: D_CO_60040F8 }
D_CO_60049F0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x060049F0, symbol: D_CO_60049F0 }
D_CO_6004900:
{ type: GFX, offset: 0x6004900, symbol: D_CO_6004900 }
D_CO_60059F0:
{ type: GFX, offset: 0x60059F0, symbol: D_CO_60059F0 }
D_CO_6005A80:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06005A80, symbol: D_CO_6005A80 }
D_CO_6006A80:
{ type: GFX, offset: 0x6006A80, symbol: D_CO_6006A80 }
D_CO_6006E08:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06006E08, symbol: D_CO_6006E08 }
D_CO_6007610:
{ type: GFX, offset: 0x6007610, symbol: D_CO_6007610 }
D_CO_60091C8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060091C8, symbol: D_CO_60091C8 }
D_CO_60099C8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x060099C8, symbol: D_CO_60099C8 }
D_CO_6009BC8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009BC8, symbol: D_CO_6009BC8 }
D_CO_600A3C8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600A3C8, symbol: D_CO_600A3C8 }
D_CO_600ABC8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600ABC8, symbol: D_CO_600ABC8 }
D_CO_600B3C8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600B3C8, symbol: D_CO_600B3C8 }
D_CO_600C3D8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600C3D8, symbol: D_CO_600C3D8 }
D_CO_600CBD8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0600CBD8, symbol: D_CO_600CBD8 }
D_CO_600DBD8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600DBD8, symbol: D_CO_600DBD8 }
D_CO_600E3D8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600E3D8, symbol: D_CO_600E3D8 }
D_CO_600EBD8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600EBD8, symbol: D_CO_600EBD8 }
D_CO_600F3D8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600F3D8, symbol: D_CO_600F3D8 }
D_CO_6010050:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06010050, symbol: D_CO_6010050 }
D_CO_6010250:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06010250, symbol: D_CO_6010250 }
D_CO_6010F90:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06010F90, symbol: D_CO_6010F90 }
D_CO_6010A50:
{ type: GFX, offset: 0x6010A50, symbol: D_CO_6010A50 }
D_CO_6010E00:
{ type: GFX, offset: 0x6010E00, symbol: D_CO_6010E00 }
D_CO_6011790:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06011790, symbol: D_CO_6011790 }
D_CO_6011F90:
{ type: GFX, offset: 0x6011F90, symbol: D_CO_6011F90 }
D_CO_6012640:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012640, symbol: D_CO_6012640 }
D_CO_6012840:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012840, symbol: D_CO_6012840 }
D_CO_6012D00:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012D00, symbol: D_CO_6012D00 }
D_CO_60132B0:
{ type: GFX, offset: 0x60132B0, symbol: D_CO_60132B0 }
D_CO_60137B0:
{ type: GFX, offset: 0x60137B0, symbol: D_CO_60137B0 }
D_CO_6013B50:
{ type: GFX, offset: 0x6013B50, symbol: D_CO_6013B50 }
D_CO_6013BE0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06013BE0, symbol: D_CO_6013BE0 }
D_CO_60143E0:
{ type: GFX, offset: 0x60143E0, symbol: D_CO_60143E0 }
D_CO_6014500:
{ type: GFX, offset: 0x6014500, symbol: D_CO_6014500 }
D_CO_6014670:
{ type: GFX, offset: 0x6014670, symbol: D_CO_6014670 }
D_CO_6014A20:
{ type: GFX, offset: 0x6014A20, symbol: D_CO_6014A20 }
D_CO_6014B50:
{ type: GFX, offset: 0x6014B50, symbol: D_CO_6014B50 }
D_CO_60151A8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x060151A8, symbol: D_CO_60151A8 }
D_CO_60153B0:
{ type: GFX, offset: 0x60153B0, symbol: D_CO_60153B0 }
D_CO_6015F00:
{ type: GFX, offset: 0x6015F00, symbol: D_CO_6015F00 }
D_CO_6015700:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06015700, symbol: D_CO_6015700 }
# Seems unused
D_CO_6016268:
{ type: GFX, offset: 0x6016268, symbol: D_CO_6016268 }
D_CO_60164F0:
{ type: GFX, offset: 0x60164F0, symbol: D_CO_60164F0 }
D_CO_6016580:
{ type: GFX, offset: 0x6016580, symbol: D_CO_6016580 }
D_CO_6018E80:
{ type: GFX, offset: 0x6018E80, symbol: D_CO_6018E80 }
D_CO_60191C8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060191C8, symbol: D_CO_60191C8 }
D_CO_60199D0:
{ type: GFX, offset: 0x60199D0, symbol: D_CO_60199D0 }
D_CO_6019C60:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019C60, symbol: D_CO_6019C60 }
D_CO_6019E60:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06019E60, symbol: D_CO_6019E60 }
D_CO_601FF58:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601FF58, symbol: D_CO_601FF58 }
D_CO_601A7D0:
{ type: GFX, offset: 0x601A7D0, symbol: D_CO_601A7D0 }
D_CO_601AD60:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AD60, symbol: D_CO_601AD60 }
D_CO_601B560:
{ type: GFX, offset: 0x601B560, symbol: D_CO_601B560 }
D_CO_601B640:
{ type: GFX, offset: 0x601B640, symbol: D_CO_601B640 }
D_CO_601B6C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601B6C0, symbol: D_CO_601B6C0 }
D_CO_601BEC0:
{ type: GFX, offset: 0x601BEC0, symbol: D_CO_601BEC0 }
D_CO_601C1A8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601C1A8, symbol: D_CO_601C1A8 }
D_CO_601C9B0:
{ type: GFX, offset: 0x601C9B0, symbol: D_CO_601C9B0 }
D_CO_601CAA0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0601CAA0, symbol: D_CO_601CAA0 }
D_CO_601DAA0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0601DAA0, symbol: D_CO_601DAA0 }
D_CO_601EAA0:
{ type: GFX, offset: 0x601EAA0, symbol: D_CO_601EAA0 }
D_CO_601ED00:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601ED00, symbol: D_CO_601ED00 }
D_CO_601F500:
{ type: GFX, offset: 0x601F500, symbol: D_CO_601F500 }
D_CO_601F5A0:
{ type: GFX, offset: 0x601F5A0, symbol: D_CO_601F5A0 }
D_CO_6020760:
{ type: GFX, offset: 0x6020760, symbol: D_CO_6020760 }
D_CO_6020B40:
{ type: GFX, offset: 0x6020B40, symbol: D_CO_6020B40 }
D_CO_6021188:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06021188, symbol: D_CO_6021188 }
D_CO_60220D0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060220D0, symbol: D_CO_60220D0 }
D_CO_6023AC0:
{ type: GFX, offset: 0x6023AC0, symbol: D_CO_6023AC0 }
D_CO_6023DE8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023DE8, symbol: D_CO_6023DE8 }
D_CO_60244A0:
{ type: GFX, offset: 0x60244A0, symbol: D_CO_60244A0 }
D_CO_60245E0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x060245E0, symbol: D_CO_60245E0 }
D_CO_6025500:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06025500, symbol: D_CO_6025500 }
D_CO_6026420:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06026420, symbol: D_CO_6026420 }
D_CO_6027340:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06027340, symbol: D_CO_6027340 }
D_CO_6028260:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06028260, symbol: D_CO_6028260 }
D_CO_6028A60:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06028A60, symbol: D_CO_6028A60 }
D_CO_6029528:
{ type: SF64:ANIM, offset: 0x6029528, symbol: D_CO_6029528 }
D_CO_6029674:
{ type: SF64:SKELETON, offset: 0x6029674, symbol: D_CO_6029674 }
D_CO_602991C:
{ type: SF64:ANIM, offset: 0x602991C, symbol: D_CO_602991C }
D_CO_6029A48:
{ type: SF64:SKELETON, offset: 0x6029A48, symbol: D_CO_6029A48 }
D_CO_602A520:
{ type: SF64:ANIM, offset: 0x602A520, symbol: D_CO_602A520 }
D_CO_602AA04:
{ type: SF64:ANIM, offset: 0x602AA04, symbol: D_CO_602AA04 }
D_CO_602AA7C:
{ type: SF64:ANIM, offset: 0x602AA7C, symbol: D_CO_602AA7C }
D_CO_602AB48:
{ type: SF64:SKELETON, offset: 0x602AB48, symbol: D_CO_602AB48 }
D_CO_602BC18:
{ type: SF64:ANIM, offset: 0x602BC18, symbol: D_CO_602BC18 }
D_CO_602BE64:
{ type: SF64:SKELETON, offset: 0x602BE64, symbol: D_CO_602BE64 }
D_CO_602C0D0:
{ type: SF64:ANIM, offset: 0x602C0D0, symbol: D_CO_602C0D0 }
D_CO_602D31C:
{ type: SF64:ANIM, offset: 0x602D31C, symbol: D_CO_602D31C }
D_CO_602D400:
{ type: SF64:ANIM, offset: 0x602D400, symbol: D_CO_602D400 }
D_CO_602D5AC:
{ type: SF64:SKELETON, offset: 0x602D5AC, symbol: D_CO_602D5AC }
D_CO_602D5F0:
{ type: GFX, offset: 0x602D5F0, symbol: D_CO_602D5F0 }
D_CO_602DA20:
{ type: GFX, offset: 0x602DA20, symbol: D_CO_602DA20 }
D_CO_602DCA0:
{ type: GFX, offset: 0x602DCA0, symbol: D_CO_602DCA0 }
D_CO_602E080:
{ type: GFX, offset: 0x602E080, symbol: D_CO_602E080 }
D_CO_602E570:
{ type: GFX, offset: 0x602E570, symbol: D_CO_602E570 }
D_CO_602E7A0:
{ type: GFX, offset: 0x602E7A0, symbol: D_CO_602E7A0 }
D_CO_602E9E0:
{ type: GFX, offset: 0x602E9E0, symbol: D_CO_602E9E0 }
D_CO_602ECB0:
{ type: GFX, offset: 0x602ECB0, symbol: D_CO_602ECB0 }
D_CO_602ED50:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 16, offset: 0x0602ED50, symbol: D_CO_602ED50 }
D_CO_602F7C0:
{ type: GFX, offset: 0x602F7C0, symbol: D_CO_602F7C0 }
D_CO_602F848:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0602F848, symbol: D_CO_602F848 }
D_CO_6030850:
{ type: GFX, offset: 0x6030850, symbol: D_CO_6030850 }
D_CO_6030FD0:
{ type: GFX, offset: 0x6030FD0, symbol: D_CO_6030FD0 }
D_CO_6031130:
{ type: GFX, offset: 0x6031130, symbol: D_CO_6031130 }
D_CO_6031280:
{ type: GFX, offset: 0x6031280, symbol: D_CO_6031280 }
D_CO_60329C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x060329C0, symbol: D_CO_60329C0 }
D_CO_6032BC0:
{ type: GFX, offset: 0x6032BC0, symbol: D_CO_6032BC0 }
D_CO_6033000:
{ type: GFX, offset: 0x6033000, symbol: D_CO_6033000 }
D_CO_6033088:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06033088, symbol: D_CO_6033088 }
D_CO_6034388:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06034388, symbol: D_CO_6034388 }
D_CO_6034B90:
{ type: GFX, offset: 0x6034B90, symbol: D_CO_6034B90 }
D_CO_6034C28:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06034C28, symbol: D_CO_6034C28 }
D_CO_6035430:
{ type: GFX, offset: 0x6035430, symbol: D_CO_6035430 }
D_CO_60354F0:
{ type: GFX, offset: 0x60354F0, symbol: D_CO_60354F0 }
D_CO_60355A0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060355A0, symbol: D_CO_60355A0 }
D_CO_6035DA0:
{ type: GFX, offset: 0x6035DA0, symbol: D_CO_6035DA0 }
D_CO_6035F10:
{ type: GFX, offset: 0x6035F10, symbol: D_CO_6035F10 }
D_CO_60361F0:
{ type: GFX, offset: 0x60361F0, symbol: D_CO_60361F0 }
D_CO_60363B0:
{ type: GFX, offset: 0x60363B0, symbol: D_CO_60363B0 }
D_CO_6036438:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x06036438, symbol: D_CO_6036438 }
D_CO_6036840:
{ type: GFX, offset: 0x6036840, symbol: D_CO_6036840 }
D_CO_60368C8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x060368C8, symbol: D_CO_60368C8 }
D_CO_6036CD0:
{ type: GFX, offset: 0x6036CD0, symbol: D_CO_6036CD0 }
D_CO_6036D58:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x06036D58, symbol: D_CO_6036D58 }
D_CO_6037160:
{ type: SF64:ENV_SETTINGS, offset: 0x6037160, symbol: D_CO_6037160 }
D_CO_60371A4:
{ type: SF64:OBJECT_INIT, offset: 0x60371A4, symbol: D_CO_60371A4 }
D_CO_603B074:
{ type: SF64:OBJECT_INIT, offset: 0x603B074, symbol: D_CO_603B074 }
D_CO_603D9E8:
{ type: SF64:SCRIPT, offset: 0x603D9E8, symbol: D_CO_603D9E8 }
# Seems unused
D_CO_603DC40:
{ type: SF64:HITBOX, offset: 0x603DC40, symbol: D_CO_603DC40 }
D_CO_603DD40:
{ type: SF64:HITBOX, offset: 0x603DD40, symbol: D_CO_603DD40 }
D_CO_603DDF0:
{ type: SF64:HITBOX, offset: 0x603DDF0, symbol: D_CO_603DDF0 }
D_CO_603DCA4:
{ type: SF64:HITBOX, offset: 0x603DCA4, symbol: D_CO_603DCA4 }
D_CO_603DE8C:
{ type: SF64:HITBOX, offset: 0x603DE8C, symbol: D_CO_603DE8C }
D_CO_603DEF4:
{ type: SF64:HITBOX, offset: 0x603DEF4, symbol: D_CO_603DEF4 }
D_CO_603DF8C:
{ type: SF64:HITBOX, offset: 0x603DF8C, symbol: D_CO_603DF8C }
D_CO_603DFDC:
{ type: SF64:HITBOX, offset: 0x603DFDC, symbol: D_CO_603DFDC }
D_CO_603E014:
{ type: SF64:HITBOX, offset: 0x603E014, symbol: D_CO_603E014 }
D_CO_603E030:
{ type: SF64:HITBOX, offset: 0x603E030, symbol: D_CO_603E030 }
D_CO_603E09C:
{ type: SF64:HITBOX, offset: 0x603E09C, symbol: D_CO_603E09C }
D_CO_603E0EC:
{ type: SF64:HITBOX, offset: 0x603E0EC, symbol: D_CO_603E0EC }
D_CO_603E118:
{ type: SF64:HITBOX, offset: 0x603E118, symbol: D_CO_603E118 }
D_CO_603E14C:
{ type: SF64:HITBOX, offset: 0x603E14C, symbol: D_CO_603E14C }
D_CO_603E1B4:
{ type: SF64:HITBOX, offset: 0x603E1B4, symbol: D_CO_603E1B4 }
D_CO_603E21C:
{ type: SF64:HITBOX, offset: 0x603E21C, symbol: D_CO_603E21C }
# seems unused
D_CO_603E2C0:
{ type: SF64:HITBOX, offset: 0x603E2C0, symbol: D_CO_603E2C0 }
# seems unused
D_CO_603E2F4:
{ type: SF64:HITBOX, offset: 0x603E2F4, symbol: D_CO_603E2F4 }
D_CO_603E3E0:
{ type: SF64:HITBOX, offset: 0x603E3E0, symbol: D_CO_603E3E0 }
D_CO_603E468:
{ type: SF64:HITBOX, offset: 0x603E468, symbol: D_CO_603E468 }
D_CO_603E484:
{ type: SF64:HITBOX, offset: 0x603E484, symbol: D_CO_603E484 }
D_CO_603E4A0:
{ type: SF64:HITBOX, offset: 0x603E4A0, symbol: D_CO_603E4A0 }
D_CO_603E4A4:
{ type: SF64:HITBOX, offset: 0x603E4A4, symbol: D_CO_603E4A4 }
D_CO_603E4DC:
{ type: SF64:HITBOX, offset: 0x603E4DC, symbol: D_CO_603E4DC }
D_CO_603E514:
{ type: SF64:HITBOX, offset: 0x603E514, symbol: D_CO_603E514 }
D_CO_603E54C:
{ type: SF64:HITBOX, offset: 0x603E54C, symbol: D_CO_603E54C }
D_CO_603E598:
{ type: SF64:HITBOX, offset: 0x603E598, symbol: D_CO_603E598 }
D_CO_603E5B4:
{ type: SF64:HITBOX, offset: 0x603E5B4, symbol: D_CO_603E5B4 }
D_CO_603E5D0:
{ type: SF64:HITBOX, offset: 0x603E5D0, symbol: D_CO_603E5D0 }
D_CO_603E604:
{ type: SF64:HITBOX, offset: 0x603E604, symbol: D_CO_603E604 }
D_CO_603E620:
{ type: SF64:HITBOX, offset: 0x603E620, symbol: D_CO_603E620 }
D_CO_603E714:
{ type: SF64:HITBOX, offset: 0x603E714, symbol: D_CO_603E714 }
D_CO_603E748:
{ type: SF64:HITBOX, offset: 0x603E748, symbol: D_CO_603E748 }
D_CO_603E7C4:
{ type: SF64:HITBOX, offset: 0x603E7C4, symbol: D_CO_603E7C4 }
D_CO_603E840:
{ type: SF64:HITBOX, offset: 0x603E840, symbol: D_CO_603E840 }
D_CO_603E88C:
{ type: SF64:HITBOX, offset: 0x603E88C, symbol: D_CO_603E88C }
D_CO_603E8A8:
{ type: SF64:HITBOX, offset: 0x603E8A8, symbol: D_CO_603E8A8 }
D_CO_603E924:
{ type: SF64:HITBOX, offset: 0x603E924, symbol: D_CO_603E924 }
D_CO_603E98C:
{ type: SF64:HITBOX, offset: 0x603E98C, symbol: D_CO_603E98C }
D_CO_603E9EC:
{ type: SF64:HITBOX, offset: 0x603E9EC, symbol: D_CO_603E9EC }
D_CO_603EA08:
{ type: SF64:HITBOX, offset: 0x603EA08, symbol: D_CO_603EA08 }
D_CO_603EA74:
{ type: SF64:HITBOX, offset: 0x603EA74, symbol: D_CO_603EA74 }
D_CO_603EAE0:
{ type: SF64:HITBOX, offset: 0x603EAE0, symbol: D_CO_603EAE0 }
D_CO_603EB0C:
{ type: SF64:HITBOX, offset: 0x603EB0C, symbol: D_CO_603EB0C }
D_CO_603EB38:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0603EB38, symbol: D_CO_603EB38 }
D_CO_603F338:
{ type: SF64:TRIANGLE, count: 13, offset: 0x603F338, symbol: D_CO_603F338, mesh_symbol: D_CO_OFFSET, mesh_offset: 0x603F388 }
D_CO_603F40C:
{ type: SF64:TRIANGLE, count: 36, offset: 0x603F40C, symbol: D_CO_603F40C, mesh_symbol: D_CO_OFFSET }

107
include/assets.h
View File

@ -16,7 +16,6 @@
* ast_katina, ast_macbeth, ast_title, ast_map, ast_training
*/
extern Gfx D_60005B0[]; // fox_bg
extern Gfx D_6000E00[]; // fox_edata_1C
extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C. Possible symbol collision
extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
extern Gfx D_6001A60[]; // fox_effect
@ -28,15 +27,12 @@ extern Gfx D_6002E60[]; // fox_bg
extern Gfx D_6003000[]; // fox_edata_1C
extern Gfx D_60030F0[]; // fox_edata_1C
extern Gfx D_60038E0[];
extern u16 D_60038F8[];
extern Gfx D_6004170[];
extern Vtx D_6004500[];
extern Gfx D_60046F0[];
extern Gfx D_6004900[];
extern u16 D_6005710[];
extern Gfx D_6005780[];
extern Gfx D_6005880[];
extern Gfx D_60059F0[];
extern Gfx D_6006140[];
extern Gfx D_6006310[];
extern Animation D_600636C;
@ -44,7 +40,6 @@ extern Limb* D_6006558[];
extern Gfx D_60066D0[];
extern u16 D_6006750[];
extern EnvSettings D_6006A60;
extern Gfx D_6006A80[];
extern Gfx D_6006BE0[];
extern u16 D_6006EA0[];
extern Gfx D_6006F50[];
@ -83,7 +78,6 @@ extern u16 D_600C6A0[];
extern Gfx D_600C740[];
extern Vtx D_600C780[];
extern Gfx D_600CAA0[];
extern u16 D_600CBD8[];
extern Gfx D_600D190[];
extern Animation D_600D3DC;
extern u16 D_600D5C0[];
@ -133,8 +127,6 @@ extern u16 D_6010198[];
extern CollisionPoly D_6010294[];
extern u8 D_60106B0[];
extern Gfx D_6010960[];
extern Gfx D_6010A50[];
extern Gfx D_6010E00[];
extern u8 D_6010FA0[];
extern EnvSettings D_KA_6011000;
extern f32 D_6011058[];
@ -149,33 +141,21 @@ extern f32 D_6011C80[];
extern u8 D_6012310[];
extern u8 D_60123F0[];
extern Animation D_6012C00_Anim;
extern Gfx D_60132B0[];
extern u8 D_6013470[];
extern Gfx D_6013480[];
extern Gfx D_60137B0[];
extern Animation D_601388C;
extern Gfx D_6013B50[];
extern u8 D_6014140[];
extern Gfx D_60143E0[];
extern Gfx D_6014500[];
extern u16 D_6014510[];
extern Animation D_6014658;
extern Gfx D_6014670[];
extern u16 D_60147C0[];
extern u8 D_60147E0[];
extern u8 D_60148B0[];
extern Gfx D_60148D0[];
extern Gfx D_6014A20[];
extern Gfx D_6014B50[];
extern EnvSettings D_VE2_6014D50;
extern CollisionPoly D_6014FEC[];
extern Gfx D_60153B0[];
extern u16 D_6015430[];
extern Gfx D_6015F00[];
extern Gfx D_6016270[];
extern Vec3s D_6016374[];
extern Gfx D_60164F0[];
extern Gfx D_6016580[];
extern f32 D_601668C[];
extern f32 D_60166F4[];
extern f32 D_6016714[];
@ -185,21 +165,16 @@ extern Gfx D_6017370[];
extern Gfx D_6018450[];
extern Gfx D_6018C00[]; // possible collision
extern Gfx D_6018D40[];
extern Gfx D_6018E80[];
extern Gfx D_601A7D0[];
extern Gfx D_601AE40[];
extern u16* D_VE1_601B1E4[];
extern f32 D_601B4C4[];
extern f32 D_601B4E0[];
extern f32 D_601B4FC[];
extern f32 D_601B518[];
extern Gfx D_601B560[];
extern f32 D_601B584[];
extern f32 D_601B5F4[];
extern Gfx D_601B640[];
extern f32 D_601B644[];
extern f32 D_601B678[];
extern u16 D_601B6C0[];
extern f32 D_601B6C4[];
extern f32 D_F32_601B710[];
extern f32 D_601B75C[];
@ -208,11 +183,9 @@ extern f32 D_601B830[];
extern f32 D_601B868[];
extern f32 D_601B8A0[];
extern f32 D_601B8D8[];
extern Gfx D_601BEC0[];
extern Gfx D_601C7C0[];
extern Gfx D_601C820[];
extern u16 D_601C8E0[];
extern Gfx D_601C9B0[];
extern u8 D_601D750[];
extern u16 D_601D800[];
extern u16 D_601DB50[];
@ -220,18 +193,13 @@ extern Gfx D_601E150[];
extern u16 D_601E1E8[];
extern Animation D_601E8C4;
extern Limb* D_601E9D0[];
extern Gfx D_601EAA0[];
extern EnvSettings D_SO_601F1F0;
extern Gfx D_601F500[];
extern Gfx D_601F5A0[];
extern Animation D_601F874;
extern Limb* D_601F920[];
extern Gfx D_601FCB0[];
extern Gfx D_601FF80[];
extern Gfx D_60200E0[];
extern Gfx D_6020760[];
extern Gfx D_6020A30[];
extern Gfx D_6020B40[];
extern u16* D_SO_600631C[];
extern Gfx D_6020E60[];
extern u16 D_6020F60[];
@ -239,21 +207,11 @@ extern u16 D_6022760[];
extern Gfx D_6022920[];
extern u16 D_60229A4[];
extern f32 D_60231A4[];
extern Gfx D_6023AC0[];
extern Gfx D_6024220[];
extern Gfx D_60244A0[];
extern u16 D_60245E0[];
extern Gfx D_6024AC0[];
extern Gfx D_6024B60[];
extern u16 D_6025500[];
extern u16 D_6026420[];
extern EnvSettings D_ZO_60266D0;
extern EnvSettings D_ME_6026C80;
extern u16 D_6027340[];
extern u16 D_6028260[];
extern u16 D_6028A60[];
extern Animation D_6029528;
extern Limb* D_6029674[];
extern Gfx D_602A720[];
extern u16* D_ZO_602AAC0[];
extern u16 D_602AC50[];
@ -277,14 +235,7 @@ extern f32 D_602C2B0[];
extern u16 D_602C2CC[];
extern Triangle D_602CACC[];
extern Vec3f D_602CB80[];
extern Gfx D_602D5F0[];
extern Gfx D_602DA20[];
extern Gfx D_602DCA0[];
extern Gfx D_602E080[];
extern Gfx D_602E380[];
extern Gfx D_602E570[];
extern Gfx D_602E7A0[];
extern Gfx D_602E9E0[];
extern u16* D_ME_602F3AC[];
extern f32 D_602F638[];
extern f32 D_602F684[];
@ -294,7 +245,6 @@ extern f32 D_602F708[];
extern f32 D_602F724[];
extern f32 D_602F740[];
extern f32 D_602F75C[];
extern Gfx D_602F7C0[];
extern f32 D_602FA50[];
extern CollisionPoly D_602FA9C[];
extern Vec3s D_60300C8[];
@ -304,31 +254,8 @@ extern CollisionPoly D_60305DC[];
extern Vec3s D_603184C[];
extern Gfx D_60320E0[];
extern Gfx D_6032580[];
extern Gfx D_6032BC0[];
extern Gfx D_6033000[];
extern Vec3s D_6033E08[];
extern Gfx D_6034B90[];
extern Gfx D_6035DA0[];
extern Gfx D_6035F10[];
extern Gfx D_60361F0[]; // possible collision
extern Gfx D_60363B0[];
extern Gfx D_6036840[];
extern Gfx D_6036CD0[];
extern EnvSettings D_CO_6037160;
extern Gfx D_6037CF0[];
extern ObjectInit D_603B074[];
extern u16* D_CO_603D9E8[];
extern f32 D_603DCA4[];
extern f32 D_603DD40[];
extern f32 D_603DDF0[];
extern f32 D_603DE8C[];
extern f32 D_603DEF4[];
extern f32 D_603DF8C[];
extern f32 D_603DFDC[];
extern f32 D_603E014[];
extern f32 D_603E030[];
extern f32 D_603E09C[];
extern f32 D_603E0EC[];
extern Gfx D_60084C0[];
extern Gfx D_6008D40[];
extern Gfx D_6007C40[];
@ -338,40 +265,6 @@ extern Gfx D_601A700[];
extern Gfx D_6019670[];
extern Gfx D_60185E0[];
extern Gfx D_6017550[];
extern f32 D_603E118[];
extern f32 D_603E14C[];
extern f32 D_603E1B4[];
extern f32 D_603E21C[];
extern f32 D_603E3E0[];
extern f32 D_603E468[];
extern f32 D_603E484[];
extern f32 D_603E4A0[];
extern f32 D_603E4A4[];
extern f32 D_603E4DC[];
extern f32 D_603E514[];
extern f32 D_603E54C[];
extern f32 D_603E598[];
extern f32 D_603E5B4[];
extern f32 D_603E5D0[];
extern f32 D_603E604[];
extern f32 D_603E620[];
extern f32 D_603E714[];
extern f32 D_603E748[];
extern f32 D_603E7C4[];
extern f32 D_603E840[];
extern f32 D_603E88C[];
extern f32 D_603E8A8[];
extern f32 D_603E98C[];
extern f32 D_603E9EC[];
extern f32 D_603EA08[];
extern f32 D_603EA74[];
extern f32 D_603EAE0[];
extern f32 D_603EB0C[];
extern u16 D_603EB38[];
extern Triangle D_603F338[];
extern Vec3f D_603F388[];
extern Triangle D_603F40C[];
extern Vec3f D_603F4E4[];
extern Gfx D_6041070[];
#endif // ASSETS_H

8
include/assets/ast_corneria.h
View File

@ -1,8 +0,0 @@
#ifndef AST_CORNERIA_H
#define AST_CORNERIA_H
#include "gfx.h"
#include "sf64object.h"
#include "structs.h"
#endif

2
include/fox_edisplay_assets.h
View File

@ -17,7 +17,6 @@ extern Gfx D_602DE70[];
extern Gfx D_602DC40[];
extern Gfx D_602D830[];
extern Gfx D_602D340[];
extern Gfx D_6031280[];
extern Gfx D_6031130[];
extern Gfx D_6030850[];
extern Gfx D_6030FD0[];
@ -56,7 +55,6 @@ extern Gfx D_60165D0[];
extern Gfx D_6016880[];
extern Gfx D_6016B50[];
extern Gfx D_6000C40[];
extern Gfx D_6018E80[];
extern Gfx D_601F620[];
extern Gfx D_601F420[];
extern Gfx D_6018C80[];

1
include/fox_enmy2_assets.h
View File

@ -5,7 +5,6 @@
// Displaylists
extern Gfx D_6011F90[];
extern Gfx D_601F2A0[];
extern Gfx D_6017B60[];
extern Gfx D_6004D00[];

1
include/fox_enmy_assets.h
View File

@ -3,7 +3,6 @@
#include "sf64object.h"
extern ObjectInit D_CO_60371A4[];
extern ObjectInit D_ME_6026CC4[];
extern ObjectInit D_VE1_6007E74[];
extern ObjectInit D_SO_601F234[];

155
linker_scripts/us/undefined_syms.ld
View File

@ -129,7 +129,6 @@ D_500A5F0 = 0x0500A5F0;
D_500A6E0 = 0x0500A6E0;
D_500A7D0 = 0x0500A7D0;
D_6000E00 = 0x06000E00;
D_6001360 = 0x06001360;
D_KA_60012A0 = 0x060012A0;
D_ZO_60012A0 = 0x060012A0;
@ -165,7 +164,6 @@ D_TI_6006890_Gfx = 0x06006890;
D_TI_60068BC = 0x060068BC;
D_TI_60068F0 = 0x060068F0;
D_TI_6006A3C = 0x06006A3C;
D_6006A80 = 0x06006A80;
D_TI_6006BF0 = 0x06006BF0;
D_TI_6006C44 = 0x06006C44;
D_6006F50 = 0x06006F50;
@ -203,8 +201,6 @@ D_600FFC0 = 0x0600FFC0;
D_600FFE0 = 0x0600FFE0;
D_6010294 = 0x06010294;
D_6010960 = 0x06010960;
D_6010A50 = 0x06010A50;
D_6010E00 = 0x06010E00;
D_6011058 = 0x06011058;
D_601115C = 0x0601115C;
D_601115C = 0x0601115C;
@ -219,38 +215,23 @@ D_AQ_6011EE0 = 0x06011EE0;
D_AQ_60120F0 = 0x060120F0;
D_MA_6012C00 = 0x06012C00;
D_6012C00_Anim = 0x06012C00;
D_60132B0 = 0x060132B0;
D_60137B0 = 0x060137B0;
D_MA_6013960 = 0x06013960;
D_6013B50 = 0x06013B50;
D_60143E0 = 0x060143E0;
D_6014500 = 0x06014500;
D_6014670 = 0x06014670;
D_6014A20 = 0x06014A20;
D_6014B50 = 0x06014B50;
D_6014FEC = 0x06014FEC;
D_60153B0 = 0x060153B0;
D_AQ_6015730 = 0x06015730;
D_6015CE0 = 0x06015CE0;
D_6015F00 = 0x06015F00;
D_AQ_6015FF0 = 0x06015FF0;
D_AQ_6015DD0 = 0x06015DD0;
D_6016270 = 0x06016270;
D_6016374 = 0x06016374;
D_60164F0 = 0x060164F0;
D_6016580 = 0x06016580;
D_601668C = 0x0601668C;
D_60166F4 = 0x060166F4;
D_6016714 = 0x06016714;
D_6018450 = 0x06018450;
D_6018C00 = 0x06018C00;
D_6018E80 = 0x06018E80;
D_601A7D0 = 0x0601A7D0;
D_MA_601B0D0 = 0x0601B0D0;
D_601B4E0 = 0x0601B4E0;
D_601B4FC = 0x0601B4FC;
D_601B518 = 0x0601B518;
D_601B560 = 0x0601B560;
D_601B584 = 0x0601B584;
D_601B5F4 = 0x0601B5F4;
D_601B644 = 0x0601B644;
@ -264,12 +245,8 @@ D_601B830 = 0x0601B830;
D_601B868 = 0x0601B868;
D_601B8A0 = 0x0601B8A0;
D_601B8D8 = 0x0601B8D8;
D_601BEC0 = 0x0601BEC0;
D_601C9B0 = 0x0601C9B0;
D_AQ_601DE60 = 0x0601DE60;
D_MA_601F1D0 = 0x0601F1D0;
D_601F500 = 0x0601F500;
D_601F5A0 = 0x0601F5A0;
D_601FCB0 = 0x0601FCB0;
D_6022340 = 0x06022340;
D_AQ_6022110 = 0x06022110;
@ -278,7 +255,6 @@ D_MA_60238F0 = 0x060238F0;
D_60239E0 = 0x060239E0;
D_6023730 = 0x06023730;
D_MA_6024010 = 0x06024010;
D_60244A0 = 0x060244A0;
D_60247E0 = 0x060247E0;
D_6024AC0 = 0x06024AC0;
D_6026C90 = 0x06026C90;
@ -309,16 +285,10 @@ D_602C2B0 = 0x0602C2B0;
D_602CACC = 0x0602CACC;
D_602CB80 = 0x0602CB80;
D_MA_602CB80 = 0x0602CB80;
D_602D5F0 = 0x0602D5F0;
D_602DAD0 = 0x0602DAD0;
D_MA_602DAE0 = 0x0602DAE0;
D_MA_602DB80 = 0x0602DB80;
D_MA_602DC20 = 0x0602DC20;
D_602DCA0 = 0x0602DCA0;
D_602E080 = 0x0602E080;
D_602E570 = 0x0602E570;
D_602E7A0 = 0x0602E7A0;
D_602E9E0 = 0x0602E9E0;
D_602F684 = 0x0602F684;
D_602F6A0 = 0x0602F6A0;
D_602F6EC = 0x0602F6EC;
@ -326,7 +296,6 @@ D_602F708 = 0x0602F708;
D_602F724 = 0x0602F724;
D_602F740 = 0x0602F740;
D_602F75C = 0x0602F75C;
D_602F7C0 = 0x0602F7C0;
D_602FA50 = 0x0602FA50;
D_602FA9C = 0x0602FA9C;
D_602FF60 = 0x0602FF60;
@ -392,10 +361,8 @@ D_MA_6035A48 = 0x06035A48;
D_MA_6035AE0 = 0x06035AE0;
D_MA_6035D9C = 0x06035D9C;
D_MA_6035E04 = 0x06035E04;
D_6035F10 = 0x06035F10;
D_MA_60360C0 = 0x060360C0;
D_MA_6036154 = 0x06036154;
D_60361F0 = 0x060361F0;
D_MA_6036204 = 0x06036204;
D_MA_603626C = 0x0603626C;
D_MA_6036288 = 0x06036288;
@ -426,50 +393,6 @@ D_MA_60368E0 = 0x060368E0;
D_MA_6036930 = 0x06036930;
D_MA_603694C = 0x0603694C;
D_MA_6036968 = 0x06036968;
D_603DCA4 = 0x0603DCA4;
D_603DD40 = 0x0603DD40;
D_603DDF0 = 0x0603DDF0;
D_603DE8C = 0x0603DE8C;
D_603DEF4 = 0x0603DEF4;
D_603DF8C = 0x0603DF8C;
D_603DFDC = 0x0603DFDC;
D_603E014 = 0x0603E014;
D_603E030 = 0x0603E030;
D_603E09C = 0x0603E09C;
D_603E0EC = 0x0603E0EC;
D_603E118 = 0x0603E118;
D_603E14C = 0x0603E14C;
D_603E1B4 = 0x0603E1B4;
D_603E21C = 0x0603E21C;
D_603E3E0 = 0x0603E3E0;
D_603E468 = 0x0603E468;
D_603E484 = 0x0603E484;
D_603E4A0 = 0x0603E4A0;
D_603E4A4 = 0x0603E4A4;
D_603E4DC = 0x0603E4DC;
D_603E514 = 0x0603E514;
D_603E54C = 0x0603E54C;
D_603E598 = 0x0603E598;
D_603E5B4 = 0x0603E5B4;
D_603E5D0 = 0x0603E5D0;
D_603E604 = 0x0603E604;
D_603E620 = 0x0603E620;
D_603E714 = 0x0603E714;
D_603E748 = 0x0603E748;
D_603E7C4 = 0x0603E7C4;
D_603E840 = 0x0603E840;
D_603E88C = 0x0603E88C;
D_603E8A8 = 0x0603E8A8;
D_603E98C = 0x0603E98C;
D_603E9EC = 0x0603E9EC;
D_603EA08 = 0x0603EA08;
D_603EA74 = 0x0603EA74;
D_603EAE0 = 0x0603EAE0;
D_603EB0C = 0x0603EB0C;
D_603F338 = 0x0603F338;
D_603F388 = 0x0603F388;
D_603F40C = 0x0603F40C;
D_603F4E4 = 0x0603F4E4;
D_6049F80 = 0x06049F80;
D_604A190 = 0x0604A190;
D_604A400 = 0x0604A400;
@ -480,7 +403,6 @@ D_TI_60034E0 = 0x060034E0;
D_TI_6003580 = 0x06003580;
D_TI_6003620 = 0x06003620;
D_TI_60036C0 = 0x060036C0;
D_CO_6037160 = 0x06037160;
D_601E424 = 0x0601E424;
D_6026C80 = 0x06026C80;
D_6029BE4 = 0x06029BE4;
@ -718,9 +640,6 @@ D_602DE70 = 0x0602DE70;
D_602DC40 = 0x0602DC40;
D_602D830 = 0x0602D830;
D_602D340 = 0x0602D340;
D_6031280 = 0x06031280;
D_6031130 = 0x06031130;
D_6030850 = 0x06030850;
D_602DD40 = 0x0602DD40;
D_6033AF0 = 0x06033AF0;
D_60186E0 = 0x060186E0;
@ -744,9 +663,6 @@ D_602DE70 = 0x0602DE70;
D_602DC40 = 0x0602DC40;
D_602D830 = 0x0602D830;
D_602D340 = 0x0602D340;
D_6031280 = 0x06031280;
D_6031130 = 0x06031130;
D_6030850 = 0x06030850;
D_602DD40 = 0x0602DD40;
D_6033AF0 = 0x06033AF0;
D_60186E0 = 0x060186E0;
@ -782,7 +698,6 @@ D_60165D0 = 0x060165D0;
D_6016880 = 0x06016880;
D_6016B50 = 0x06016B50;
D_6000C40 = 0x06000C40;
D_6018E80 = 0x06018E80;
D_601F620 = 0x0601F620;
D_601F420 = 0x0601F420;
D_6018C80 = 0x06018C80;
@ -827,7 +742,6 @@ D_6026DA0 = 0x06026DA0;
D_6026D10 = 0x06026D10;
D_6026C80 = 0x06026C80;
D_ME_6026C80 = 0x06026C80;
D_CO_6000000 = 0x06000000;
D_ME_6000000 = 0x06000000;
D_FO_6000000 = 0x06000000;
D_KA_6000000 = 0x06000000;
@ -990,7 +904,6 @@ D_1010920 = 0x01010920;
D_1010970 = 0x01010970;
// fox_enmy
D_CO_60371A4 = 0x0060371A4;
D_ME_6026CC4 = 0x006026CC4;
D_SX_602A164 = 0x00602A164;
D_A6_6023F64 = 0x006023F64;
@ -1009,7 +922,6 @@ D_BO_600FF74 = 0x00600FF74;
D_VE2_600FF74 = 0x006014D94;
// fox_enmy2
D_6011F90 = 0x06011F90;
D_601F2A0 = 0x0601F2A0;
D_A6_6016190 = 0x06016190;
D_SX_6023500 = 0x06023500;
@ -1485,16 +1397,13 @@ D_6003090 = 0x6003090;
D_MA_6003370 = 0x6003370;
D_A6_60038C0 = 0x60038C0;
D_60038E0 = 0x60038E0;
D_60038F8 = 0x60038F8;
D_6004380 = 0x6004380;
D_MA_6004440 = 0x6004440;
D_6004500 = 0x6004500;
D_60046F0 = 0x60046F0;
D_6004900 = 0x6004900;
D_A6_6005700 = 0x6005700;
D_6005710 = 0x6005710;
D_AQ_6005954 = 0x6005954;
D_60059F0 = 0x60059F0;
D_AQ_6005A80 = 0x6005A80;
D_TI_600631C = 0x600631C;
D_6006360 = 0x6006360;
@ -1590,7 +1499,6 @@ D_600C6A0 = 0x600C6A0;
D_600C740 = 0x600C740;
D_600C780 = 0x600C780;
D_600CAA0 = 0x600CAA0;
D_600CBD8 = 0x600CBD8;
D_MA_600CD18 = 0x600CD18;
D_600CD60 = 0x600CD60;
D_600CDC0 = 0x600CDC0;
@ -1743,7 +1651,6 @@ D_A6_6019730 = 0x6019730;
D_6019738 = 0x6019738;
D_AQ_6019880 = 0x6019880;
D_601996C = 0x601996C;
D_60199D0 = 0x60199D0;
D_6019E18 = 0x6019E18;
D_AQ_6019E80 = 0x6019E80;
D_6019EB0 = 0x6019EB0;
@ -1763,8 +1670,6 @@ D_VE1_601B1E4 = 0x601B1E4;
D_A6_601B2B0 = 0x601B2B0;
D_601B4B0 = 0x601B4B0;
D_601B4C4 = 0x601B4C4;
D_601B640 = 0x601B640;
D_601B6C0 = 0x601B6C0;
D_601BAD0 = 0x601BAD0;
D_A6_601BB40 = 0x601BB40;
D_601BCC0 = 0x601BCC0;
@ -1796,7 +1701,6 @@ D_601E8C4 = 0x601E8C4;
D_601E9A0 = 0x601E9A0;
D_601E9D0 = 0x601E9D0;
D_MA_601EA28 = 0x601EA28;
D_601EAA0 = 0x601EAA0;
D_MA_601EAB0 = 0x601EAB0;
D_MA_601EBBC = 0x601EBBC;
D_AQ_601EC68 = 0x601EC68;
@ -1809,24 +1713,13 @@ D_601FBC4 = 0x601FBC4;
D_601FC90 = 0x601FC90;
D_601FF80 = 0x601FF80;
D_60200E0 = 0x60200E0;
D_SX_60206DC = 0x60206DC;
D_6020760 = 0x6020760;
D_6020810 = 0x6020810;
D_6020A30 = 0x6020A30;
D_AQ_6020A40 = 0x6020A40;
D_6020B40 = 0x6020B40;
D_SX_6020C68 = 0x6020C68;
D_AQ_6020C6C = 0x6020C6C;
D_SX_6020D20 = 0x6020D20;
D_SO_600631C = 0x6020DD0;
D_6020E60 = 0x6020E60;
D_6020F60 = 0x6020F60;
D_SX_6020FB0 = 0x6020FB0;
D_6021ABC = 0x6021ABC;
D_6021B88 = 0x6021B88;
D_SX_6021ED0 = 0x6021ED0;
D_AQ_602201C = 0x602201C;
D_AQ_60220E8 = 0x60220E8;
D_MA_6022200 = 0x6022200;
D_MA_60223C0 = 0x60223C0;
D_MA_6022450 = 0x6022450;
@ -1840,83 +1733,50 @@ D_60231A4 = 0x60231A4;
D_MA_6023228 = 0x6023228;
D_MA_6023388 = 0x6023388;
D_60236F0 = 0x60236F0;
D_AQ_6023780 = 0x6023780;
D_6023810 = 0x6023810;
D_AQ_602390C = 0x602390C;
D_MA_60239D0 = 0x60239D0;
D_6023AC0 = 0x6023AC0;
D_6023D50 = 0x6023D50;
D_60240B0 = 0x60240B0;
D_6024220 = 0x6024220;
D_60245E0 = 0x60245E0;
D_MA_6024670 = 0x6024670;
D_60246F8 = 0x60246F8;
D_AQ_6024A50 = 0x6024A50;
D_6024AD0 = 0x6024AD0;
D_6024B60 = 0x6024B60;
D_AQ_6024F80 = 0x6024F80;
D_AQ_602512C = 0x602512C;
D_MA_60251A0 = 0x60251A0;
D_MA_60253E0 = 0x60253E0;
D_6025500 = 0x6025500;
D_MA_60257B0 = 0x60257B0;
D_MA_6025850 = 0x6025850;
D_MA_6025B50 = 0x6025B50;
D_MA_6025CA0 = 0x6025CA0;
D_MA_6025DAC = 0x6025DAC;
D_6025E60 = 0x6025E60;
D_AQ_60260EC = 0x60260EC;
D_60263F0 = 0x60263F0;
D_AQ_60263F8 = 0x60263F8;
D_6026420 = 0x6026420;
D_MA_6026860 = 0x6026860;
D_MA_60269E0 = 0x60269E0;
D_MA_6027320 = 0x6027320;
D_6027340 = 0x6027340;
D_MA_602742C = 0x602742C;
D_MA_6027A04 = 0x6027A04;
D_MA_6027AF0 = 0x6027AF0;
D_MA_6027BF0 = 0x6027BF0;
D_MA_6027D40 = 0x6027D40;
D_MA_6027EB0 = 0x6027EB0;
D_A6_6027F50 = 0x6027F50;
D_6028260 = 0x6028260;
D_A6_6028454 = 0x6028454;
D_A6_6028578 = 0x6028578;
D_MA_60288A0 = 0x60288A0;
D_A6_60289FC = 0x60289FC;
D_6028A60 = 0x6028A60;
D_6029528 = 0x6029528;
D_6029674 = 0x6029674;
D_SX_6029890 = 0x6029890;
D_MA_6029890 = 0x6029890;
D_602991C = 0x602991C;
D_6029A48 = 0x6029A48;
D_602A520 = 0x602A520;
D_602A720 = 0x602A720;
D_602AA04 = 0x602AA04;
D_602AA7C = 0x602AA7C;
D_ZO_602AAC0 = 0x602AAC0;
D_602AB48 = 0x602AB48;
D_AQ_602AC28 = 0x602AC28;
D_AQ_602AC40 = 0x602AC40;
D_602AC50 = 0x602AC50;
D_AQ_602ACC0 = 0x602ACC0;
D_602B148 = 0x602B148;
D_AQ_602B4C0 = 0x602B4C0;
D_602BC18 = 0x602BC18;
D_602BC58 = 0x602BC58;
D_AQ_602BD60 = 0x602BD60;
D_602BE64 = 0x602BE64;
D_602C028 = 0x602C028;
D_AQ_602C030 = 0x602C030;
D_AQ_602C088 = 0x602C088;
D_602C0D0 = 0x602C0D0;
D_602C2CC = 0x602C2CC;
D_MA_602D380 = 0x602D380;
D_602D400 = 0x602D400;
D_602D5AC = 0x602D5AC;
D_602DA20 = 0x602DA20;
D_MA_602DCB8 = 0x602DCB8;
D_602E380 = 0x602E380;
D_AQ_602E584 = 0x602E584;
@ -1954,18 +1814,13 @@ D_6032580 = 0x6032580;
D_SX_603265C = 0x603265C;
D_SX_6032768 = 0x6032768;
D_SX_60328CC = 0x60328CC;
D_60329C0 = 0x60329C0;
D_6032BC0 = 0x6032BC0;
D_6033000 = 0x6033000;
D_60338DC = 0x60338DC;
D_6034B90 = 0x6034B90;
D_603531C = 0x603531C;
D_MA_6035678 = 0x6035678;
D_MA_60357CC = 0x60357CC;
D_MA_6035920 = 0x6035920;
D_MA_60359AC = 0x60359AC;
D_MA_6035A94 = 0x6035A94;
D_6035DA0 = 0x6035DA0;
D_MA_6035DD0 = 0x6035DD0;
D_MA_6035E68 = 0x6035E68;
D_MA_6035ECC = 0x6035ECC;
@ -1973,23 +1828,13 @@ D_MA_6035F30 = 0x6035F30;
D_MA_6035F94 = 0x6035F94;
D_MA_6035FF8 = 0x6035FF8;
D_MA_603605C = 0x603605C;
D_60361F0 = 0x60361F0;
D_6036278 = 0x6036278;
D_60363B0 = 0x60363B0;
D_MA_603648C = 0x603648C;
D_MA_6036520 = 0x6036520;
D_MA_603677C = 0x603677C;
D_MA_6036818 = 0x6036818;
D_6036840 = 0x6036840;
D_6036CD0 = 0x6036CD0;
D_6037CF0 = 0x6037CF0;
D_MA_60381D8 = 0x60381D8;
D_603B074 = 0x603B074;
D_CO_603D9E8 = 0x603D9E8;
D_603E748 = 0x603E748;
D_603E7C4 = 0x603E7C4;
D_603E924 = 0x603E924;
D_603EB38 = 0x603EB38;
D_6041070 = 0x6041070;
D_60447A0 = 0x60447A0;
D_6044820 = 0x6044820;

9
src/main/fox_A4290_colheaders.c
View File

@ -3,6 +3,7 @@
#include "variables.h"
#include "assets.h"
#include "assets/ast_aquas.h"
#include "assets/ast_corneria.h"
#include "assets/ast_macbeth.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
@ -115,15 +116,15 @@ CollisionHeader2 D_800D2CA0[19] = {
{ -1220.0f, 0.0f, -1315.0f },
{ 1403.0f, 174.0f, 1308.0f },
13,
D_603F338,
D_603F388,
D_CO_603F338,
D_CO_603F388,
},
{
{ -1311.0f, 0.0f, -1120.0f },
{ 1266.0f, 1465.0f, 1266.0f },
36,
D_603F40C,
D_603F4E4,
D_CO_603F40C,
D_CO_603F4E4,
},
{
{ -435.0f, -10.0f, -435.0f },

21
src/main/fox_bg.c
View File

@ -1,6 +1,6 @@
#include "global.h"
#include "assets.h"
#include "prevent_bss_reordering.h"
//#include "prevent_bss_reordering.h"
extern f32 D_i3_801C4188;
@ -19,6 +19,7 @@ f32 D_80161394; // can be static
#include "assets/ast_bg_planet.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@ -326,7 +327,7 @@ void func_8003E1E8(void) {
Matrix_SetGfxMtx(&gMasterDisp);
switch (gCurrentLevel) {
case LEVEL_CORNERIA:
gSPDisplayList(gMasterDisp++, D_60059F0);
gSPDisplayList(gMasterDisp++, D_CO_60059F0);
break;
case LEVEL_VENOM_1:
gSPDisplayList(gMasterDisp++, D_60046F0);
@ -336,7 +337,7 @@ void func_8003E1E8(void) {
Matrix_SetGfxMtx(&gMasterDisp);
switch (gCurrentLevel) {
case LEVEL_CORNERIA:
gSPDisplayList(gMasterDisp++, D_60059F0);
gSPDisplayList(gMasterDisp++, D_CO_60059F0);
break;
case LEVEL_VENOM_1:
gSPDisplayList(gMasterDisp++, D_60046F0);
@ -875,24 +876,24 @@ void func_80040CE4(void) {
RCP_SetupDL_20(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
if (gLevelMode == LEVELMODE_ON_RAILS) {
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_601B6C0));
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_CO_601B6C0));
temp_s0 = fabsf(Math_ModF(2.0f * (D_80177CE8 * 0.2133333f), 128.0f));
temp_fv0 = Math_ModF((10000.0f - gPlayer[gPlayerNum].unk_0AC) * 0.32f, 128.0f);
gDPSetupTile(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, temp_fv0, temp_s0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
switch (D_80161A88) {
case 0:
gDPLoadTileTexture(gMasterDisp++, D_601B6C0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gDPLoadTileTexture(gMasterDisp++, D_CO_601B6C0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gBgColor = 0x845; // 8, 8, 32
break;
case 1:
gDPLoadTileTexture(gMasterDisp++, D_6028260, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gDPLoadTileTexture(gMasterDisp++, D_CO_6028260, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gBgColor = 0x845; // 8, 8, 32
break;
case 2:
RCP_SetupDL_45(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
gDPLoadTileTexture(gMasterDisp++, D_6028A60, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gDPLoadTileTexture(gMasterDisp++, D_CO_6028A60, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gBgColor = 0x190F; // 24, 32, 56
break;
}
@ -900,12 +901,12 @@ void func_80040CE4(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -3000.0f, 1);
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601B640);
gSPDisplayList(gMasterDisp++, D_CO_601B640);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 3000.0f, 1);
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601B640);
gSPDisplayList(gMasterDisp++, D_CO_601B640);
} else {
D_80161A88 = 0;
gBgColor = 0x845; // 8, 8, 32
@ -913,7 +914,7 @@ void func_80040CE4(void) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601EAA0);
gSPDisplayList(gMasterDisp++, D_CO_601EAA0);
Matrix_Pop(&gGfxMatrix);
}
}

1
src/main/fox_demo.c
View File

@ -28,7 +28,6 @@ extern f32 D_80178478;
extern Gfx D_6000D80[];
extern Gfx D_600BAA0[];
extern Gfx D_60132B0[];
extern Gfx D_6020810[];
extern Animation D_AQ_6020A40;

103
src/main/fox_edata_1C.c
View File

@ -3,6 +3,7 @@
#include "assets/ast_vs_player.h"
#include "assets/ast_arwing.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@ -85,35 +86,35 @@ f32 D_800CC0F0[] = {
// clang-format off
ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_0, */ {(void*) D_6015F00, 0, (ObjectFunc) NULL, D_603E3E0, 800.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_1, */ {(void*) D_602E9E0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_2, */ {(void*) D_601BEC0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_3, */ {(void*) D_602E7A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_4, */ {(void*) D_60244A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_5, */ {(void*) D_602E570, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_6, */ {(void*) D_60132B0, 0, (ObjectFunc) NULL, D_603DCA4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_7, */ {(void*) D_602E080, 0, (ObjectFunc) NULL, D_603DD40, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_8, */ {(void*) D_60164F0, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_9, */ {(void*) D_6014500, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_10, */ {(void*) D_602D5F0, 0, (ObjectFunc) NULL, D_603DDF0, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_11, */ {(void*) D_601A7D0, 0, (ObjectFunc) NULL, D_603DE8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_12, */ {(void*) D_6014B50, 0, (ObjectFunc) NULL, D_603DEF4, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_13, */ {(void*) D_6016580, 0, (ObjectFunc) NULL, D_603DF8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_14, */ {(void*) D_601B560, 0, (ObjectFunc) func_80066EA8, D_603DFDC, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_15, */ {(void*) D_60361F0, 0, (ObjectFunc) func_80066EA8, D_603E014, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_16, */ {(void*) D_6018E80, 0, (ObjectFunc) func_80066EA8, D_603E030, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_17, */ {(void*) D_6035F10, 0, (ObjectFunc) func_80066EA8, D_603E09C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_18, */ {(void*) func_i1_8018753C, 1, (ObjectFunc) func_i1_80187530, D_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_19, */ {(void*) D_60153B0, 0, (ObjectFunc) NULL, D_603E118, 100.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_20, */ {(void*) D_601F5A0, 0, (ObjectFunc) NULL, D_603E14C, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_21, */ {(void*) D_60137B0, 0, (ObjectFunc) NULL, D_603E1B4, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_22, */ {(void*) D_6006A80, 0, (ObjectFunc) NULL, D_603E21C, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_23, */ {(void*) D_6016270, 0, (ObjectFunc) NULL, D_603E4A0, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_24, */ {(void*) D_6010E00, 0, (ObjectFunc) NULL, D_603E9EC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_25, */ {(void*) D_6014670, 0, (ObjectFunc) NULL, D_603EA08, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_26, */ {(void*) D_6010A50, 0, (ObjectFunc) NULL, D_603EA74, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_27, */ {(void*) D_60143E0, 0, (ObjectFunc) NULL, D_603EAE0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_28, */ {(void*) D_6014A20, 0, (ObjectFunc) NULL, D_603EB0C, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_0, */ {(void*) D_CO_6015F00, 0, (ObjectFunc) NULL, D_CO_603E3E0, 800.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_1, */ {(void*) D_CO_602E9E0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_2, */ {(void*) D_CO_601BEC0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_3, */ {(void*) D_CO_602E7A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_4, */ {(void*) D_CO_60244A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_5, */ {(void*) D_CO_602E570, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_6, */ {(void*) D_CO_60132B0, 0, (ObjectFunc) NULL, D_CO_603DCA4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_7, */ {(void*) D_CO_602E080, 0, (ObjectFunc) NULL, D_CO_603DD40, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_8, */ {(void*) D_CO_60164F0, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_9, */ {(void*) D_CO_6014500, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_10, */ {(void*) D_CO_602D5F0, 0, (ObjectFunc) NULL, D_CO_603DDF0, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_11, */ {(void*) D_CO_601A7D0, 0, (ObjectFunc) NULL, D_CO_603DE8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_12, */ {(void*) D_CO_6014B50, 0, (ObjectFunc) NULL, D_CO_603DEF4, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_13, */ {(void*) D_CO_6016580, 0, (ObjectFunc) NULL, D_CO_603DF8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_14, */ {(void*) D_CO_601B560, 0, (ObjectFunc) func_80066EA8, D_CO_603DFDC, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_15, */ {(void*) D_CO_60361F0, 0, (ObjectFunc) func_80066EA8, D_CO_603E014, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_16, */ {(void*) D_CO_6018E80, 0, (ObjectFunc) func_80066EA8, D_CO_603E030, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_17, */ {(void*) D_CO_6035F10, 0, (ObjectFunc) func_80066EA8, D_CO_603E09C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_18, */ {(void*) func_i1_8018753C, 1, (ObjectFunc) func_i1_80187530, D_CO_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_19, */ {(void*) D_CO_60153B0, 0, (ObjectFunc) NULL, D_CO_603E118, 100.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_20, */ {(void*) D_CO_601F5A0, 0, (ObjectFunc) NULL, D_CO_603E14C, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_21, */ {(void*) D_CO_60137B0, 0, (ObjectFunc) NULL, D_CO_603E1B4, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_22, */ {(void*) D_CO_6006A80, 0, (ObjectFunc) NULL, D_CO_603E21C, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_23, */ {(void*) D_6016270, 0, (ObjectFunc) NULL, D_CO_603E4A0, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_24, */ {(void*) D_CO_6010E00, 0, (ObjectFunc) NULL, D_CO_603E9EC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_25, */ {(void*) D_CO_6014670, 0, (ObjectFunc) NULL, D_CO_603EA08, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_26, */ {(void*) D_CO_6010A50, 0, (ObjectFunc) NULL, D_CO_603EA74, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_27, */ {(void*) D_CO_60143E0, 0, (ObjectFunc) NULL, D_CO_603EAE0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_28, */ {(void*) D_CO_6014A20, 0, (ObjectFunc) NULL, D_CO_603EB0C, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_29, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60064FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_30, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006518, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_31, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006564, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
@ -125,9 +126,9 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_37, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_600672C, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_38, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006778, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_39, */ {(void*) func_80059AEC, 1, (ObjectFunc) func_8006D350, D_800CBF34, 6000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_40, */ {(void*) func_80059F68, 1, (ObjectFunc) func_80066D5C, D_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_41, */ {(void*) func_80059FDC, 1, (ObjectFunc) func_80066EA8, D_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_42, */ {(void*) func_80059BBC, 1, (ObjectFunc) func_8006B95C, D_603E514, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_40, */ {(void*) func_80059F68, 1, (ObjectFunc) func_80066D5C, D_CO_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_41, */ {(void*) func_80059FDC, 1, (ObjectFunc) func_80066EA8, D_CO_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_42, */ {(void*) func_80059BBC, 1, (ObjectFunc) func_8006B95C, D_CO_603E514, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_43, */ {(void*) D_6024AC0, 0, (ObjectFunc) NULL, D_602B9EC, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_44, */ {(void*) D_600F560, 0, (ObjectFunc) NULL, D_602BA20, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_45, */ {(void*) D_600EC90, 0, (ObjectFunc) NULL, D_602BAE4, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
@ -139,9 +140,9 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_51, */ {(void*) D_6006F50, 0, (ObjectFunc) NULL, D_601B584, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_52, */ {(void*) D_6005780, 0, (ObjectFunc) func_i1_80193540, D_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_53, */ {(void*) D_AQ_6003610, 0, (ObjectFunc) NULL, D_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_54, */ {(void*) D_6000E00, 0, (ObjectFunc) func_8006AA98, D_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_55, */ {(void*) D_6013B50, 0, (ObjectFunc) NULL, D_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_56, */ {(void*) func_i1_8018F31C, 2, (ObjectFunc) func_i1_8018F044, D_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_54, */ {(void*) D_CO_6000E00, 0, (ObjectFunc) func_8006AA98, D_CO_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_55, */ {(void*) D_CO_6013B50, 0, (ObjectFunc) NULL, D_CO_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_56, */ {(void*) func_i1_8018F31C, 2, (ObjectFunc) func_i1_8018F044, D_CO_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_57, */ {(void*) func_i5_8018F8B8, 1, (ObjectFunc) func_i5_8018F4D8, D_TI_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_58, */ {(void*) D_TI1_700BE00, 0, (ObjectFunc) NULL, D_TI_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_59, */ {(void*) D_MA_6024010, 0, (ObjectFunc) NULL, D_MA_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 },
@ -246,12 +247,12 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_158 */ {(void*) D_SZ_6001360, 0, (ObjectFunc) NULL, D_SZ_60092E8, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_159 */ {(void*) D_6008370, 0, (ObjectFunc) NULL, D_601668C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_160 */ {(void*) D_6010960, 0, (ObjectFunc) NULL, D_6016714, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_161 */ {(void*) D_602F7C0, 0, (ObjectFunc) func_80068FE0, D_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_162 */ {(void*) D_601C9B0, 0, (ObjectFunc) func_80068FE0, D_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_161 */ {(void*) D_CO_602F7C0, 0, (ObjectFunc) func_80068FE0, D_CO_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_162 */ {(void*) D_CO_601C9B0, 0, (ObjectFunc) func_80068FE0, D_CO_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_163 */ {(void*) D_600A420, 0, (ObjectFunc) func_80068FE0, D_600FE9C, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_164 */ {(void*) func_80059C40, 1, (ObjectFunc) NULL, D_800CBF34, 1800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_165 */ {(void*) D_602DCA0, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_166 */ {(void*) D_601F500, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_165 */ {(void*) D_CO_602DCA0, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_166 */ {(void*) D_CO_601F500, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_167 */ {(void*) func_80059C34, 1, (ObjectFunc) func_80066E8C, D_800CBF34, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_168 */ {(void*) func_80059850, 1, (ObjectFunc) NULL, D_800CBF34, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_169 */ {(void*) D_TI_60023B0, 0, (ObjectFunc) func_i5_8018F038, D_TI_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 },
@ -261,10 +262,10 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_4C_173 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801923C0, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_174 */ {(void*) NULL, 1, (ObjectFunc) func_i1_8019243C, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_175 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_176 */ {(void*) func_i1_8018BAAC, 2, (ObjectFunc) func_i1_8018AED0, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_177 */ {(void*) func_i1_8018BBA4, 2, (ObjectFunc) func_i1_8018B15C, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_178 */ {(void*) func_i1_8018BBF8, 2, (ObjectFunc) func_i1_8018B418, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_179 */ {(void*) func_i1_8018BD7C, 2, (ObjectFunc) func_i1_8018B58C, D_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_176 */ {(void*) func_i1_8018BAAC, 2, (ObjectFunc) func_i1_8018AED0, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_177 */ {(void*) func_i1_8018BBA4, 2, (ObjectFunc) func_i1_8018B15C, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_178 */ {(void*) func_i1_8018BBF8, 2, (ObjectFunc) func_i1_8018B418, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_179 */ {(void*) func_i1_8018BD7C, 2, (ObjectFunc) func_i1_8018B58C, D_CO_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_180 */ {(void*) func_8005B6A4, 1, (ObjectFunc) func_80066A80, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_181 */ {(void*) D_6018C00, 0, (ObjectFunc) func_i2_8018756C, D_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_182 */ {(void*) func_8005B71C, 1, (ObjectFunc) func_i2_80187650, D_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
@ -277,11 +278,11 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_189 */ {(void*) func_8005A094, 1, (ObjectFunc) func_8006C008, D_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_190 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_191 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_192 */ {(void*) func_8005B9A4, 1, (ObjectFunc) func_8006654C, D_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
/* OBJ_ACTOR_193 */ {(void*) func_8005BA30, 1, (ObjectFunc) func_800669A0, D_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_192 */ {(void*) func_8005B9A4, 1, (ObjectFunc) func_8006654C, D_CO_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
/* OBJ_ACTOR_193 */ {(void*) func_8005BA30, 1, (ObjectFunc) func_800669A0, D_CO_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_194 */ {(void*) func_8006B74C, 1, (ObjectFunc) func_8006B094, D_800CC000, 200.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_195 */ {(void*) func_8004FEC0, 1, (ObjectFunc) func_8004F8AC, D_800CBF34, 20000.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_196 */ {(void*) func_80059BF0, 1, (ObjectFunc) func_8006BB78, D_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_196 */ {(void*) func_80059BF0, 1, (ObjectFunc) func_8006BB78, D_CO_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_197 */ {(void*) func_80035448, 1, (ObjectFunc) func_800319AC, D_800CC038, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_198 */ {(void*) func_80035448, 1, (ObjectFunc) func_80092EC0, D_800CC01C, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_199 */ {(void*) func_i6_80188448, 1, (ObjectFunc) func_i6_801880E4, D_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
@ -377,11 +378,11 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_289 */ {(void*) func_800596B0, 1, (ObjectFunc) func_i6_80189470, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_290 */ {(void*) NULL, 1, (ObjectFunc) func_i6_8018933C, D_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_291 */ {(void*) func_80067874, 1, (ObjectFunc) func_8006753C, D_800CBEA8, 1000.0f, 0, 0, 0, 0, 1.0f, 0 },
/* OBJ_BOSS_292 */ {(void*) func_i1_8018AA74, 2, (ObjectFunc) func_i1_80189058, D_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_293 */ {(void*) func_i1_8018ECAC, 1, (ObjectFunc) func_i1_8018C19C, D_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_294 */ {(void*) func_i1_8018ED78, 1, (ObjectFunc) func_i1_8018DDAC, D_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_295 */ {(void*) func_i1_8018EE84, 1, (ObjectFunc) func_i1_8018E290, D_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_296 */ {(void*) func_i1_8018EF90, 1, (ObjectFunc) func_i1_8018E76C, D_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_292 */ {(void*) func_i1_8018AA74, 2, (ObjectFunc) func_i1_80189058, D_CO_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_293 */ {(void*) func_i1_8018ECAC, 1, (ObjectFunc) func_i1_8018C19C, D_CO_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_294 */ {(void*) func_i1_8018ED78, 1, (ObjectFunc) func_i1_8018DDAC, D_CO_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_295 */ {(void*) func_i1_8018EE84, 1, (ObjectFunc) func_i1_8018E290, D_CO_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_296 */ {(void*) func_i1_8018EF90, 1, (ObjectFunc) func_i1_8018E76C, D_CO_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_297 */ {(void*) func_i2_8018BACC, 1, (ObjectFunc) func_i2_8018978C, D_602F75C, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_298 */ {(void*) func_i2_801887D0, 1, (ObjectFunc) func_i2_80188344, D_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_299 */ {(void*) func_80042FC4, 2, (ObjectFunc) func_80042FB8, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },

48
src/main/fox_edisplay.c
View File

@ -1,7 +1,7 @@
#include "global.h"
#include "assets.h"
#include "prevent_bss_reordering.h"
//#include "prevent_bss_reordering.h"
Vec3f D_801615D0;
Vec3f D_801615E0;
s32 D_801615EC;
@ -9,6 +9,7 @@ Matrix D_801615F0;
WingInfo D_80161630;
#include "fox_edisplay_assets.h"
#include "assets/ast_corneria.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_macbeth.h"
@ -109,12 +110,12 @@ void func_80059BB0(void* arg0) {
}
void func_80059BBC(Object_80* obj80) {
gSPDisplayList(gMasterDisp++, D_6023AC0);
gSPDisplayList(gMasterDisp++, D_CO_6023AC0);
}
void func_80059BF0(Actor* actor) {
if (actor->unk_0B6 != 0) {
gSPDisplayList(gMasterDisp++, D_6032BC0);
gSPDisplayList(gMasterDisp++, D_CO_6032BC0);
}
}
@ -131,12 +132,12 @@ void func_80059C40(Object_4C* obj4C) {
case 0:
Matrix_Scale(gGfxMatrix, 2.0f, 1.0f, 0.7f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case 21:
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.7f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case 6:
case 7:
@ -147,17 +148,17 @@ void func_80059C40(Object_4C* obj4C) {
case 56:
Matrix_Scale(gGfxMatrix, 1.6f, 1.0f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case 20:
Matrix_Scale(gGfxMatrix, 1.2f, 1.0f, 1.3f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case 22:
Matrix_Scale(gGfxMatrix, 2.2f, 1.0f, 1.4f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
}
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
@ -166,18 +167,18 @@ void func_80059C40(Object_4C* obj4C) {
void func_80059F68(Item* item) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -95.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_602DA20);
gSPDisplayList(gMasterDisp++, D_CO_602DA20);
}
void func_80059FDC(Item* item) {
gSPDisplayList(gMasterDisp++, D_6035DA0);
gSPDisplayList(gMasterDisp++, D_CO_6035DA0);
}
void func_8005A010(Object_4C* obj4C) {
if (obj4C->unk_48 == 0) {
Matrix_RotateY(gGfxMatrix, M_PI / 2, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_60361F0);
gSPDisplayList(gMasterDisp++, D_CO_60361F0);
}
}
@ -188,9 +189,10 @@ void func_8005A088(void* arg0) {
}
Gfx* D_800CFA54[] = {
D_6027960, D_60273A0, D_60183B0, D_60121E0, D_602A2E0, D_602A720, D_602B8F0, D_602A8C0, D_6028E70, D_602E0A0,
D_602DE70, D_602DC40, D_602D830, D_602D340, D_6031280, D_6031130, D_6030850, D_6030FD0, D_602DD40, D_6033AF0,
D_60186E0, D_6024160, D_6033290, D_6017F10, D_60074E0, D_6007590, D_6007730, D_6005CC0,
D_6027960, D_60273A0, D_60183B0, D_60121E0, D_602A2E0, D_602A720, D_602B8F0,
D_602A8C0, D_6028E70, D_602E0A0, D_602DE70, D_602DC40, D_602D830, D_602D340,
D_CO_6031280, D_CO_6031130, D_CO_6030850, D_CO_6030FD0, D_602DD40, D_6033AF0, D_60186E0,
D_6024160, D_6033290, D_6017F10, D_60074E0, D_6007590, D_6007730, D_6005CC0,
};
Gfx* D_800CFAC4[] = {
D_60176D0, D_6017810, D_6017770, D_6016D90, D_6016E30, D_60178B0,
@ -201,7 +203,7 @@ Gfx* D_800CFADC[] = {
};
Gfx* D_800CFB08[] = { D_6020F10, D_6021100, D_60214B0 };
Gfx* D_800CFB14[] = { D_60163E0, D_60165D0, D_6016880, D_6016B50, D_6000C40 };
Gfx* D_800CFB28[] = { D_6018E80, D_601F620, D_601F420, D_6018C80, D_601F940, D_601F260 };
Gfx* D_800CFB28[] = { D_CO_6018E80, D_601F620, D_601F420, D_6018C80, D_601F940, D_601F260 };
Gfx* D_800CFB40[] = {
D_6014DB0, D_60146D0, D_6014B80, D_6014470, D_6014930, D_60138A0, D_60151A0, D_600F750, D_6015810,
};
@ -591,8 +593,8 @@ void func_8005B848(Actor* actor) {
void func_8005B9A4(Actor* actor) {
Matrix_Translate(gGfxMatrix, 0.0f, -124.0f, 0.0f, 1);
Animation_GetFrameData(&D_6029528, actor->unk_0B6, actor->vwork);
Animation_DrawSkeleton(1, D_6029674, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_CO_6029528, actor->unk_0B6, actor->vwork);
Animation_DrawSkeleton(1, D_CO_6029674, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
}
void func_8005BA30(Actor* actor) {
@ -600,7 +602,7 @@ void func_8005BA30(Actor* actor) {
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_6020B40);
gSPDisplayList(gMasterDisp++, D_CO_6020B40);
}
void func_8005BAAC(void) {
@ -658,7 +660,7 @@ void func_8005BAB4(ObjectId objId, s32 index) {
}
break;
case OBJ_BOSS_292:
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case OBJ_BOSS_316:
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) {
@ -681,14 +683,14 @@ void func_8005BAB4(ObjectId objId, s32 index) {
}
switch (objId) {
case OBJ_BOSS_293:
gSPDisplayList(gMasterDisp++, D_6036840);
gSPDisplayList(gMasterDisp++, D_CO_6036840);
break;
case OBJ_BOSS_294:
gSPDisplayList(gMasterDisp++, D_6036CD0);
gSPDisplayList(gMasterDisp++, D_CO_6036CD0);
break;
case OBJ_BOSS_295:
case OBJ_BOSS_296:
gSPDisplayList(gMasterDisp++, D_60363B0);
gSPDisplayList(gMasterDisp++, D_CO_60363B0);
break;
}
break;
@ -696,7 +698,7 @@ void func_8005BAB4(ObjectId objId, s32 index) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 150);
Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, gActors[index].scale, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case OBJ_ACTOR_230:
RCP_SetupDL_48();

6
src/main/fox_effect.c
View File

@ -6,7 +6,6 @@ const char D_800D7230[] = "Enm->wrk3=<%d>\n";
const char D_800D7240[] = "a=<%d>\n";
const char D_800D7248[] = "a=<%d>\n";
extern Gfx D_6004900[];
extern Gfx D_6016880[];
extern Gfx D_6018AF0[];
extern Gfx D_601BAD0[];
@ -15,6 +14,7 @@ extern Gfx D_601BAD0[];
#include "assets/ast_arwing.h"
#include "assets/ast_bg_space.h"
#include "assets/ast_bg_planet.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@ -492,7 +492,7 @@ void func_80078C84(Effect* effect) {
void func_80078CE8(Effect* effect) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A);
Graphics_SetScaleMtx(effect->scale2);
gSPDisplayList(gMasterDisp++, D_6033000);
gSPDisplayList(gMasterDisp++, D_CO_6033000);
}
void func_80078D60(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) {
@ -2166,7 +2166,7 @@ void func_8007DA58(Effect* effect) {
void func_8007DAE4(Effect* effect) {
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPDisplayList(gMasterDisp++, D_6004900);
gSPDisplayList(gMasterDisp++, D_CO_6004900);
RCP_SetupDL(&gMasterDisp, 0x40);
}

3
src/main/fox_enmy.c
View File

@ -1,6 +1,7 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "assets.h"
#include "assets/ast_corneria.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
@ -1707,7 +1708,7 @@ void func_8006654C(Actor* actor) {
actor->fwork[0] += 0.5f;
}
actor->unk_0B6++;
if (Animation_GetFrameCount(&D_6029528) < actor->unk_0B6) {
if (Animation_GetFrameCount(&D_CO_6029528) < actor->unk_0B6) {
actor->unk_0B6 = 0;
}
if ((actor->obj.rot.z < 15.0f) && (actor->unk_0B6 < 0x14)) {

5
src/main/fox_enmy2.c
View File

@ -8,6 +8,7 @@ s32 D_80161690;
#include "fox_enmy2_assets.h"
#include "assets/ast_arwing.h"
#include "assets/ast_training.h"
#include "assets/ast_corneria.h"
#include "assets/ast_warp_zone.h"
#include "assets/ast_allies.h"
#include "assets/ast_sector_x.h"
@ -104,7 +105,7 @@ void func_8006AA98(Object_80* obj80) {
Vec3f sp24;
Vec3f sp18;
Texture_Scroll(D_60038F8, 32, 32, 1);
Texture_Scroll(D_CO_60038F8, 32, 32, 1);
if ((gGameFrameCount % 4) == 0) {
Matrix_RotateY(gCalcMatrix, obj80->obj.rot.y * M_DTOR, 0);
@ -874,7 +875,7 @@ UnkStruct_D003C D_800D003C[108] = {
{ D_ENMY_PLANET_40073C0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_ENMY_PLANET_4007AF0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ D_6011F90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 },
{ D_CO_6011F90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 },
{ D_ENMY_PLANET_4000710, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 0, 1, 1, 1.0f, 1 },
{ NULL, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 },
{ D_ENMY_SPACE_400BD20, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },

2
src/main/fox_hud.c
View File

@ -79,6 +79,7 @@ s32 D_80161900[20];
#include "assets/ast_blue_marine.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_font.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_area_6.h"
#include "assets/ast_aquas.h"
@ -95,7 +96,6 @@ void func_80087788(void);
// Segmented addresses
extern u8 D_CO_6000000[];
extern u8 D_ME_6000000[];
extern u8 D_FO_6000000[];
extern u8 D_KA_6000000[];

9
src/main/fox_play.c
View File

@ -2,6 +2,7 @@
#include "global.h"
#include "assets.h"
#include "fox_map.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@ -330,7 +331,7 @@ void func_800A5338(void) {
s32 i;
s32 j;
D_80178310 = SEGMENTED_TO_VIRTUAL(D_603B074);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_CO_603B074);
for (j = 0, obj58 = gObjects58; j < 200; j++) {
if (D_80178310[j].id <= OBJ_INVALID) {
@ -346,7 +347,7 @@ void func_800A5338(void) {
obj58->obj.rot.y = D_80178310[j].rot.y;
Object_SetInfo(&obj58->info, obj58->obj.id);
if (obj58->obj.id == OBJ_80_1) {
obj58->info.dList = D_6020760;
obj58->info.dList = D_CO_6020760;
}
obj58++;
}
@ -6172,9 +6173,9 @@ void func_800B79B0(void) {
}
break;
case LEVEL_CORNERIA:
func_8008C104(D_603EB38, D_6028A60);
func_8008C104(D_CO_603EB38, D_CO_6028A60);
if (gGameFrameCount & 1) {
Texture_Scroll(D_600CBD8, 64, 32, 3);
Texture_Scroll(D_CO_600CBD8, 64, 32, 3);
}
break;
case LEVEL_AQUAS:

9
src/main/fox_radio.c
View File

@ -14,6 +14,7 @@ s32 D_80178744;
s32 D_80178748;
#include "assets/ast_allies.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@ -258,16 +259,16 @@ void func_800BAAE8(void) {
sp44 = D_STAR_WOLF_F002D60;
break;
case RCID_BOSS_CORNERIA:
sp44 = D_6026420;
sp44 = D_CO_6026420;
break;
case RCID_BOSS_CORNERIA_OPEN:
sp44 = D_6027340;
sp44 = D_CO_6027340;
break;
case RCID_BOSS_CORNERIA2:
sp44 = D_60245E0;
sp44 = D_CO_60245E0;
break;
case RCID_BOSS_CORNERIA2_OPEN:
sp44 = D_6025500;
sp44 = D_CO_6025500;
break;
case RCID_BOSS_METEO:
sp44 = D_601C8E0;

126
src/overlays/ovl_i1/fox_co.c
View File

@ -1,6 +1,7 @@
#include "global.h"
#include "assets.h"
#include "assets/ast_arwing.h"
#include "assets/ast_corneria.h"
// bss
u8 D_i1_8019B6D0;
@ -9,12 +10,10 @@ f32 D_i1_8019B6D8[68];
void func_i1_80187530(Object_80* obj80) {
}
extern Gfx D_60199D0[];
void func_i1_8018753C(Object_80* obj80) {
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_60199D0);
gSPDisplayList(gMasterDisp++, D_CO_60199D0);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
}
@ -528,9 +527,6 @@ void func_i1_80188D50(Boss* boss) {
}
}
extern Animation D_602BC18;
extern Animation D_602C0D0;
void func_i1_80189058(Boss* boss) {
Vec3f sp21C = { 0.0f, 0.0f, 0.0f };
s32 sp218;
@ -572,7 +568,7 @@ void func_i1_80189058(Boss* boss) {
D_i1_8019B6D8[66] = 0.0f;
D_i1_8019B6D8[67] = 10000.0f;
boss->timer_050 = 30;
Animation_GetFrameData(&D_602C0D0, 0, boss->vwork);
Animation_GetFrameData(&D_CO_602C0D0, 0, boss->vwork);
gBossFrameCount = 0;
}
gBossFrameCount++;
@ -714,7 +710,7 @@ void func_i1_80189058(Boss* boss) {
break;
}
}
Animation_GetFrameData(&D_602C0D0, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602C0D0, boss->unk_04C, sp84);
if (boss->timer_052 == 0) {
boss->timer_052 = 150;
boss->swork[30] = 1;
@ -726,10 +722,10 @@ void func_i1_80189058(Boss* boss) {
D_i1_8019B6D8[19] = D_i1_8019B6D8[67] = gPlayer[0].unk_138;
boss->unk_04C += 2;
if (boss->unk_04C >= Animation_GetFrameCount(&D_602BC18)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_CO_602BC18)) {
boss->unk_04C = 0;
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84);
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp1EC, &sp21C);
if (boss->timer_052 == 0) {
boss->timer_052 = 150;
@ -746,7 +742,7 @@ void func_i1_80189058(Boss* boss) {
if (boss->unk_04C < 0) {
boss->unk_04C = 100;
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84);
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp6C, &sp21C);
if (boss->timer_052 == 0) {
boss->timer_052 = 30;
@ -767,7 +763,7 @@ void func_i1_80189058(Boss* boss) {
if (boss->unk_04C >= 101) {
boss->unk_04C = 0;
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84);
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp21C);
if (boss->timer_052 == 0) {
boss->timer_052 = 30;
@ -788,7 +784,7 @@ void func_i1_80189058(Boss* boss) {
if (boss->unk_04C >= 101) {
boss->unk_04C = 0;
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84);
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp21C);
func_i1_80188A18(boss);
break;
@ -848,7 +844,7 @@ void func_i1_80189058(Boss* boss) {
if (!(gGameFrameCount & 0xF)) {
boss->unk_04C = RAND_INT(100.0f);
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84);
boss->fwork[14] = 0.03f;
break;
case 7:
@ -917,10 +913,10 @@ void func_i1_80189058(Boss* boss) {
if (boss->timer_050 == 0) {
Object_Kill(&boss->obj, boss->sfxSource);
}
Animation_GetFrameData(&D_602BC18, 0, sp84);
Animation_GetFrameData(&D_CO_602BC18, 0, sp84);
break;
default:
Animation_GetFrameData(&D_602C0D0, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602C0D0, boss->unk_04C, sp84);
break;
}
Math_SmoothStepToF(&boss->vel.x, sp21C.x, 0.3f, 5.0f, 0.0f);
@ -1083,11 +1079,9 @@ void func_i1_8018A730(s32 limbIndex, Vec3f* rot, void* data) {
}
}
extern Limb* D_602BE64[];
void func_i1_8018AA74(Boss* boss) {
Matrix_Translate(gCalcMatrix, 0.0f, 700.0f, 0.0f, (u8) 1);
Animation_DrawSkeleton(2, D_602BE64, boss->vwork, func_i1_8018A434, func_i1_8018A730, boss, gCalcMatrix);
Matrix_Translate(gCalcMatrix, 0.0f, 700.0f, 0.0f, 1);
Animation_DrawSkeleton(2, D_CO_602BE64, boss->vwork, func_i1_8018A434, func_i1_8018A730, boss, gCalcMatrix);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
}
@ -1156,17 +1150,14 @@ void func_i1_8018ACE0(Actor* actor) {
}
}
extern Animation D_602991C;
extern Gfx D_60329C0[];
void func_i1_8018AED0(Actor* actor) {
Vec3f sp40[20];
f32 temp_sin;
f32 temp_cos;
func_i1_8018ACE0(actor);
Math_SmoothStepToVec3fArray(sp40, actor->vwork, 0, Animation_GetFrameData(&D_602991C, actor->unk_0B6, sp40), 1.0f,
1.0f, 1.0f);
Math_SmoothStepToVec3fArray(sp40, actor->vwork, 0, Animation_GetFrameData(&D_CO_602991C, actor->unk_0B6, sp40),
1.0f, 1.0f, 1.0f);
temp_sin = SIN_DEG(actor->obj.rot.y);
actor->vel.x = actor->fwork[0] * temp_sin;
temp_cos = COS_DEG(actor->obj.rot.y);
@ -1174,7 +1165,7 @@ void func_i1_8018AED0(Actor* actor) {
switch (actor->state) {
case 0:
actor->fwork[1] += 20.0f;
Texture_Scroll(&D_60329C0, 16, 16, 1);
Texture_Scroll(&D_CO_60329C0, 16, 16, 1);
actor->unk_0B6 = 0;
actor->fwork[0] += 1.0f;
if (actor->fwork[0] > 10.0f) {
@ -1194,7 +1185,7 @@ void func_i1_8018AED0(Actor* actor) {
if (actor->unk_0B6 == 50) {
gObjects80[actor->iwork[0] - 1].state = 1;
}
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_602991C)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602991C)) {
actor->state++;
}
break;
@ -1224,8 +1215,6 @@ void func_i1_8018B0B4(Actor* actor) {
}
}
extern Animation D_602AA04;
void func_i1_8018B15C(Actor* actor) {
Vec3f sp60[20];
Vec3f sp54;
@ -1235,37 +1224,43 @@ void func_i1_8018B15C(Actor* actor) {
f32 temp_cos;
func_i1_8018ACE0(actor);
obj80 = &gObjects80[actor->iwork[0]];
temp_sin = SIN_DEG(actor->obj.rot.y);
actor->vel.x = actor->fwork[0] * temp_sin;
temp_cos = COS_DEG(actor->obj.rot.y);
actor->vel.z = actor->fwork[0] * temp_cos;
Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0);
switch (actor->state) {
case 3:
break;
case 0:
actor->timer_0BC = 40;
actor->state = 1;
actor->unk_0B6 = 0;
break;
case 1:
actor->fwork[0] = -10.0f;
Texture_Scroll(&D_60329C0, 16, 16, 1);
Texture_Scroll(&D_CO_60329C0, 16, 16, 1);
if (actor->timer_0BC == 0) {
actor->state = 2;
actor->iwork[2] = RAND_INT(10.0f) + 10;
}
break;
case 2:
actor->fwork[0] = -10.0f;
Texture_Scroll(&D_60329C0, 16, 16, 1);
Texture_Scroll(&D_CO_60329C0, 16, 16, 1);
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_602AA04)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602AA04)) {
actor->state = 3;
}
if (actor->unk_0B6 == (Animation_GetFrameCount(&D_602AA04) - actor->iwork[2])) {
if (actor->unk_0B6 == (Animation_GetFrameCount(&D_CO_602AA04) - actor->iwork[2])) {
actor->iwork[1] = 1;
obj80->state = 1;
sp54.x = 0.0f;
@ -1279,6 +1274,7 @@ void func_i1_8018B15C(Actor* actor) {
}
break;
}
if (actor->iwork[1] == 0) {
obj80->obj.pos.x = actor->fwork[2];
obj80->obj.pos.y = actor->fwork[6];
@ -1286,11 +1282,10 @@ void func_i1_8018B15C(Actor* actor) {
obj80->obj.rot.y = actor->obj.rot.y;
obj80->vel.y = 0.0f;
}
Math_SmoothStepToVec3fArray(sp60, actor->vwork, 0, Animation_GetFrameData(&D_602AA04, actor->unk_0B6, sp60), 1.0f,
1.0f, 1.0f);
}
extern Animation D_602A520;
Math_SmoothStepToVec3fArray(sp60, actor->vwork, 0, Animation_GetFrameData(&D_CO_602AA04, actor->unk_0B6, sp60),
1.0f, 1.0f, 1.0f);
}
void func_i1_8018B418(Actor* actor) {
s32 pad;
@ -1301,24 +1296,28 @@ void func_i1_8018B418(Actor* actor) {
s32 pad2[4];
func_i1_8018ACE0(actor);
temp_sin = SIN_DEG(actor->obj.rot.y);
actor->vel.x = actor->fwork[0] * temp_sin;
temp_cos = COS_DEG(actor->obj.rot.y);
actor->vel.z = actor->fwork[0] * temp_cos;
switch (actor->state) {
case 0:
actor->state = 1;
break;
case 1:
actor->fwork[0] = 5.0f;
actor->fwork[1] += 5.0f;
Texture_Scroll(&D_60329C0, 16, 16, 1);
Texture_Scroll(&D_CO_60329C0, 16, 16, 1);
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_602A520)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602A520)) {
actor->unk_0B6 = 0;
}
break;
}
if (actor->iwork[1] == 0) {
temp_v0_2 = &gObjects80[actor->iwork[0]];
temp_v0_2->obj.pos.x = actor->fwork[2];
@ -1327,8 +1326,9 @@ void func_i1_8018B418(Actor* actor) {
temp_v0_2->obj.rot.y = actor->fwork[1];
temp_v0_2->vel.y = 0.0f;
}
Math_SmoothStepToVec3fArray(sp54, actor->vwork, 0, Animation_GetFrameData(&D_602A520, actor->unk_0B6, sp54), 1.0f,
1.0f, 1.0f);
Math_SmoothStepToVec3fArray(sp54, actor->vwork, 0, Animation_GetFrameData(&D_CO_602A520, actor->unk_0B6, sp54),
1.0f, 1.0f, 1.0f);
}
void func_i1_8018B58C(Actor* actor) {
@ -1386,10 +1386,8 @@ void func_i1_8018B58C(Actor* actor) {
}
}
extern Limb* D_6029A48[];
void func_i1_8018BAAC(Actor* actor) {
Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_i1_8018AB08, NULL, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, func_i1_8018AB08, NULL, actor, gCalcMatrix);
}
void func_i1_8018BAFC(s32 limbIndex, Vec3f* rot, void* data) {
@ -1409,11 +1407,11 @@ void func_i1_8018BAFC(s32 limbIndex, Vec3f* rot, void* data) {
}
void func_i1_8018BBA4(Actor* actor) {
Animation_DrawSkeleton(3, D_6029A48, actor->vwork, NULL, func_i1_8018BAFC, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, NULL, func_i1_8018BAFC, actor, gCalcMatrix);
}
void func_i1_8018BBF8(Actor* actor) {
Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_i1_8018AB08, func_i1_8018BAFC, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, func_i1_8018AB08, func_i1_8018BAFC, actor, gCalcMatrix);
}
s32 func_i1_8018BC50(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
@ -1456,7 +1454,7 @@ void func_i1_8018BC84(s32 limbIndex, Vec3f* rot, void* data) {
}
void func_i1_8018BD7C(Actor* actor) {
Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_i1_8018BC50, func_i1_8018BC84, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, func_i1_8018BC50, func_i1_8018BC84, actor, gCalcMatrix);
}
void func_i1_8018BDD4(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, s32 arg6) {
@ -2003,8 +2001,8 @@ void func_i1_8018C19C(Boss* boss) {
}
break;
}
temp_a0 = SEGMENTED_TO_VIRTUAL(D_603E748);
temp_a1 = SEGMENTED_TO_VIRTUAL(D_603E7C4);
temp_a0 = SEGMENTED_TO_VIRTUAL(D_CO_603E748);
temp_a1 = SEGMENTED_TO_VIRTUAL(D_CO_603E7C4);
temp_a0[9] = -100000.0f;
temp_a0[3] = 172.0f;
temp_a1[9] = -100000.0f;
@ -2330,13 +2328,10 @@ s32 func_i1_8018EC54(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
return false;
}
extern Animation D_602D400;
extern Limb* D_602D5AC[];
void func_i1_8018ECAC(Boss* boss) {
Animation_GetFrameData(&D_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018EC54, NULL, &boss->index, &gIdentityMatrix);
Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018EC54, NULL, &boss->index, &gIdentityMatrix);
}
s32 func_i1_8018ED1C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
@ -2353,8 +2348,8 @@ void func_i1_8018ED78(Boss* boss) {
Matrix_Translate(gGfxMatrix, -D_i1_80199A78.x, -D_i1_80199A78.y, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
Animation_GetFrameData(&D_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018ED1C, NULL, &boss->index, &gIdentityMatrix);
Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018ED1C, NULL, &boss->index, &gIdentityMatrix);
}
s32 func_i1_8018EE2C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
@ -2371,8 +2366,8 @@ void func_i1_8018EE84(Boss* boss) {
Matrix_Translate(gGfxMatrix, -D_i1_80199A90.x, -D_i1_80199A90.y, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
Animation_GetFrameData(&D_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018EE2C, NULL, &boss->index, &gIdentityMatrix);
Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018EE2C, NULL, &boss->index, &gIdentityMatrix);
}
s32 func_i1_8018EF38(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
@ -2389,12 +2384,10 @@ void func_i1_8018EF90(Boss* boss) {
Matrix_Translate(gGfxMatrix, -D_i1_80199AA8.x, -D_i1_80199AA8.y, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
Animation_GetFrameData(&D_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018EF38, NULL, &boss->index, &gIdentityMatrix);
Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018EF38, NULL, &boss->index, &gIdentityMatrix);
}
extern f32 D_603E924[];
void func_i1_8018F044(Object_80* obj80) {
switch (obj80->state) {
@ -2408,7 +2401,7 @@ void func_i1_8018F044(Object_80* obj80) {
obj80->vel.y += 2.0f;
if (obj80->unk_44 >= 3) {
obj80->state = 1;
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_603E924);
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_CO_603E924);
AUDIO_PLAY_SFX(0x1900000D, obj80->sfxSource, 0);
return;
}
@ -2444,14 +2437,11 @@ s32 func_i1_8018F1C8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
return 0;
}
extern Animation D_602AA7C;
extern Limb* D_602AB48[];
void func_i1_8018F31C(Object_80* obj80) {
Vec3f sp28[10];
Animation_GetFrameData(&D_602AA7C, 0, sp28);
Animation_DrawSkeleton(3, D_602AB48, sp28, func_i1_8018F1C8, NULL, obj80, gCalcMatrix);
Animation_GetFrameData(&D_CO_602AA7C, 0, sp28);
Animation_DrawSkeleton(3, D_CO_602AB48, sp28, func_i1_8018F1C8, NULL, obj80, gCalcMatrix);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}

2
src/overlays/ovl_i4/fox_bo.c
View File

@ -1,5 +1,5 @@
#include "prevent_bss_reordering.h"
#include "prevent_bss_reordering2.h"
// #include "prevent_bss_reordering2.h"
#include "global.h"
#include "assets.h"

1
src/overlays/ovl_i5/fox_ma.c
View File

@ -1,3 +1,4 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "prevent_bss_reordering.h"
#include "assets/ast_macbeth.h"

4
src/overlays/ovl_menu/fox_title.c
View File

@ -3,8 +3,8 @@
* System: Title
* Description: Starfox Title Handler
*/
// #include "prevent_bss_reordering.h"
#include "prevent_bss_reordering2.h"
#include "prevent_bss_reordering.h"
// #include "prevent_bss_reordering2.h"
#include "global.h"
#include "assets.h"
#include "fox_title.h"

454
yamls/libultra2.0G.txt
View File

@ -1,454 +0,0 @@
sonic@Ale-PC:~/flib$ cargo run ~/sf64/baserom.us.z64 ~/libultracollection/extracted2.0G/ tee
flib.txt
warning: unused variable: `rom_words`
--> src/main.rs:161:5
|
161 | rom_words: &[u32],
| ^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_rom_words`
|
= note: `#[warn(unused_variables)]` on by default
warning: unused variable: `object_paths`
--> src/main.rs:162:5
|
162 | object_paths: Vec<PathBuf>,
| ^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_object_paths`
warning: unused variable: `ambiguous`
--> src/main.rs:163:5
|
163 | ambiguous: (String, Vec<u32>),
| ^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_ambiguous`
warning: unused variable: `symbols`
--> src/main.rs:164:5
|
164 | symbols: &[Symbol],
| ^^^^^^^ help: if this is intentional, prefix it with an underscore: `_symbols`
warning: function `disambiguate` is never used
--> src/main.rs:160:4
|
160 | fn disambiguate(
| ^^^^^^^^^^^^
|
= note: `#[warn(dead_code)]` on by default
warning: static `AMBIGUOUS_FILES` is never used
--> src/libultra.rs:54:12
|
54 | pub static AMBIGUOUS_FILES: &[&[&str]] = &[
| ^^^^^^^^^^^^^^^
warning: constant `PIGETTYPE_TEXT` is never used
--> src/libultra.rs:87:11
|
87 | pub const PIGETTYPE_TEXT: &[u32] = &[0x3C028000u32, 0x03E00008u32, 0x8C420304u32];
| ^^^^^^^^^^^^^^
warning: constant `HANDWRITTEN_GU_FILES` is never used
--> src/libultra.rs:155:11
|
155 | pub const HANDWRITTEN_GU_FILES: &'static [&str] = &[
| ^^^^^^^^^^^^^^^^^^^^
warning: constant `FILES` is never used
--> src/libultra.rs:168:11
|
168 | pub const FILES: &'static [&str] = &[
| ^^^^^
warning: function `print_symbol_addrs` is never used
--> src/splat.rs:41:8
|
41 | pub fn print_symbol_addrs(symbols: &[Symbol]) {
| ^^^^^^^^^^^^^^^^^^
warning: `flib` (bin "flib") generated 10 warnings (run `cargo fix --bin "flib"` to apply 4 suggestions)
Finished dev [unoptimized + debuginfo] target(s) in 0.00s
Running `target/debug/flib /home/sonic/sf64/baserom.us.z64 /home/sonic/libultracollection/extracted2.0G/ tee flib.txt`
getactivequeue is ambiguous, skipping symbols
getcurrfaultthread is ambiguous, skipping symbols
initrdb: no .text section found, skipping
kdebugserver: no .text section found, skipping
libm_vals: no .text section found, skipping
parameters has .text section composed of only zeros, skipping
parse_abi: no .text section found, skipping
piacs is ambiguous, skipping symbols
pigettype is ambiguous, skipping symbols
rdbsend: no .text section found, skipping
siacs is ambiguous, skipping symbols
sirawread is ambiguous, skipping symbols
sirawwrite is ambiguous, skipping symbols
sprawread is ambiguous, skipping symbols
sprawwrite is ambiguous, skipping symbols
vigetcurrcontext is ambiguous, skipping symbols
vigetnextcontext is ambiguous, skipping symbols
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
".bss"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(3)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
".bss"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(3)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
".bss"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(3)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
".bss"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(3)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
"__osViDevMgr"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(4)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
"__osViDevMgr"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(4)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
"__osViDevMgr"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(4)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: "__osViDevMgr", address: 2148302272, size: 5, filename: "vimgr", defined: true, complete: true }
"__osViDevMgr"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(4)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: "__osViDevMgr", address: 2148302272, size: 5, filename: "vimgr", defined: true, complete: true }
"__osViDevMgr"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(4)), addend: 0, implicit_addend: true }
vimodempalhaf1: no .text section found, skipping
vimodempalhan1: no .text section found, skipping
vimodempalhpf1: no .text section found, skipping
vimodempalhpf2: no .text section found, skipping
vimodempalhpn1: no .text section found, skipping
vimodempalhpn2: no .text section found, skipping
vimodempallaf1: no .text section found, skipping
vimodempallaf2: no .text section found, skipping
vimodempallan1: no .text section found, skipping
vimodempallan2: no .text section found, skipping
vimodempallpf1: no .text section found, skipping
vimodempallpf2: no .text section found, skipping
vimodempallpn1: no .text section found, skipping
vimodempallpn2: no .text section found, skipping
vimodentschaf1: no .text section found, skipping
vimodentschan1: no .text section found, skipping
vimodentschpf1: no .text section found, skipping
vimodentschpf2: no .text section found, skipping
vimodentschpn1: no .text section found, skipping
vimodentschpn2: no .text section found, skipping
vimodentsclaf1: no .text section found, skipping
vimodentsclaf2: no .text section found, skipping
vimodentsclan1: no .text section found, skipping
vimodentsclan2: no .text section found, skipping
vimodentsclpf1: no .text section found, skipping
vimodentsclpf2: no .text section found, skipping
vimodentsclpn1: no .text section found, skipping
vimodentsclpn2: no .text section found, skipping
vimodepalhaf1: no .text section found, skipping
vimodepalhan1: no .text section found, skipping
vimodepalhpf1: no .text section found, skipping
vimodepalhpf2: no .text section found, skipping
vimodepalhpn1: no .text section found, skipping
vimodepalhpn2: no .text section found, skipping
vimodepallaf1: no .text section found, skipping
vimodepallaf2: no .text section found, skipping
vimodepallan1: no .text section found, skipping
vimodepallan2: no .text section found, skipping
vimodepallpf1: no .text section found, skipping
vimodepallpf2: no .text section found, skipping
vimodepallpn1: no .text section found, skipping
vimodepallpn2: no .text section found, skipping
vitbl: no .text section found, skipping
Files found:
- [0x1000, asm]
- [0x20BC0, c, controller]
- [0x20F80, c, contreaddata]
- [0x211E0, c, recvmesg]
- [0x21320, c, sendmesg]
- [0x21470, c, contquery]
- [0x21520, asm]
- [0x21B40, c, perspective]
- [0x21DD0, c, lookat]
- [0x22100, c, ortho]
- [0x222C0, hasm, invalicache]
- [0x22340, hasm, invaldcache]
- [0x223F0, c, pidma]
- [0x22500, c, viblack]
- [0x22570, hasm, writebackdcacheall]
- [0x225A0, c, viswapbuf]
- [0x225F0, c, virepeatline]
- [0x22660, asm]
- [0x226C0, c, visetmode]
- [0x22730, c, visetspecial]
- [0x228F0, c, createmesgqueue]
- [0x22920, c, seteventmesg]
- [0x22990, c, visetevent]
- [0x22A00, c, sptaskyielded]
- [0x22A80, c, sptaskyield]
- [0x22AA0, asm]
- [0x22D90, c, dpsetstat]
- [0x22DA0, c, createthread]
- [0x22EF0, c, startthread]
- [0x23040, c, vimgr]
- [0x233A0, asm]
- [0x23680, c, setthreadpri]
- [0x23760, asm]
- [0x23C00, c, gettime]
- [0x23C90, c, sinf]
- [0x23E50, c, cosf]
- [0x23FC0, hasm, sqrtf]
- [0x23FD0, c, settimer]
- [0x240B0, c, conteepread]
- [0x243B0, c, conteepwrite]
- [0x24890, c, ll]
- [0x24B50, c, conteepprobe]
- [0x24BC0, c, string]
- [0x24C60, asm]
- [0x25920, c, settime]
- [0x25950, asm]
- [0x25960, c, aisetfreq]
- [0x25AC0, asm]
- [0x25BB0, c, epidma]
- [0x25C90, c, aigetlen]
- [0x25CA0, c, aisetnextbuf]
- [0x25D50, hasm, getcount]
- [0x25D60, c, sirawdma]
- [0x25E10, asm]
- [0x25ED0, hasm, interrupt]
- [0x25F10, c, thread]
- [0x25F50, asm]
- [0x26CD0, c, pfsisplug]
- [0x27040, c, crc]
- [0x271C0, asm]
- [0x278D0, c, mtxutil]
- [0x27B40, c, jammesg]
- [0x27C90, c, pigetcmdq]
- [0x27CC0, asm]
- [0x27E00, c, spgetstat]
- [0x27E10, c, spsetstat]
- [0x27E20, hasm, bcopy]
- [0x28130, c, virtualtophysical]
- [0x281B0, hasm, writebackdcache]
- [0x28230, c, spsetpc]
- [0x28270, c, sprawdma]
- [0x28300, c, sp]
- [0x28330, asm]
- [0x28800, c, getthreadpri]
- [0x28820, asm]
- [0x28830, c, viswapcontext]
- [0x28B90, asm]
- [0x28D50, c, pirawdma]
- [0x28E30, asm]
- [0x297B0, hasm, setsr]
- [0x297C0, hasm, getsr]
- [0x297D0, hasm, setfpccsr]
- [0x297E0, asm]
- [0x29880, hasm, maptlbrdb]
- [0x298E0, c, pirawread]
- [0x29940, hasm, bzero]
- [0x299E0, c, xlitob]
- [0x29C80, c, xldtob]
- [0x2A740, c, ai]
- [0x2A770, c, si]
- [0x2A7A0, asm]
- [0x2B690, hasm, setintmask]
- [0x2B730, c, destroythread]
- [0x2B830, asm]
- [0x2B940, hasm, probetlb]
- [0x2BA00, hasm, setcompare]
- [0x2BA10, c, resetglobalintmask]
- [0x2BA70, c, epirawwrite]
- [0x2BAC0, c, epirawread]
- [0x2BB10, c, setglobalintmask]
- [0x2BB60, c, yieldthread]
- [0x2BBB0, c, ldiv]
- [0x2BD40, hasm, getcause]
- [0x2BD50, asm]
- [0x2EE80, c, stopthread]
Ambiguous files:
getactivequeue: [ 0x25950, 0x28820 ]
getcurrfaultthread: [ 0x25950, 0x28820 ]
pigettype: [ 0x25950, 0x28820 ]
vigetcurrcontext: [ 0x25950, 0x28820 ]
vigetnextcontext: [ 0x25950, 0x28820 ]
piacs: [ 0x25E10, 0x28C90 ]
siacs: [ 0x25E10, 0x28C90 ]
sirawread: [ 0x297E0, 0x2EE30 ]
sprawread: [ 0x297E0, 0x2EE30 ]
sirawwrite: [ 0x29830, 0x2EDE0 ]
sprawwrite: [ 0x29830, 0x2EDE0 ]
Files not found:
aigetstat, align, atomic, auxbus, bcmp, bnkf, cartrominit, cents2ratio, clearattribute, color, conteeplongread, conteeplongwrite, contpfs, contramread, contramwrite, contreset, contsetch, copy, coss, cseq, cspdelete, cspgetchlvol, cspgetfxmix, cspgetpan, cspgetpriority, cspgetprogram, cspgetseq, cspgetstate, cspgettempo, cspgetvol, csplayer, cspplay, cspsendmidi, cspsetbank, cspsetchlvol, cspsetfxmix, cspsetpan, cspsetpriority, cspsetprogram, cspsetseq, cspsettempo, cspsetvol, cspstop, devmgr, dp, dpctr, dpgetstat, dpsetnextbuf, drvrNew, env, epigettype, epirawdma, epiread, epiwrite, event, exceptasm, filter, free, frustum, getbufcount, getcompare, getconfig, getfpccsr, getintmask, getnextfaultthread, getsize, getthreadid, gettlbasid, gettlbhi, gettlblo0, gettlblo1, gettlbpagemask, gt, guLoadTile_bug, heapalloc, heapcheck, heapinit, hide, initialize, leodiskinit, leointerrupt, llbit, llcvt, load, loadtextureblockmipmap, lookathil, lookatref, lookatstereo, mainbus, malloc, maptlb, mtxcatf, mtxcatl, normalize, pfsallocatefile, pfschecker, pfsdeletefile, pfsfilestate, pfsfreeblocks, pfsgetlabel, pfsinit, pfsnumfiles, pfsreadwritefile, pfsreformat, pfsresizefile, pfssearchfile, pfssetlabel, physicaltovirtual, pi, pigetstat, pimgr, pirawwrite, piread, piwrite, position, poslight, poslighthil, random, region, resample, reverb, rotate, rotateRPY, save, scale, sched, seq, seqpdelete, seqpgetchlvol, seqpgetfxmix, seqpgetpan, seqpgetpriority, seqpgetprogram, seqpgetseq, seqpgetstate, seqpgettempo, seqpgetvol, seqplayer, seqploop, seqpplay, seqpsendmidi, seqpsetbank, seqpsetchlvol, seqpsetfxmix, seqpsetpan, seqpsetpriority, seqpsetprogram, seqpsetseq, seqpsettempo, seqpsetvol, seqpstop, setattribute, setcause, setconfig, setcount, sethwinterrupt, settlbasid, show, sigetstat, sins, sl, sndpallocate, sndpdeallocate, sndpdelete, sndpgetsound, sndpgetstate, sndplayer, sndpplay, sndpplayat, sndpsetfxmix, sndpsetpan, sndpsetpitch, sndpsetpriority, sndpsetsound, sndpsetvol, sndpstop, sprintf, sprite, spscale, sptask, stoptimer, synaddplayer, synallocfx, synallocvoice, syncprintf, syncputchars, syndelete, synfreefx, synfreevoice, syngetfxref, syngetpriority, synremoveplayer, synsetfxmix, synsetfxparam, synsetpan, synsetpitch, synsetpriority, synsetvol, synstartvoice, synstartvoiceparam, synstopvoice, synthesizer, timerintr, translate, unmaptlb, unmaptlball, usprite, vi, vifade, vigetcurrframebuf, vigetfield, vigetline, vigetmode, vigetnextframebuf, vigetstat, visetxscale, visetyscale, xprintf
Symbols:
osRomBase, 0x80000308, 0x4 (pirawdma, false)
osContInit, 0x8001FFC0, 0x1F8 (controller, true)
__osContGetInitData, 0x800201B8, 0xD0 (controller, true)
__osPackRequestData, 0x80020288, 0xF4 (controller, true)
osContStartReadData, 0x80020380, 0xC4 (contreaddata, true)
osContGetReadData, 0x80020444, 0xA8 (contreaddata, true)
.text, 0x80020491, 0x260 (contreaddata, false)
osRecvMesg, 0x800205E0, 0x138 (recvmesg, true)
osSendMesg, 0x80020720, 0x14C (sendmesg, true)
osContStartQuery, 0x80020870, 0x84 (contquery, true)
osContGetQuery, 0x800208F4, 0x28 (contquery, true)
guPerspectiveF, 0x80020F40, 0x230 (perspective, true)
guPerspective, 0x80021170, 0x58 (perspective, true)
guLookAtF, 0x800211D0, 0x2B8 (lookat, true)
guLookAt, 0x80021488, 0x78 (lookat, true)
guOrthoF, 0x80021500, 0x154 (ortho, true)
guOrtho, 0x80021654, 0x68 (ortho, true)
osInvalICache, 0x800216C0, 0x74 (invalicache, true)
osInvalDCache, 0x80021740, 0xAC (invaldcache, true)
osPiStartDma, 0x800217F0, 0x10C (pidma, true)
osViBlack, 0x80021900, 0x70 (viblack, true)
osWritebackDCacheAll, 0x80021970, 0x28 (writebackdcacheall, true)
osViSwapBuffer, 0x800219A0, 0x50 (viswapbuf, true)
osViRepeatLine, 0x800219F0, 0x70 (virepeatline, true)
osViSetMode, 0x80021AC0, 0x68 (visetmode, true)
osViSetSpecialFeatures, 0x80021B30, 0x1B8 (visetspecial, true)
osCreateMesgQueue, 0x80021CF0, 0x2C (createmesgqueue, true)
osSetEventMesg, 0x80021D20, 0x68 (seteventmesg, true)
osViSetEvent, 0x80021D90, 0x6C (visetevent, true)
osSpTaskYielded, 0x80021E00, 0x80 (sptaskyielded, true)
osSpTaskYield, 0x80021E80, 0x20 (sptaskyield, true)
osDpSetStatus, 0x80022190, 0xC (dpsetstat, true)
osCreateThread, 0x800221A0, 0x144 (createthread, true)
osStartThread, 0x800222F0, 0x150 (startthread, true)
osCreateViManager, 0x80022440, 0x188 (vimgr, true)
osSetThreadPri, 0x80022A80, 0xE0 (setthreadpri, true)
osGetTime, 0x80023000, 0x84 (gettime, true)
__sinf, 0x80023090, 0x1C0 (sinf, true)
sinf, 0x80023090, 0x0 (perspective, false)
__cosf, 0x80023250, 0x168 (cosf, true)
cosf, 0x80023250, 0x0 (perspective, false)
sqrtf, 0x800233C0, 0x8 (sqrtf, true)
osSetTimer, 0x800233D0, 0xD4 (settimer, true)
osEepromRead, 0x800234B0, 0x1F0 (conteepread, true)
.text, 0x80023624, 0x300 (conteepread, false)
osEepromWrite, 0x800237B0, 0x1B0 (conteepwrite, true)
.text, 0x800238F4, 0x4E0 (conteepwrite, false)
__osEepStatus, 0x80023A6C, 0x224 (conteepwrite, true)
__ull_rshift, 0x80023C90, 0x2C (ll, true)
__ull_rem, 0x80023CBC, 0x3C (ll, true)
__ull_div, 0x80023CF8, 0x3C (ll, true)
__ll_lshift, 0x80023D34, 0x2C (ll, true)
__ll_rem, 0x80023D60, 0x3C (ll, true)
__ll_div, 0x80023D9C, 0x5C (ll, true)
__ll_mul, 0x80023DF8, 0x30 (ll, true)
__ull_divremi, 0x80023E28, 0x60 (ll, true)
__ll_mod, 0x80023E88, 0x9C (ll, true)
__ll_rshift, 0x80023F24, 0x2C (ll, true)
osEepromProbe, 0x80023F50, 0x6C (conteepprobe, true)
memcpy, 0x80023FC0, 0x2C (string, true)
strlen, 0x80023FEC, 0x28 (string, true)
strchr, 0x80024014, 0x40 (string, true)
osSetTime, 0x80024D20, 0x24 (settime, true)
osAiSetFrequency, 0x80024D60, 0x160 (aisetfreq, true)
osEPiStartDma, 0x80024FB0, 0xD4 (epidma, true)
osAiGetLength, 0x80025090, 0xC (aigetlen, true)
osAiSetNextBuffer, 0x800250A0, 0xA8 (aisetnextbuf, true)
osGetCount, 0x80025150, 0xC (getcount, true)
__osSiRawStartDma, 0x80025160, 0xAC (sirawdma, true)
__osSiCreateAccessQueue, 0x80025210, 0x0 (controller, false)
__osSiGetAccess, 0x80025260, 0x0 (conteepprobe, false)
__osSiRelAccess, 0x800252A4, 0x0 (conteepprobe, false)
__osDisableInt, 0x800252D0, 0x20 (interrupt, true)
__osRestoreInt, 0x800252F0, 0x1C (interrupt, true)
__osDequeueThread, 0x80025310, 0x40 (thread, true)
__osEnqueueAndYield, 0x80025DF0, 0x0 (jammesg, false)
__osEnqueueThread, 0x80025EF0, 0x0 (setthreadpri, false)
__osPopThread, 0x80025F38, 0x0 (jammesg, false)
__osDispatchThread, 0x80025F48, 0x0 (destroythread, false)
__osCleanupThread, 0x800260C4, 0x0 (createthread, false)
osPfsIsPlug, 0x800260D0, 0x1A0 (pfsisplug, true)
__osPfsRequestData, 0x80026270, 0xFC (pfsisplug, true)
__osPfsGetInitData, 0x8002636C, 0xD0 (pfsisplug, true)
__osContAddressCrc, 0x80026440, 0xB0 (crc, true)
__osContDataCrc, 0x800264F0, 0xD0 (crc, true)
guMtxF2L, 0x80026CD0, 0x100 (mtxutil, true)
guMtxIdentF, 0x80026DD0, 0x88 (mtxutil, true)
guMtxIdent, 0x80026E58, 0x30 (mtxutil, true)
guMtxL2F, 0x80026E88, 0xB4 (mtxutil, true)
osJamMesg, 0x80026F40, 0x150 (jammesg, true)
osPiGetCmdQueue, 0x80027090, 0x28 (pigetcmdq, true)
__osViInit, 0x800270C0, 0x0 (vimgr, false)
__osSpGetStatus, 0x80027200, 0xC (spgetstat, true)
__osSpSetStatus, 0x80027210, 0xC (spsetstat, true)
bcopy, 0x80027220, 0x0 (bcopy, true)
osVirtualToPhysical, 0x80027530, 0x7C (virtualtophysical, true)
osWritebackDCache, 0x800275B0, 0x74 (writebackdcache, true)
__osSpSetPc, 0x80027630, 0x34 (spsetpc, true)
__osSpRawStartDma, 0x80027670, 0x8C (sprawdma, true)
__osSpDeviceBusy, 0x80027700, 0x2C (sp, true)
__osTimerServicesInit, 0x80027730, 0x0 (vimgr, false)
__osTimerInterrupt, 0x800277BC, 0x0 (vimgr, false)
__osSetTimerIntr, 0x80027A00, 0x0 (settimer, false)
__osInsertTimer, 0x80027A74, 0x0 (settimer, false)
osGetThreadPri, 0x80027C00, 0x18 (getthreadpri, true)
__osViGetCurrentContext, 0x80027C20, 0x0 (vimgr, false)
__osViSwapContext, 0x80027C30, 0x35C (viswapcontext, true)
osPiRawStartDma, 0x80028150, 0xE0 (pirawdma, true)
__osSetSR, 0x80028BB0, 0x10 (setsr, true)
__osGetSR, 0x80028BC0, 0xC (getsr, true)
__osSetFpcCsr, 0x80028BD0, 0x10 (setfpccsr, true)
osMapTLBRdb, 0x80028C80, 0x58 (maptlbrdb, true)
osPiRawReadIo, 0x80028CE0, 0x54 (pirawread, true)
bzero, 0x80028D40, 0x0 (bzero, true)
_Litob, 0x80028DE0, 0x298 (xlitob, true)
.text, 0x80029080, 0xAC0 (xldtob, false)
_Ldtob, 0x800295F0, 0x54C (xldtob, true)
__osAiDeviceBusy, 0x80029B40, 0x30 (ai, true)
__osSiDeviceBusy, 0x80029B70, 0x2C (si, true)
osSetIntMask, 0x8002AA90, 0xA0 (setintmask, true)
osDestroyThread, 0x8002AB30, 0xF8 (destroythread, true)
__osProbeTLB, 0x8002AD40, 0xB8 (probetlb, true)
__osSetCompare, 0x8002AE00, 0xC (setcompare, true)
__osResetGlobalIntMask, 0x8002AE10, 0x58 (resetglobalintmask, true)
osEPiRawWriteIo, 0x8002AE70, 0x4C (epirawwrite, true)
osEPiRawReadIo, 0x8002AEC0, 0x50 (epirawread, true)
__osSetGlobalIntMask, 0x8002AF10, 0x4C (setglobalintmask, true)
osYieldThread, 0x8002AF60, 0x4C (yieldthread, true)
lldiv, 0x8002AFB0, 0x100 (ldiv, true)
ldiv, 0x8002B0B0, 0x84 (ldiv, true)
__osGetCause, 0x8002B140, 0xC (getcause, true)
osStopThread, 0x8002E280, 0xC0 (stopthread, true)
__osContinitialized, 0x800C7CC0, 0x4 (controller, true)
__osViDevMgr, 0x800C7DC0, 0x5 (vimgr, true)
__osPiDevMgr, 0x800C7DE0, 0x1C (epidma, false)
osClockRate, 0x800C7E10, 0x8 (controller, false)
osViClock, 0x800C7E18, 0x4 (aisetfreq, false)
__OSGlobalIntMask, 0x800C7E20, 0x4 (resetglobalintmask, false)
.data, 0x800C7E80, 0x10 (aisetnextbuf, false)
__osThreadTail, 0x800C7EA0, 0x8 (createmesgqueue, false)
__osRunQueue, 0x800C7EA8, 0x4 (setthreadpri, false)
__osActiveQueue, 0x800C7EAC, 0x4 (createthread, false)
__osRunningThread, 0x800C7EB0, 0x4 (destroythread, false)
__osViCurr, 0x800C7F40, 0x4 (viswapcontext, false)
__osViNext, 0x800C7F44, 0x4 (viblack, false)
__osTimerList, 0x800C7F50, 0x4 (settimer, false)
.data, 0x800C7F80, 0x30 (xlitob, false)
.rodata, 0x800E9330, 0x10 (perspective, false)
.rodata, 0x800E9340, 0x50 (sinf, false)
.rodata, 0x800E9390, 0x50 (cosf, false)
__libm_qnan_f, 0x800E9570, 0x4 (cosf, false)
.rodata, 0x800E9580, 0x60 (xldtob, false)
__osRcpImTable, 0x800E95E0, 0x80 (setintmask, true)
__osContPifRam, 0x80156620, 0x40 (contquery, false)
__osContLastCmd, 0x80156660, 0x1 (conteepread, false)
__osMaxControllers, 0x80156661, 0x1 (contreaddata, false)
__osEepromTimerQ, 0x80156688, 0x18 (controller, true)
__osEepromTimerMsg, 0x801566A0, 0x4 (controller, true)
__osEventStateTab, 0x801568F0, 0x78 (seteventmesg, true)
.bss, 0x801569F0, 0x1220 (vimgr, false)
__osEepPifRam, 0x801793E0, 0x40 (conteepread, true)
__osPfsPifRam, 0x801794C0, 0x40 (pfsisplug, true)
__osCurrentTime, 0x80179520, 0x8 (gettime, false)
__osBaseCounter, 0x80179528, 0x4 (gettime, false)
__osViIntrCount, 0x8017952C, 0x4 (vimgr, false)

444
yamls/libultra2.0I.txt
View File

@ -1,444 +0,0 @@
sonic@Ale-PC:~/flib$ cargo run ~/sf64/baserom.us.z64 ~/libultracollection/extracted/ tee flib.txt
warning: unused variable: `rom_words`
--> src/main.rs:161:5
|
161 | rom_words: &[u32],
| ^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_rom_words`
|
= note: `#[warn(unused_variables)]` on by default
warning: unused variable: `object_paths`
--> src/main.rs:162:5
|
162 | object_paths: Vec<PathBuf>,
| ^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_object_paths`
warning: unused variable: `ambiguous`
--> src/main.rs:163:5
|
163 | ambiguous: (String, Vec<u32>),
| ^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_ambiguous`
warning: unused variable: `symbols`
--> src/main.rs:164:5
|
164 | symbols: &[Symbol],
| ^^^^^^^ help: if this is intentional, prefix it with an underscore: `_symbols`
warning: function `disambiguate` is never used
--> src/main.rs:160:4
|
160 | fn disambiguate(
| ^^^^^^^^^^^^
|
= note: `#[warn(dead_code)]` on by default
warning: static `AMBIGUOUS_FILES` is never used
--> src/libultra.rs:54:12
|
54 | pub static AMBIGUOUS_FILES: &[&[&str]] = &[
| ^^^^^^^^^^^^^^^
warning: constant `PIGETTYPE_TEXT` is never used
--> src/libultra.rs:87:11
|
87 | pub const PIGETTYPE_TEXT: &[u32] = &[0x3C028000u32, 0x03E00008u32, 0x8C420304u32];
| ^^^^^^^^^^^^^^
warning: constant `HANDWRITTEN_GU_FILES` is never used
--> src/libultra.rs:155:11
|
155 | pub const HANDWRITTEN_GU_FILES: &'static [&str] = &[
| ^^^^^^^^^^^^^^^^^^^^
warning: constant `FILES` is never used
--> src/libultra.rs:168:11
|
168 | pub const FILES: &'static [&str] = &[
| ^^^^^
warning: function `print_symbol_addrs` is never used
--> src/splat.rs:41:8
|
41 | pub fn print_symbol_addrs(symbols: &[Symbol]) {
| ^^^^^^^^^^^^^^^^^^
warning: `flib` (bin "flib") generated 10 warnings (run `cargo fix --bin "flib"` to apply 4 suggestions)
Finished dev [unoptimized + debuginfo] target(s) in 0.00s
Running `target/debug/flib /home/sonic/sf64/baserom.us.z64 /home/sonic/libultracollection/extracted/ tee flib.txt`
getactivequeue is ambiguous, skipping symbols
getcurrfaultthread is ambiguous, skipping symbols
initrdb: no .text section found, skipping
kdebugserver: no .text section found, skipping
libm_vals: no .text section found, skipping
parameters has .text section composed of only zeros, skipping
parse_abi: no .text section found, skipping
piacs is ambiguous, skipping symbols
pigettype is ambiguous, skipping symbols
rdbsend: no .text section found, skipping
siacs is ambiguous, skipping symbols
sirawread is ambiguous, skipping symbols
sirawwrite is ambiguous, skipping symbols
sprawread is ambiguous, skipping symbols
sprawwrite is ambiguous, skipping symbols
vigetcurrcontext is ambiguous, skipping symbols
vigetnextcontext is ambiguous, skipping symbols
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
".bss"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(3)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
".bss"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(3)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
".bss"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(3)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
".bss"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(3)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
"__osViDevMgr"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(4)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
"__osViDevMgr"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(4)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: ".bss", address: 2148887024, size: 4640, filename: "vimgr", defined: false, complete: true }
"__osViDevMgr"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(4)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: "__osViDevMgr", address: 2148302272, size: 5, filename: "vimgr", defined: true, complete: true }
"__osViDevMgr"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(4)), addend: 0, implicit_addend: true }
Last symbol seems complete already
Symbol { name: "__osViDevMgr", address: 2148302272, size: 5, filename: "vimgr", defined: true, complete: true }
"__osViDevMgr"
Relocation { kind: Elf(6), encoding: Generic, size: 0, target: Symbol(SymbolIndex(4)), addend: 0, implicit_addend: true }
vimodempalhaf1: no .text section found, skipping
vimodempalhan1: no .text section found, skipping
vimodempalhpf1: no .text section found, skipping
vimodempalhpf2: no .text section found, skipping
vimodempalhpn1: no .text section found, skipping
vimodempalhpn2: no .text section found, skipping
vimodempallaf1: no .text section found, skipping
vimodempallaf2: no .text section found, skipping
vimodempallan1: no .text section found, skipping
vimodempallan2: no .text section found, skipping
vimodempallpf1: no .text section found, skipping
vimodempallpf2: no .text section found, skipping
vimodempallpn1: no .text section found, skipping
vimodempallpn2: no .text section found, skipping
vimodentschaf1: no .text section found, skipping
vimodentschan1: no .text section found, skipping
vimodentschpf1: no .text section found, skipping
vimodentschpf2: no .text section found, skipping
vimodentschpn1: no .text section found, skipping
vimodentschpn2: no .text section found, skipping
vimodentsclaf1: no .text section found, skipping
vimodentsclaf2: no .text section found, skipping
vimodentsclan1: no .text section found, skipping
vimodentsclan2: no .text section found, skipping
vimodentsclpf1: no .text section found, skipping
vimodentsclpf2: no .text section found, skipping
vimodentsclpn1: no .text section found, skipping
vimodentsclpn2: no .text section found, skipping
vimodepalhaf1: no .text section found, skipping
vimodepalhan1: no .text section found, skipping
vimodepalhpf1: no .text section found, skipping
vimodepalhpf2: no .text section found, skipping
vimodepalhpn1: no .text section found, skipping
vimodepalhpn2: no .text section found, skipping
vimodepallaf1: no .text section found, skipping
vimodepallaf2: no .text section found, skipping
vimodepallan1: no .text section found, skipping
vimodepallan2: no .text section found, skipping
vimodepallpf1: no .text section found, skipping
vimodepallpf2: no .text section found, skipping
vimodepallpn1: no .text section found, skipping
vimodepallpn2: no .text section found, skipping
vitbl: no .text section found, skipping
Files found:
- [0x1000, asm]
- [0x211E0, c, recvmesg]
- [0x21320, c, sendmesg]
- [0x21470, c, contquery]
- [0x21520, asm]
- [0x21B40, c, perspective]
- [0x21DD0, c, lookat]
- [0x22100, c, ortho]
- [0x222C0, hasm, invalicache]
- [0x22340, hasm, invaldcache]
- [0x223F0, c, pidma]
- [0x22500, c, viblack]
- [0x22570, hasm, writebackdcacheall]
- [0x225A0, c, viswapbuf]
- [0x225F0, c, virepeatline]
- [0x22660, asm]
- [0x226C0, c, visetmode]
- [0x22730, c, visetspecial]
- [0x228F0, c, createmesgqueue]
- [0x22920, c, seteventmesg]
- [0x22990, c, visetevent]
- [0x22A00, c, sptaskyielded]
- [0x22A80, c, sptaskyield]
- [0x22AA0, c, sptask]
- [0x22D90, c, dpsetstat]
- [0x22DA0, c, createthread]
- [0x22EF0, c, startthread]
- [0x23040, c, vimgr]
- [0x233A0, asm]
- [0x23680, c, setthreadpri]
- [0x23760, asm]
- [0x23C00, c, gettime]
- [0x23C90, c, sinf]
- [0x23E50, c, cosf]
- [0x23FC0, hasm, sqrtf]
- [0x23FD0, c, settimer]
- [0x240B0, asm]
- [0x24890, c, ll]
- [0x24B50, asm]
- [0x24BC0, c, string]
- [0x24C60, c, xprintf]
- [0x25920, c, settime]
- [0x25950, asm]
- [0x25960, c, aisetfreq]
- [0x25AC0, asm]
- [0x25BB0, c, epidma]
- [0x25C90, c, aigetlen]
- [0x25CA0, asm]
- [0x25D50, hasm, getcount]
- [0x25D60, c, sirawdma]
- [0x25E10, asm]
- [0x25ED0, hasm, interrupt]
- [0x25F10, c, thread]
- [0x25F50, asm]
- [0x27040, c, crc]
- [0x271C0, asm]
- [0x27B40, c, jammesg]
- [0x27C90, c, pigetcmdq]
- [0x27CC0, c, vi]
- [0x27E00, c, spgetstat]
- [0x27E10, c, spsetstat]
- [0x27E20, hasm, bcopy]
- [0x28130, c, virtualtophysical]
- [0x281B0, hasm, writebackdcache]
- [0x28230, c, spsetpc]
- [0x28270, c, sprawdma]
- [0x28300, c, sp]
- [0x28330, asm]
- [0x28800, c, getthreadpri]
- [0x28820, asm]
- [0x28830, c, viswapcontext]
- [0x28B90, asm]
- [0x28D50, c, pirawdma]
- [0x28E30, c, epirawdma]
- [0x29060, c, devmgr]
- [0x294F0, asm]
- [0x297B0, hasm, setsr]
- [0x297C0, hasm, getsr]
- [0x297D0, hasm, setfpccsr]
- [0x297E0, asm]
- [0x29880, hasm, maptlbrdb]
- [0x298E0, c, pirawread]
- [0x29940, hasm, bzero]
- [0x299E0, c, xlitob]
- [0x29C80, c, xldtob]
- [0x2A740, c, ai]
- [0x2A770, c, si]
- [0x2A7A0, asm]
- [0x2AE10, c, leointerrupt]
- [0x2B690, hasm, setintmask]
- [0x2B730, asm]
- [0x2B940, hasm, probetlb]
- [0x2BA00, hasm, setcompare]
- [0x2BA10, c, resetglobalintmask]
- [0x2BA70, asm]
- [0x2BB10, c, setglobalintmask]
- [0x2BB60, c, yieldthread]
- [0x2BBB0, c, ldiv]
- [0x2BD40, hasm, getcause]
- [0x2BD50, asm]
- [0x2EE80, c, stopthread]
Ambiguous files:
getactivequeue: [ 0x25950, 0x28820 ]
getcurrfaultthread: [ 0x25950, 0x28820 ]
pigettype: [ 0x25950, 0x28820 ]
vigetcurrcontext: [ 0x25950, 0x28820 ]
vigetnextcontext: [ 0x25950, 0x28820 ]
piacs: [ 0x25E10, 0x28C90 ]
siacs: [ 0x25E10, 0x28C90 ]
sirawread: [ 0x297E0, 0x2EE30 ]
sprawread: [ 0x297E0, 0x2EE30 ]
sirawwrite: [ 0x29830, 0x2EDE0 ]
sprawwrite: [ 0x29830, 0x2EDE0 ]
Files not found:
aigetstat, aisetnextbuf, align, atomic, auxbus, bcmp, bnkf, cartrominit, cents2ratio, clearattribute, color, conteeplongread, conteeplongwrite, conteepprobe, conteepread, conteepwrite, contpfs, contramread, contramwrite, contreaddata, contreset, controller, contsetch, copy, coss, cseq, cspdelete, cspgetchlvol, cspgetfxmix, cspgetpan, cspgetpriority, cspgetprogram, cspgetseq, cspgetstate, cspgettempo, cspgetvol, csplayer, cspplay, cspsendmidi, cspsetbank, cspsetchlvol, cspsetfxmix, cspsetpan, cspsetpriority, cspsetprogram, cspsetseq, cspsettempo, cspsetvol, cspstop, destroythread, dp, dpctr, dpgetstat, dpsetnextbuf, driverominit, drvrNew, env, epigettype, epilinkhandle, epirawread, epirawwrite, epiread, epiwrite, event, exceptasm, filter, free, frustum, getbufcount, getcompare, getconfig, getfpccsr, getintmask, getmemsize, getnextfaultthread, getsize, getthreadid, gettlbasid, gettlbhi, gettlblo0, gettlblo1, gettlbpagemask, gt, guLoadTile_bug, heapalloc, heapcheck, heapinit, hide, initialize, leodiskinit, llbit, llcvt, load, loadtextureblockmipmap, lookathil, lookatref, lookatstereo, mainbus, malloc, maptlb, motor, mtxcatf, mtxcatl, mtxutil, normalize, pfsallocatefile, pfschecker, pfsdeletefile, pfsfilestate, pfsfreeblocks, pfsgetlabel, pfsgetstatus, pfsinit, pfsinitpak, pfsisplug, pfsnumfiles, pfsreadwritefile, pfsreformat, pfsrepairid, pfssearchfile, pfssetlabel, physicaltovirtual, pi, pigetstat, pimgr, pirawwrite, piread, piwrite, position, poslight, poslighthil, random, region, resample, reverb, rotate, rotateRPY, save, scale, sched, seq, seqpdelete, seqpgetchlvol, seqpgetfxmix, seqpgetpan, seqpgetpriority, seqpgetprogram, seqpgetseq, seqpgetstate, seqpgettempo, seqpgetvol, seqplayer, seqploop, seqpplay, seqpsendmidi, seqpsetbank, seqpsetchlvol, seqpsetfxmix, seqpsetpan, seqpsetpriority, seqpsetprogram, seqpsetseq, seqpsettempo, seqpsetvol, seqpstop, setattribute, setcause, setconfig, setcount, sethwinterrupt, settlbasid, show, sigetstat, sins, sl, sndpallocate, sndpdeallocate, sndpdelete, sndpgetsound, sndpgetstate, sndplayer, sndpplay, sndpplayat, sndpsetfxmix, sndpsetpan, sndpsetpitch, sndpsetpriority, sndpsetsound, sndpsetvol, sndpstop, sprintf, sprite, spscale, stoptimer, synaddplayer, synallocfx, synallocvoice, syncprintf, syncputchars, syndelete, synfreefx, synfreevoice, syngetfxref, syngetpriority, synremoveplayer, synsetfxmix, synsetfxparam, synsetpan, synsetpitch, synsetpriority, synsetvol, synstartvoice, synstartvoiceparam, synstopvoice, synthesizer, timerintr, translate, unmaptlb, unmaptlball, us2dex, us2dex_emu, usprite, vifade, vigetcurrframebuf, vigetfield, vigetline, vigetmode, vigetnextframebuf, vigetstat, visetxscale, visetyscale
Symbols:
osTvType, 0x80000300, 0x4 (vi, false)
osRomBase, 0x80000308, 0x4 (pirawdma, false)
__osContGetInitData, 0x800201B8, 0x0 (contquery, false)
__osPackRequestData, 0x80020288, 0x0 (contquery, false)
osRecvMesg, 0x800205E0, 0x138 (recvmesg, true)
osSendMesg, 0x80020720, 0x14C (sendmesg, true)
osContStartQuery, 0x80020870, 0x84 (contquery, true)
osContGetQuery, 0x800208F4, 0x28 (contquery, true)
guPerspectiveF, 0x80020F40, 0x230 (perspective, true)
guPerspective, 0x80021170, 0x58 (perspective, true)
guLookAtF, 0x800211D0, 0x2B8 (lookat, true)
guLookAt, 0x80021488, 0x78 (lookat, true)
guOrthoF, 0x80021500, 0x154 (ortho, true)
guOrtho, 0x80021654, 0x68 (ortho, true)
osInvalICache, 0x800216C0, 0x74 (invalicache, true)
osInvalDCache, 0x80021740, 0xAC (invaldcache, true)
osPiStartDma, 0x800217F0, 0x10C (pidma, true)
osViBlack, 0x80021900, 0x70 (viblack, true)
osWritebackDCacheAll, 0x80021970, 0x28 (writebackdcacheall, true)
osViSwapBuffer, 0x800219A0, 0x50 (viswapbuf, true)
osViRepeatLine, 0x800219F0, 0x70 (virepeatline, true)
osViSetMode, 0x80021AC0, 0x68 (visetmode, true)
osViSetSpecialFeatures, 0x80021B30, 0x1B8 (visetspecial, true)
osCreateMesgQueue, 0x80021CF0, 0x2C (createmesgqueue, true)
osSetEventMesg, 0x80021D20, 0x68 (seteventmesg, true)
osViSetEvent, 0x80021D90, 0x6C (visetevent, true)
osSpTaskYielded, 0x80021E00, 0x80 (sptaskyielded, true)
osSpTaskYield, 0x80021E80, 0x20 (sptaskyield, true)
.text, 0x80021EA0, 0x2F0 (sptask, false)
osSpTaskLoad, 0x80021FBC, 0x190 (sptask, true)
osSpTaskStartGo, 0x8002214C, 0x40 (sptask, true)
osDpSetStatus, 0x80022190, 0xC (dpsetstat, true)
osCreateThread, 0x800221A0, 0x144 (createthread, true)
osStartThread, 0x800222F0, 0x150 (startthread, true)
osCreateViManager, 0x80022440, 0x188 (vimgr, true)
osSetThreadPri, 0x80022A80, 0xE0 (setthreadpri, true)
osGetTime, 0x80023000, 0x84 (gettime, true)
__sinf, 0x80023090, 0x1C0 (sinf, true)
sinf, 0x80023090, 0x0 (perspective, false)
__cosf, 0x80023250, 0x168 (cosf, true)
cosf, 0x80023250, 0x0 (perspective, false)
sqrtf, 0x800233C0, 0x8 (sqrtf, true)
osSetTimer, 0x800233D0, 0xD4 (settimer, true)
__ull_rshift, 0x80023C90, 0x2C (ll, true)
__ull_rem, 0x80023CBC, 0x3C (ll, true)
__ull_div, 0x80023CF8, 0x3C (ll, true)
__ll_lshift, 0x80023D34, 0x2C (ll, true)
__ll_rem, 0x80023D60, 0x3C (ll, true)
__ll_div, 0x80023D9C, 0x5C (ll, true)
__ll_mul, 0x80023DF8, 0x30 (ll, true)
__ull_divremi, 0x80023E28, 0x60 (ll, true)
__ll_mod, 0x80023E88, 0x9C (ll, true)
__ll_rshift, 0x80023F24, 0x2C (ll, true)
memcpy, 0x80023FC0, 0x2C (string, true)
strlen, 0x80023FEC, 0x28 (string, true)
strchr, 0x80024014, 0x40 (string, true)
.text, 0x80024060, 0xCC0 (xprintf, false)
_Printf, 0x800246D0, 0x648 (xprintf, true)
osSetTime, 0x80024D20, 0x24 (settime, true)
osAiSetFrequency, 0x80024D60, 0x160 (aisetfreq, true)
osEPiStartDma, 0x80024FB0, 0xD4 (epidma, true)
osAiGetLength, 0x80025090, 0xC (aigetlen, true)
osGetCount, 0x80025150, 0xC (getcount, true)
__osSiRawStartDma, 0x80025160, 0xAC (sirawdma, true)
__osSiGetAccess, 0x80025260, 0x0 (contquery, false)
__osSiRelAccess, 0x800252A4, 0x0 (contquery, false)
__osDisableInt, 0x800252D0, 0x20 (interrupt, true)
__osRestoreInt, 0x800252F0, 0x1C (interrupt, true)
__osDequeueThread, 0x80025310, 0x40 (thread, true)
__osEnqueueAndYield, 0x80025DF0, 0x0 (jammesg, false)
__osEnqueueThread, 0x80025EF0, 0x0 (leointerrupt, false)
__osPopThread, 0x80025F38, 0x0 (jammesg, false)
__osDispatchThread, 0x80025F48, 0x0 (startthread, false)
__osCleanupThread, 0x800260C4, 0x0 (createthread, false)
__osContAddressCrc, 0x80026440, 0xB0 (crc, true)
__osContDataCrc, 0x800264F0, 0xD0 (crc, true)
guMtxF2L, 0x80026CD0, 0x0 (lookat, false)
guMtxIdentF, 0x80026DD0, 0x0 (lookat, false)
osJamMesg, 0x80026F40, 0x150 (jammesg, true)
osPiGetCmdQueue, 0x80027090, 0x28 (pigetcmdq, true)
__osViInit, 0x800270C0, 0x13C (vi, true)
__osSpGetStatus, 0x80027200, 0xC (spgetstat, true)
__osSpSetStatus, 0x80027210, 0xC (spsetstat, true)
bcopy, 0x80027220, 0x0 (bcopy, true)
osVirtualToPhysical, 0x80027530, 0x7C (virtualtophysical, true)
osWritebackDCache, 0x800275B0, 0x74 (writebackdcache, true)
__osSpSetPc, 0x80027630, 0x34 (spsetpc, true)
__osSpRawStartDma, 0x80027670, 0x8C (sprawdma, true)
__osSpDeviceBusy, 0x80027700, 0x2C (sp, true)
__osTimerServicesInit, 0x80027730, 0x0 (vimgr, false)
__osTimerInterrupt, 0x800277BC, 0x0 (vimgr, false)
__osSetTimerIntr, 0x80027A00, 0x0 (settimer, false)
__osInsertTimer, 0x80027A74, 0x0 (settimer, false)
osGetThreadPri, 0x80027C00, 0x18 (getthreadpri, true)
__osViGetCurrentContext, 0x80027C20, 0x0 (vimgr, false)
__osViSwapContext, 0x80027C30, 0x35C (viswapcontext, true)
osPiRawStartDma, 0x80028150, 0xE0 (pirawdma, true)
osEPiRawStartDma, 0x80028230, 0x224 (epirawdma, true)
__osDevMgrMain, 0x80028460, 0x490 (devmgr, true)
__osSetSR, 0x80028BB0, 0x10 (setsr, true)
__osGetSR, 0x80028BC0, 0xC (getsr, true)
__osSetFpcCsr, 0x80028BD0, 0x10 (setfpccsr, true)
osMapTLBRdb, 0x80028C80, 0x58 (maptlbrdb, true)
osPiRawReadIo, 0x80028CE0, 0x54 (pirawread, true)
bzero, 0x80028D40, 0x0 (bzero, true)
_Litob, 0x80028DE0, 0x298 (xlitob, true)
.text, 0x80029080, 0xAC0 (xldtob, false)
_Ldtob, 0x800295F0, 0x54C (xldtob, true)
__osAiDeviceBusy, 0x80029B40, 0x30 (ai, true)
__osSiDeviceBusy, 0x80029B70, 0x2C (si, true)
__osLeoInterrupt, 0x8002A210, 0x6A4 (leointerrupt, true)
.text, 0x8002A70B, 0x880 (leointerrupt, false)
.text, 0x8002A7B9, 0x880 (leointerrupt, false)
osSetIntMask, 0x8002AA90, 0xA0 (setintmask, true)
__osProbeTLB, 0x8002AD40, 0xB8 (probetlb, true)
__osSetCompare, 0x8002AE00, 0xC (setcompare, true)
__osResetGlobalIntMask, 0x8002AE10, 0x58 (resetglobalintmask, true)
osEPiRawWriteIo, 0x8002AE70, 0x0 (devmgr, false)
osEPiRawReadIo, 0x8002AEC0, 0x0 (devmgr, false)
__osSetGlobalIntMask, 0x8002AF10, 0x4C (setglobalintmask, true)
osYieldThread, 0x8002AF60, 0x4C (yieldthread, true)
lldiv, 0x8002AFB0, 0x100 (ldiv, true)
ldiv, 0x8002B0B0, 0x84 (ldiv, true)
__osGetCause, 0x8002B140, 0xC (getcause, true)
osStopThread, 0x8002E280, 0xC0 (stopthread, true)
osViModeNtscLan1, 0x800C7CD0, 0x50 (vi, false)
osViModePalLan1, 0x800C7D20, 0x50 (vi, false)
osViModeMpalLan1, 0x800C7D70, 0x50 (vi, false)
__osViDevMgr, 0x800C7DC0, 0x5 (vimgr, true)
__osPiDevMgr, 0x800C7DE0, 0x1C (epidma, false)
__osCurrentHandle, 0x800C7E00, 0x0 (epirawdma, false)
osViClock, 0x800C7E18, 0x4 (aisetfreq, false)
__OSGlobalIntMask, 0x800C7E20, 0x4 (leointerrupt, false)
.data, 0x800C7E30, 0x50 (xprintf, false)
__osThreadTail, 0x800C7EA0, 0x8 (createmesgqueue, false)
__osRunQueue, 0x800C7EA8, 0x4 (leointerrupt, false)
__osActiveQueue, 0x800C7EAC, 0x4 (createthread, false)
__osRunningThread, 0x800C7EB0, 0x4 (getthreadpri, false)
.data, 0x800C7EE0, 0x70 (vi, false)
__osViCurr, 0x800C7F40, 0x4 (vi, true)
__osViNext, 0x800C7F44, 0x4 (vi, true)
__osTimerList, 0x800C7F50, 0x4 (settimer, false)
.data, 0x800C7F80, 0x30 (xlitob, false)
.rodata, 0x800E9330, 0x10 (perspective, false)
.rodata, 0x800E9340, 0x50 (sinf, false)
.rodata, 0x800E9390, 0x50 (cosf, false)
.rodata, 0x800E93E0, 0x100 (xprintf, false)
.rodata, 0x800E9550, 0x20 (devmgr, false)
__libm_qnan_f, 0x800E9570, 0x4 (cosf, false)
.rodata, 0x800E9580, 0x60 (xldtob, false)
__osRcpImTable, 0x800E95E0, 0x80 (setintmask, true)
__osContPifRam, 0x80156620, 0x40 (contquery, false)
__osContLastCmd, 0x80156660, 0x1 (contquery, false)
__osEventStateTab, 0x801568F0, 0x78 (seteventmesg, true)
.bss, 0x801569B0, 0x40 (sptask, false)
.bss, 0x801569F0, 0x1220 (vimgr, false)
__osCurrentTime, 0x80179520, 0x8 (gettime, false)
__osBaseCounter, 0x80179528, 0x4 (gettime, false)
__osViIntrCount, 0x8017952C, 0x4 (vimgr, false)
__osDiskHandle, 0x801795D4, 0x4 (leointerrupt, false)

6
yamls/us/assets.yaml
View File

@ -116,8 +116,12 @@
- name: ast_corneria
exclusive_ram_id: segment_06
type: bin
type: code
dir: assets
start: 0x961CE0
vram: 0x06000000
subsegments:
- [0x961CE0, .data, ast_corneria/ast_corneria]
- name: ast_meteo
exclusive_ram_id: segment_06