mirror of
https://github.com/HarbourMasters/Starship
synced 2026-06-26 02:34:31 -04:00
Colpoly factory and Torch fixes + sonicdcer's ast_sector_X (#164)
* a start * some things * format * hitboxes * soon * fixes and such * Torch * one fix
This commit is contained in:
petrie911
+30
-30
@@ -251,36 +251,36 @@ extern u8 D_500A7D0[]; // fox_std_lib, fox_versus, fox_option, fox_hud
|
||||
* ast_bolse, ast_fortuna, ast_sector_y, ast_solar, ast_zoness,
|
||||
* ast_katina, ast_macbeth, ast_title, ast_menu, ast_training
|
||||
*/
|
||||
extern Gfx D_60005B0[];
|
||||
extern u16 D_6000900[];
|
||||
extern Gfx D_6000A80[];
|
||||
extern u16 D_6000B60[];
|
||||
extern Gfx D_6000E00[];
|
||||
extern Gfx D_6000E10[];
|
||||
extern Gfx D_6001360[];
|
||||
extern Gfx D_6001530[];
|
||||
extern u16 D_6001820[];
|
||||
extern Gfx D_6001840[];
|
||||
extern Gfx D_6001950[];
|
||||
extern Gfx D_6001A60[];
|
||||
extern u16 D_6001A80[];
|
||||
extern u8 D_6001B80[];
|
||||
extern Vtx D_6001C50[];
|
||||
extern u8 D_6001C80[];
|
||||
extern Gfx D_6001DA0[];
|
||||
extern u8 D_60020D0[];
|
||||
extern u8 D_6002160[];
|
||||
extern Gfx D_60023B0[];
|
||||
extern Gfx D_6002990[];
|
||||
extern u16 D_60029A0[];
|
||||
extern Gfx D_6002E60[];
|
||||
extern Gfx D_6002F80[];
|
||||
extern Gfx D_6003000[];
|
||||
extern u8 D_60030D0[];
|
||||
extern Gfx D_60030F0[];
|
||||
extern Gfx D_60034D0[];
|
||||
extern Gfx D_6003610[];
|
||||
extern Gfx D_60036A0[];
|
||||
extern Gfx D_60005B0[]; // fox_bg
|
||||
extern u16 D_6000900[]; // fox_radio
|
||||
extern Gfx D_6000A80[]; // fox_bg, fox_effect
|
||||
extern u16 D_6000B60[]; // fox_radio
|
||||
extern Gfx D_6000E00[]; // fox_edata_1C
|
||||
extern Gfx D_6000E10[]; // fox_enmy2
|
||||
extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C
|
||||
extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
|
||||
extern u16 D_6001820[]; // fox_radio
|
||||
extern Gfx D_6001840[]; // fox_bg
|
||||
extern Gfx D_6001950[]; // fox_enmy2
|
||||
extern Gfx D_6001A60[]; // fox_effect
|
||||
extern u16 D_6001A80[]; // fox_radio
|
||||
extern u8 D_6001B80[]; // fox_hud
|
||||
extern Vtx D_6001C50[]; // fox_play
|
||||
extern u8 D_6001C80[]; // fox_map
|
||||
extern Gfx D_6001DA0[]; // fox_demo, fox_edata_1C
|
||||
extern u8 D_60020D0[]; // fox_hud
|
||||
extern u8 D_6002160[]; // fox_map
|
||||
extern Gfx D_60023B0[]; // fox_edata_1C
|
||||
extern Gfx D_6002990[]; // fox_edata_1C
|
||||
extern u16 D_60029A0[]; // fox_radio
|
||||
extern Gfx D_6002E60[]; // fox_bg
|
||||
extern Gfx D_6002F80[]; // fox_bg
|
||||
extern Gfx D_6003000[]; // fox_edata_1C
|
||||
extern u8 D_60030D0[]; // fox_map
|
||||
extern Gfx D_60030F0[]; // fox_edata_1C
|
||||
extern Gfx D_60034D0[]; // fox_edata_1C, fox_enmy2
|
||||
extern Gfx D_6003610[]; // fox_edata_1C
|
||||
extern Gfx D_60036A0[]; // fox_edata_1C, fox_enmy2
|
||||
extern Gfx D_6003760[];
|
||||
extern u16 D_60038C0[];
|
||||
extern Gfx D_60038E0[];
|
||||
|
||||
@@ -4,5 +4,311 @@
|
||||
#include "gfx.h"
|
||||
#include "sf64object.h"
|
||||
#include "structs.h"
|
||||
#include "sf64level.h"
|
||||
|
||||
extern u8 D_AST_SECTOR_X_6000000[];
|
||||
extern Gfx D_6000840[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_890[];
|
||||
extern u16 D_60008C0[];
|
||||
extern Gfx D_60010C0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1110[];
|
||||
extern u16 D_6001150[];
|
||||
extern Gfx D_6001950[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_19B8[];
|
||||
extern u16 D_6001AD8[];
|
||||
extern Gfx D_6001CE0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1E40[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1E80[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1FB0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_2090[];
|
||||
extern u16 D_60020C0[];
|
||||
extern u16 D_60022C0[];
|
||||
extern u16 D_60024C0[];
|
||||
extern u16 D_60026C0[];
|
||||
extern u16 D_60028C0[];
|
||||
extern Gfx D_6002AC0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_2E88[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_3018[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_3118[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_3158[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_31D8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_3208[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_3408[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_34A8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_34D8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_3628[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_3688[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_36B8[];
|
||||
extern u16 D_60036E8[];
|
||||
extern u16 D_6003EE8[];
|
||||
extern u16 D_60046E8[];
|
||||
extern u16 D_6004EE8[];
|
||||
extern u16 D_6005EE8[];
|
||||
extern Gfx D_60066F0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_6760[];
|
||||
extern Gfx D_6006810[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_6A38[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_6B18[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_6C18[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_6C58[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_6DF8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_6FF8[];
|
||||
extern u16 D_6007128[];
|
||||
extern u16 D_6007928[];
|
||||
extern u16 D_6008128[];
|
||||
extern u16 D_6008928[];
|
||||
extern Gfx D_6008B30[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_8E28[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_8F18[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_8F98[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_9188[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_9378[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_93F8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_9468[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_94E8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_9518[];
|
||||
extern u16 D_6009548[];
|
||||
extern u16 D_6009748[];
|
||||
extern Gfx D_6009950[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_9AA8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_9B28[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_9B68[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_9BE8[];
|
||||
extern Gfx D_6009C30[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_9C80[];
|
||||
extern u16 D_6009CC0[];
|
||||
extern Animation D_6009FF8;
|
||||
extern Animation D_600A2D4;
|
||||
extern Gfx D_600A2E0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_A3F0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_A430[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_A530[];
|
||||
extern u16 D_600A570[];
|
||||
extern u16 D_600AD70[];
|
||||
extern Gfx D_600AF70[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B088[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B0C8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B118[];
|
||||
extern Gfx D_600B2B0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B3C0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B400[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B500[];
|
||||
extern Gfx D_600B540[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B6C8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B6F8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B778[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B7A8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_B7E8[];
|
||||
extern Gfx D_600B830[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_BA30[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_BC10[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_BD10[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_BD60[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_BDC0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_BE90[];
|
||||
extern Gfx D_600C000[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_C1B0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_C380[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_C3C0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_C4E0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_C550[];
|
||||
extern u16 D_600C5A0[];
|
||||
extern Animation D_600F890;
|
||||
extern Gfx D_600F8A0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_F8F8[];
|
||||
extern u16 D_600F938[];
|
||||
extern Gfx D_6010140[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_10220[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_10330[];
|
||||
extern Gfx ast_sector_x_seg6_dl_103B0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_10470[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_10560[];
|
||||
extern u16 D_60105A0[];
|
||||
extern Animation D_60123BC;
|
||||
extern Animation D_6013798;
|
||||
extern Animation D_6013820;
|
||||
extern Limb* D_601390C[];
|
||||
extern Animation D_60158C4;
|
||||
extern Animation D_6016E28;
|
||||
extern Gfx ast_sector_x_seg6_dl_16E40[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_16F78[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_17138[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_171B8[];
|
||||
extern Gfx ast_sector_x_seg6_dl_17240[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_17330[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_17470[];
|
||||
extern Gfx ast_sector_x_seg6_dl_17570[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_176F0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_177B0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_17880[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_178E0[];
|
||||
extern Gfx ast_sector_x_seg6_dl_17A20[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_17BC0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_17DC0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_17E40[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_17EA0[];
|
||||
extern Gfx ast_sector_x_seg6_dl_18060[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_18228[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_18428[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_184D8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_185F8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_18678[];
|
||||
extern Animation D_601AA28;
|
||||
extern Animation D_601C690;
|
||||
extern Gfx ast_sector_x_seg6_dl_1C6A0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1C7D8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1C948[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1C9C8[];
|
||||
extern Gfx ast_sector_x_seg6_dl_1CA50[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1CB38[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1CC78[];
|
||||
extern Gfx ast_sector_x_seg6_dl_1CD80[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1CF00[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1CFD0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1D0D0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1D130[];
|
||||
extern Gfx ast_sector_x_seg6_dl_1D260[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1D400[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1D5E0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1D690[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_1D6F0[];
|
||||
extern Animation D_60206DC;
|
||||
extern Limb* D_6020C68[];
|
||||
extern Gfx D_6020D20[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_20E30[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_20E70[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_20F70[];
|
||||
extern u16 D_6020FB0[];
|
||||
extern u16 D_6021ED0[];
|
||||
extern Gfx D_6022DF0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_23028[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_23068[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_230B8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_23188[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_231C8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_23268[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_232C8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_23378[];
|
||||
extern Gfx D_6023500[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_236D0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_23790[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_23860[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_23960[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_23B20[];
|
||||
extern u16 D_6023C30[];
|
||||
extern Gfx D_6023E30[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_23EB0[];
|
||||
extern Gfx ast_sector_x_seg6_dl_24030[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_24168[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_242E8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_24368[];
|
||||
extern Gfx ast_sector_x_seg6_dl_243F0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_24528[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_246A8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_24728[];
|
||||
extern Gfx ast_sector_x_seg6_dl_247B0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_248E8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_24A78[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_24AF8[];
|
||||
extern Gfx ast_sector_x_seg6_dl_24B80[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_24CB8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_24E58[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_24ED8[];
|
||||
extern Gfx ast_sector_x_seg6_dl_24F60[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_25098[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_25248[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_252C8[];
|
||||
extern Gfx ast_sector_x_seg6_dl_25350[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_25488[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_25628[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_256A8[];
|
||||
extern Gfx ast_sector_x_seg6_dl_25730[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_25868[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_25A08[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_25A88[];
|
||||
extern Gfx ast_sector_x_seg6_dl_25B10[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_25C48[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_25DE8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_25E68[];
|
||||
extern Gfx ast_sector_x_seg6_dl_25EF0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_26028[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_261B8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_26238[];
|
||||
extern Gfx ast_sector_x_seg6_dl_262C0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_263F8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_265A8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_26628[];
|
||||
extern Gfx ast_sector_x_seg6_dl_266B0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_267E8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_26998[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_26A18[];
|
||||
extern Gfx ast_sector_x_seg6_dl_26AA0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_26BD8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_26D88[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_26E08[];
|
||||
extern Gfx ast_sector_x_seg6_dl_26E90[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_26FC8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_27178[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_271F8[];
|
||||
extern Gfx ast_sector_x_seg6_dl_27280[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_273B8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_27558[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_275D8[];
|
||||
extern Gfx ast_sector_x_seg6_dl_27660[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_27798[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_27908[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_27988[];
|
||||
extern Gfx ast_sector_x_seg6_dl_27A10[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_27B48[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_27CE8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_27D68[];
|
||||
extern Gfx ast_sector_x_seg6_dl_27DF0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_27F28[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_280B8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_28138[];
|
||||
extern Gfx ast_sector_x_seg6_dl_281C0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_28328[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_284A8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_28528[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_28568[];
|
||||
extern Gfx D_60285F0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_287E8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_289E8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_28BE8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_28DE8[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_28E68[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_28FD8[];
|
||||
extern u16 D_6029098[];
|
||||
extern Gfx D_60292A0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_29380[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_29420[];
|
||||
extern Gfx ast_sector_x_seg6_dl_294D0[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_29610[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_29710[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_29810[];
|
||||
extern Gfx D_6029890[];
|
||||
extern Vtx ast_sector_x_seg6_vtx_298E8[];
|
||||
extern u16 D_6029918[];
|
||||
extern EnvSettings D_602A120;
|
||||
extern u16* D_60320D0[];
|
||||
extern f32 D_6032328[];
|
||||
extern f32 D_603238C[];
|
||||
extern f32 D_6032408[];
|
||||
extern f32 D_6032488[];
|
||||
extern f32 D_60324EC[];
|
||||
extern f32 D_6032550[];
|
||||
extern f32 D_603265C[];
|
||||
extern f32 D_6032768[];
|
||||
extern f32 D_603285C[];
|
||||
extern f32 D_6032878[];
|
||||
extern f32 D_6032894[];
|
||||
extern f32 D_60328B0[];
|
||||
extern f32 D_60328CC[];
|
||||
extern f32 D_60328E8[];
|
||||
extern f32 D_6032904[];
|
||||
extern f32 D_6032938[];
|
||||
extern f32 D_6032954[];
|
||||
extern f32 D_6032970[];
|
||||
extern f32 D_603298C[];
|
||||
|
||||
#endif
|
||||
|
||||
+18
-18
@@ -3,25 +3,25 @@
|
||||
|
||||
#include "global.h"
|
||||
|
||||
extern ObjectInit D_060371A4[];
|
||||
extern ObjectInit D_06026CC4[];
|
||||
extern ObjectInit D_0602A164[];
|
||||
extern ObjectInit D_06023F64[];
|
||||
extern ObjectInit D_060287A4[];
|
||||
extern ObjectInit D_0602E4F4[];
|
||||
extern ObjectInit D_06007E74[];
|
||||
extern ObjectInit D_0601F234[];
|
||||
extern ObjectInit D_06026714[];
|
||||
extern ObjectInit D_60371A4[];
|
||||
extern ObjectInit D_6026CC4[];
|
||||
extern ObjectInit D_602A164[];
|
||||
extern ObjectInit D_6023F64[];
|
||||
extern ObjectInit D_60287A4[];
|
||||
extern ObjectInit D_602E4F4[];
|
||||
extern ObjectInit D_6007E74[];
|
||||
extern ObjectInit D_601F234[];
|
||||
extern ObjectInit D_6026714[];
|
||||
extern ObjectInit D_0C035154[];
|
||||
extern ObjectInit D_06006AA4[];
|
||||
extern ObjectInit D_06031000[];
|
||||
extern ObjectInit D_06006C60[];
|
||||
extern ObjectInit D_0602E5C8[];
|
||||
extern ObjectInit D_0600EAD4[];
|
||||
extern ObjectInit D_06011044[];
|
||||
extern ObjectInit D_0600FF74[];
|
||||
extern ObjectInit D_06006EB4[];
|
||||
extern ObjectInit D_06014D94[];
|
||||
extern ObjectInit D_6006AA4[];
|
||||
extern ObjectInit D_6031000[];
|
||||
extern ObjectInit D_6006C60[];
|
||||
extern ObjectInit D_602E5C8[];
|
||||
extern ObjectInit D_600EAD4[];
|
||||
extern ObjectInit D_6011044[];
|
||||
extern ObjectInit D_600FF74[];
|
||||
extern ObjectInit D_6006EB4[];
|
||||
extern ObjectInit D_6014D94[];
|
||||
extern ObjectInit D_0302DE3C[];
|
||||
|
||||
#endif
|
||||
|
||||
@@ -288,9 +288,9 @@ typedef struct {
|
||||
/* 0x18C */ Vec3f vwork[30];
|
||||
} Actor; // size = 0x2F4
|
||||
|
||||
#define EVENT_CMD(opcode, arg1, arg2) (((opcode) & 0x7F << 9) & (arg1 & 0x1FF)), arg2
|
||||
#define EVENT_CMD(opcode, arg1, arg2) ((((opcode) & 0x7F) << 9) | ((arg1) & 0x1FF)), (arg2)
|
||||
|
||||
typedef enum {
|
||||
typedef enum EventOpcode {
|
||||
/* 0 */ EVOP_0,
|
||||
/* 1 */ EVOP_1,
|
||||
/* 2 */ EVOP_2,
|
||||
@@ -330,13 +330,13 @@ typedef enum {
|
||||
/* 116 */ EVOP_116 = 116,
|
||||
/* 118 */ EVOP_118 = 118,
|
||||
/* 119 */ EVOP_119,
|
||||
/* 120 */ EVOP_120,
|
||||
/* 120 */ EVOP_120, // play message. arg1 is portrait, arg2 is message ID
|
||||
/* 121 */ EVOP_121,
|
||||
/* 122 */ EVOP_122,
|
||||
/* 124 */ EVOP_124 = 124,
|
||||
/* 125 */ EVOP_125,
|
||||
/* 126 */ EVOP_126,
|
||||
/* 127 */ EVOP_127,
|
||||
/* 127 */ EVOP_127, // stop script
|
||||
} EventOpcode;
|
||||
|
||||
typedef enum ObjectId {
|
||||
|
||||
Reference in New Issue
Block a user