diff options
| author | Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> | 2024-03-29 16:09:14 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-29 14:09:14 -0500 |
| commit | 7ee062df9eefd45326014ef19b10d9da2c7216d8 (patch) | |
| tree | 6f5abe4ceb3fe59b112e2da38ef73c8985b30181 /include | |
| parent | 09541d8ad312b7760f3e92897f7e11bcbb99ecd6 (diff) | |
export configuration for ast_corneria (#184)
* 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
Diffstat (limited to 'include')
| -rw-r--r-- | include/assets.h | 107 | ||||
| -rw-r--r-- | include/assets/ast_corneria.h | 8 | ||||
| -rw-r--r-- | include/fox_edisplay_assets.h | 2 | ||||
| -rw-r--r-- | include/fox_enmy2_assets.h | 1 | ||||
| -rw-r--r-- | include/fox_enmy_assets.h | 1 |
5 files changed, 0 insertions, 119 deletions
diff --git a/include/assets.h b/include/assets.h index c0f7f472..977d2755 100644 --- a/include/assets.h +++ b/include/assets.h @@ -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 diff --git a/include/assets/ast_corneria.h b/include/assets/ast_corneria.h deleted file mode 100644 index 756cb732..00000000 --- a/include/assets/ast_corneria.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef AST_CORNERIA_H -#define AST_CORNERIA_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -#endif diff --git a/include/fox_edisplay_assets.h b/include/fox_edisplay_assets.h index baea58dd..4eb7811a 100644 --- a/include/fox_edisplay_assets.h +++ b/include/fox_edisplay_assets.h @@ -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[]; diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h index 6ef38af6..fe6842b4 100644 --- a/include/fox_enmy2_assets.h +++ b/include/fox_enmy2_assets.h @@ -5,7 +5,6 @@ // Displaylists -extern Gfx D_6011F90[]; extern Gfx D_601F2A0[]; extern Gfx D_6017B60[]; extern Gfx D_6004D00[]; diff --git a/include/fox_enmy_assets.h b/include/fox_enmy_assets.h index 0ad5c66e..bcdf2b2b 100644 --- a/include/fox_enmy_assets.h +++ b/include/fox_enmy_assets.h @@ -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[]; |
