mirror of https://github.com/zeldaret/mm.git
Misc Cleanup 2 (#1306)
* Cleanup undefined_syms.txt * removed unused from Bba textures * eyegore beamos textures * object_eg Unused -> Beamons * ssh * segment 0x07
This commit is contained in:
parent
541199888c
commit
283a37affb
|
@ -52,18 +52,18 @@
|
|||
|
||||
<!-- Unused Textures -->
|
||||
<!-- These are just exact copies of the used textures -->
|
||||
<Texture Name="gBbaUnusedHairSkinTex" OutName="bba_unused_hair_skin" Format="ci8" Width="32" Height="32" Offset="0x6D20" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaUnusedEarTex" OutName="bba_unused_ear" Format="ci8" Width="8" Height="8" Offset="0x7120" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaUnusedNostrilTex" OutName="bba_unused_nostril" Format="ci8" Width="8" Height="8" Offset="0x7160" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaUnusedEyeTex" OutName="bba_unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x71A0"/>
|
||||
<Texture Name="gBbaUnusedWrinklesTex" OutName="bba_unused_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x79A0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaUnusedCheekTex" OutName="bba_unused_cheek" Format="ci8" Width="16" Height="16" Offset="0x7DA0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaUnusedSkinTex" OutName="bba_unused_skin" Format="ci8" Width="8" Height="8" Offset="0x7EA0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaUnusedForeheadTex" OutName="bba_unused_forehead" Format="ci8" Width="32" Height="32" Offset="0x7EE0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaUnusedFingersTex" OutName="bba_unused_fingers" Format="ci8" Width="16" Height="16" Offset="0x82E0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaUnusedShirtTex" OutName="bba_unused_shirt" Format="ci8" Width="16" Height="16" Offset="0x83E0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaUnusedBagTex" OutName="bba_unused_bag" Format="ci8" Width="16" Height="16" Offset="0x84E0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaUnusedSkirtTex" OutName="bba_unused_skirt" Format="ci8" Width="16" Height="16" Offset="0x85E0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaHairSkin2Tex" OutName="bba_hair_skin_2" Format="ci8" Width="32" Height="32" Offset="0x6D20" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaEar2Tex" OutName="bba_ear_2" Format="ci8" Width="8" Height="8" Offset="0x7120" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaNostril2Tex" OutName="bba_nostril_2" Format="ci8" Width="8" Height="8" Offset="0x7160" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaEye2Tex" OutName="bba_eye_2" Format="rgba16" Width="32" Height="32" Offset="0x71A0"/>
|
||||
<Texture Name="gBbaWrinkles2Tex" OutName="bba_wrinkles_2" Format="ci8" Width="32" Height="32" Offset="0x79A0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaCheek2Tex" OutName="bba_cheek_2" Format="ci8" Width="16" Height="16" Offset="0x7DA0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaSkin2Tex" OutName="bba_skin_2" Format="ci8" Width="8" Height="8" Offset="0x7EA0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaForehead2Tex" OutName="bba_forehead_2" Format="ci8" Width="32" Height="32" Offset="0x7EE0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaFingers2Tex" OutName="bba_fingers_2" Format="ci8" Width="16" Height="16" Offset="0x82E0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaShirt2Tex" OutName="bba_shirt_2" Format="ci8" Width="16" Height="16" Offset="0x83E0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaBag2Tex" OutName="bba_bag_2" Format="ci8" Width="16" Height="16" Offset="0x84E0" TlutOffset="0x6B20" />
|
||||
<Texture Name="gBbaSkirt2Tex" OutName="bba_skirt_2" Format="ci8" Width="16" Height="16" Offset="0x85E0" TlutOffset="0x6B20" />
|
||||
|
||||
<!-- Textures -->
|
||||
<Texture Name="gBbaSkinTex" OutName="bba_skin" Format="ci8" Width="8" Height="8" Offset="0x86E0" />
|
||||
|
|
|
@ -34,20 +34,20 @@
|
|||
<!-- Display list for Eyegore's laser attack -->
|
||||
<DList Name="gEyegoreLaserDL" Offset="0x41F0" /> <!-- Original name is "eg_sen_SCR1_F_model" -->
|
||||
|
||||
<!-- Several unused textures. Purpose unknown. -->
|
||||
<Texture Name="gEyegoreUnusedUnknown1Tex" OutName="eyegore_unused_unknown_1" Format="rgba16" Width="8" Height="8" Offset="0x4280" /> <!-- unused -->
|
||||
<Texture Name="gEyegoreUnusedUnknown2Tex" OutName="eyegore_unused_unknown_2" Format="i4" Width="16" Height="32" Offset="0x4300" /> <!-- type is uncertain -->
|
||||
<Texture Name="gEyegoreUnusedUnknown3Tex" OutName="eyegore_unused_unknown_3" Format="rgba16" Width="16" Height="32" Offset="0x4400" /> <!-- unused -->
|
||||
<Texture Name="gEyegoreUnusedUnknown4Tex" OutName="eyegore_unused_unknown_4" Format="rgba16" Width="16" Height="8" Offset="0x4800" /> <!-- unused -->
|
||||
<Texture Name="gEyegoreUnusedUnknown5Tex" OutName="eyegore_unused_unknown_5" Format="rgba16" Width="16" Height="16" Offset="0x4900" /> <!-- unused -->
|
||||
<Texture Name="gEyegoreUnusedEyeTex" OutName="eyegore_unused_eye" Format="rgba16" Width="32" Height="16" Offset="0x4B00" /> <!-- unused -->
|
||||
<Texture Name="gEyegoreUnusedUnknown6Tex" OutName="eyegore_unused_unknown_6" Format="rgba16" Width="16" Height="16" Offset="0x4F00" /> <!-- unused -->
|
||||
<!-- Several unused textures that look to come from object_vm. Purpose unknown. -->
|
||||
<Texture Name="gEyegoreBeamosBodyGradientTex" OutName="eyegore_beamos_body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x4280" />
|
||||
<Texture Name="gEyegoreBeamosGrayMetalTex" OutName="eyegore_beamos_gray_metal" Format="i4" Width="16" Height="32" Offset="0x4300" />
|
||||
<Texture Name="gEyegoreBeamosBoltAndMetalTex" OutName="eyegore_beamos_bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x4400" />
|
||||
<Texture Name="gEyegoreBeamosInnerEyeLidTex" OutName="eyegore_beamos_inner_eye_lid" Format="rgba16" Width="16" Height="8" Offset="0x4800" />
|
||||
<Texture Name="gEyegoreBeamosEyeOutlineTex" OutName="eyegore_beamos_eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x4900" />
|
||||
<Texture Name="gEyegoreBeamosEyeTex" OutName="eyegore_beamos_eye" Format="rgba16" Width="32" Height="16" Offset="0x4B00" />
|
||||
<Texture Name="gEyegoreBeamosBodyTex" OutName="eyegore_beamos_body_tex" Format="rgba16" Width="16" Height="16" Offset="0x4F00" />
|
||||
|
||||
<!-- Animated texture for Eyegore's laser attack. Uses gEyegoreEyeLaserTexAnim. -->
|
||||
<Texture Name="gEyegoreLaserTex" OutName="eyegore_laser" Format="rgba16" Width="8" Height="8" Offset="0x5100" />
|
||||
|
||||
<!-- Unused teeth texture. Purpose unknown. -->
|
||||
<Texture Name="gEyegoreUnusedTeethTex" OutName="eyegore_unused_teeth" Format="rgba16" Width="32" Height="32" Offset="0x5180" /> <!-- unused -->
|
||||
<!-- Unused teeth texture that looks to come from object_vm. Purpose unknown. -->
|
||||
<Texture Name="gEyegoreBeamosTeethTex" OutName="eyegore_beamos_teeth" Format="rgba16" Width="32" Height="32" Offset="0x5180" />
|
||||
|
||||
<!-- Eyegore limb display lists -->
|
||||
<DList Name="gEyegoreHipsDL" Offset="0x7C80" />
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
#include "z_en_ssh.h"
|
||||
#include "objects/object_ssh/object_ssh.h"
|
||||
#include "objects/object_st/object_st.h"
|
||||
|
||||
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_4 | ACTOR_FLAG_10 | ACTOR_FLAG_20)
|
||||
|
||||
|
@ -627,8 +628,10 @@ void EnSsh_SetColliders(EnSsh* this, PlayState* play) {
|
|||
}
|
||||
|
||||
void EnSsh_Init(Actor* thisx, PlayState* play) {
|
||||
// @bug - this symbol no longer exists, reads from a random place in object_ssh_Tex_000190 instead
|
||||
f32 frameCount = Animation_GetLastFrame(&D_06000304);
|
||||
//! @bug: object_st_Anim_000304 is similar if not idential to object_ssh_Anim_001494.
|
||||
//! They also shared the same offset into their respective object files in OoT.
|
||||
//! However since object_ssh is the one loaded, this ends up reading garbage data from within object_ssh_Tex_000190.
|
||||
f32 frameCount = Animation_GetLastFrame(&object_st_Anim_000304);
|
||||
s32 pad;
|
||||
EnSsh* this = THIS;
|
||||
|
||||
|
|
|
@ -141,415 +141,56 @@ aspMainDataEnd = aspMainDataStart + 0x2E0;
|
|||
// segment 0x01
|
||||
|
||||
D_01000000 = 0x01000000;
|
||||
D_01000680 = 0x01000680;
|
||||
D_01001280 = 0x01001280;
|
||||
D_01001800 = 0x01001800;
|
||||
D_01002720 = 0x01002720;
|
||||
D_01002800 = 0x01002800;
|
||||
D_01007980 = 0x01007980;
|
||||
D_010220B0 = 0x010220B0;
|
||||
D_010277B0 = 0x010277B0;
|
||||
D_0102A030 = 0x0102A030;
|
||||
D_0102A6B0 = 0x0102A6B0;
|
||||
D_0102A7B0 = 0x0102A7B0;
|
||||
D_0102AAB0 = 0x0102AAB0;
|
||||
D_0102B170 = 0x0102B170;
|
||||
D_0102B3B0 = 0x0102B3B0;
|
||||
D_0102B8F0 = 0x0102B8F0;
|
||||
D_0102FCB0 = 0x0102FCB0;
|
||||
D_010308F0 = 0x010308F0;
|
||||
D_010310F0 = 0x010310F0;
|
||||
D_010311F0 = 0x010311F0;
|
||||
D_01031408 = 0x01031408;
|
||||
D_01031618 = 0x01031618;
|
||||
|
||||
// segment 0x02
|
||||
|
||||
D_02000000 = 0x02000000;
|
||||
D_02000100 = 0x02000100;
|
||||
D_02000200 = 0x02000200;
|
||||
D_02000300 = 0x02000300;
|
||||
D_02000400 = 0x02000400;
|
||||
D_02000500 = 0x02000500;
|
||||
D_02000600 = 0x02000600;
|
||||
D_02000700 = 0x02000700;
|
||||
D_02000800 = 0x02000800;
|
||||
D_02000900 = 0x02000900;
|
||||
D_02000A00 = 0x02000A00;
|
||||
D_02000BE0 = 0x02000BE0;
|
||||
D_02000D60 = 0x02000D60;
|
||||
D_02000E60 = 0x02000E60;
|
||||
D_02000F60 = 0x02000F60;
|
||||
D_02001360 = 0x02001360;
|
||||
D_02002360 = 0x02002360;
|
||||
D_02002460 = 0x02002460;
|
||||
D_020029A0 = 0x020029A0;
|
||||
D_02002AA0 = 0x02002AA0;
|
||||
D_02002DE0 = 0x02002DE0;
|
||||
D_020031E0 = 0x020031E0;
|
||||
D_020038A0 = 0x020038A0;
|
||||
D_02003F20 = 0x02003F20;
|
||||
D_02003FA0 = 0x02003FA0;
|
||||
D_020042A0 = 0x020042A0;
|
||||
D_020043A0 = 0x020043A0;
|
||||
D_02004420 = 0x02004420;
|
||||
D_020044A0 = 0x020044A0;
|
||||
D_02004A20 = 0x02004A20;
|
||||
D_02004AA0 = 0x02004AA0;
|
||||
D_02004DA0 = 0x02004DA0;
|
||||
D_02004E20 = 0x02004E20;
|
||||
D_02004FA0 = 0x02004FA0;
|
||||
D_02004FE0 = 0x02004FE0;
|
||||
D_020054E0 = 0x020054E0;
|
||||
D_02005720 = 0x02005720;
|
||||
D_02005960 = 0x02005960;
|
||||
D_02005F60 = 0x02005F60;
|
||||
D_020063C0 = 0x020063C0;
|
||||
D_02006B20 = 0x02006B20;
|
||||
D_0200B998 = 0x0200B998;
|
||||
|
||||
// segment 0x03
|
||||
|
||||
|
||||
// segment 0x04
|
||||
|
||||
D_04000320 = 0x04000320;
|
||||
D_040003E0 = 0x040003E0;
|
||||
D_040032B0 = 0x040032B0;
|
||||
D_0400CF48 = 0x0400CF48;
|
||||
D_0400CF58 = 0x0400CF58;
|
||||
D_0400CF88 = 0x0400CF88;
|
||||
D_0400CF98 = 0x0400CF98;
|
||||
D_0400D028 = 0x0400D028;
|
||||
D_0400D030 = 0x0400D030;
|
||||
D_0400D090 = 0x0400D090;
|
||||
D_0400D0A8 = 0x0400D0A8;
|
||||
D_0400D0B0 = 0x0400D0B0;
|
||||
D_0400D0B8 = 0x0400D0B8;
|
||||
D_0400D0C8 = 0x0400D0C8;
|
||||
D_0400D0D0 = 0x0400D0D0;
|
||||
D_0400D100 = 0x0400D100;
|
||||
D_0400D108 = 0x0400D108;
|
||||
D_0400D218 = 0x0400D218;
|
||||
D_0400D220 = 0x0400D220;
|
||||
D_0400D228 = 0x0400D228;
|
||||
D_0400D2D0 = 0x0400D2D0;
|
||||
D_0400D300 = 0x0400D300;
|
||||
D_0400D3E8 = 0x0400D3E8;
|
||||
D_0400D3F8 = 0x0400D3F8;
|
||||
D_0400D420 = 0x0400D420;
|
||||
D_0400D488 = 0x0400D488;
|
||||
D_0400D490 = 0x0400D490;
|
||||
D_0400D4A8 = 0x0400D4A8;
|
||||
D_0400D4B0 = 0x0400D4B0;
|
||||
D_0400D4B8 = 0x0400D4B8;
|
||||
D_0400D4C0 = 0x0400D4C0;
|
||||
D_0400D4D8 = 0x0400D4D8;
|
||||
D_0400D4F0 = 0x0400D4F0;
|
||||
D_0400D4F8 = 0x0400D4F8;
|
||||
D_0400D500 = 0x0400D500;
|
||||
D_0400D520 = 0x0400D520;
|
||||
D_0400D568 = 0x0400D568;
|
||||
D_0400D5A8 = 0x0400D5A8;
|
||||
D_0400D5B0 = 0x0400D5B0;
|
||||
D_0400D638 = 0x0400D638;
|
||||
D_0400D660 = 0x0400D660;
|
||||
D_0400D698 = 0x0400D698;
|
||||
D_0400D728 = 0x0400D728;
|
||||
D_0400D8B0 = 0x0400D8B0;
|
||||
D_0400D9C8 = 0x0400D9C8;
|
||||
D_0400D9D0 = 0x0400D9D0;
|
||||
D_0400D9D8 = 0x0400D9D8;
|
||||
D_0400DA60 = 0x0400DA60;
|
||||
D_0400DA68 = 0x0400DA68;
|
||||
D_0400DA70 = 0x0400DA70;
|
||||
D_0400DA88 = 0x0400DA88;
|
||||
D_0400DAA0 = 0x0400DAA0;
|
||||
D_0400DAA8 = 0x0400DAA8;
|
||||
D_0400DAC0 = 0x0400DAC0;
|
||||
D_0400DAC8 = 0x0400DAC8;
|
||||
D_0400DAD0 = 0x0400DAD0;
|
||||
D_0400DAD8 = 0x0400DAD8;
|
||||
D_0400DAE0 = 0x0400DAE0;
|
||||
D_0400DAF0 = 0x0400DAF0;
|
||||
D_0400DB10 = 0x0400DB10;
|
||||
D_0400DB18 = 0x0400DB18;
|
||||
D_0400DB30 = 0x0400DB30;
|
||||
D_0400DB68 = 0x0400DB68;
|
||||
D_0400DBB0 = 0x0400DBB0;
|
||||
D_0400DBE8 = 0x0400DBE8;
|
||||
D_0400DC20 = 0x0400DC20;
|
||||
D_0400DC28 = 0x0400DC28;
|
||||
D_0400DC30 = 0x0400DC30;
|
||||
D_0400DC48 = 0x0400DC48;
|
||||
D_0400DC50 = 0x0400DC50;
|
||||
D_0400DC60 = 0x0400DC60;
|
||||
D_0400DC78 = 0x0400DC78;
|
||||
D_0400DC80 = 0x0400DC80;
|
||||
D_0400DC88 = 0x0400DC88;
|
||||
D_0400DCA8 = 0x0400DCA8;
|
||||
D_0400DCD0 = 0x0400DCD0;
|
||||
D_0400DCD8 = 0x0400DCD8;
|
||||
D_0400DCF8 = 0x0400DCF8;
|
||||
D_0400DD10 = 0x0400DD10;
|
||||
D_0400DD30 = 0x0400DD30;
|
||||
D_0400DD38 = 0x0400DD38;
|
||||
D_0400DD40 = 0x0400DD40;
|
||||
D_0400DD50 = 0x0400DD50;
|
||||
D_0400DD58 = 0x0400DD58;
|
||||
D_0400DD68 = 0x0400DD68;
|
||||
D_0400DD70 = 0x0400DD70;
|
||||
D_0400DD78 = 0x0400DD78;
|
||||
D_0400DD80 = 0x0400DD80;
|
||||
D_0400DDB0 = 0x0400DDB0;
|
||||
D_0400DDF0 = 0x0400DDF0;
|
||||
D_0400DDF8 = 0x0400DDF8;
|
||||
D_0400DE00 = 0x0400DE00;
|
||||
D_0400DE08 = 0x0400DE08;
|
||||
D_0400DE10 = 0x0400DE10;
|
||||
D_0400DE28 = 0x0400DE28;
|
||||
D_0400DE30 = 0x0400DE30;
|
||||
D_0400DE48 = 0x0400DE48;
|
||||
D_0400DE50 = 0x0400DE50;
|
||||
D_0400DE58 = 0x0400DE58;
|
||||
D_0400DE60 = 0x0400DE60;
|
||||
D_0400DEA0 = 0x0400DEA0;
|
||||
D_0400DEA8 = 0x0400DEA8;
|
||||
D_0400DF78 = 0x0400DF78;
|
||||
D_0400DF90 = 0x0400DF90;
|
||||
D_0400DF98 = 0x0400DF98;
|
||||
D_0400DFA0 = 0x0400DFA0;
|
||||
D_0400DFA8 = 0x0400DFA8;
|
||||
D_0400DFB0 = 0x0400DFB0;
|
||||
D_0400DFB8 = 0x0400DFB8;
|
||||
D_0400DFC0 = 0x0400DFC0;
|
||||
D_0400DFC8 = 0x0400DFC8;
|
||||
D_0400DFD0 = 0x0400DFD0;
|
||||
D_0400DFD8 = 0x0400DFD8;
|
||||
D_0400DFE0 = 0x0400DFE0;
|
||||
D_0400DFE8 = 0x0400DFE8;
|
||||
D_0400DFF0 = 0x0400DFF0;
|
||||
D_0400DFF8 = 0x0400DFF8;
|
||||
D_0400E000 = 0x0400E000;
|
||||
D_0400E008 = 0x0400E008;
|
||||
D_0400E050 = 0x0400E050;
|
||||
D_0400E060 = 0x0400E060;
|
||||
D_0400E070 = 0x0400E070;
|
||||
D_0400E080 = 0x0400E080;
|
||||
D_0400E088 = 0x0400E088;
|
||||
D_0400E098 = 0x0400E098;
|
||||
D_0400E118 = 0x0400E118;
|
||||
D_0400E120 = 0x0400E120;
|
||||
D_0400E150 = 0x0400E150;
|
||||
D_0400E1F0 = 0x0400E1F0;
|
||||
D_0400E1F8 = 0x0400E1F8;
|
||||
D_0400E200 = 0x0400E200;
|
||||
D_0400E208 = 0x0400E208;
|
||||
D_0400E218 = 0x0400E218;
|
||||
D_0400E230 = 0x0400E230;
|
||||
D_0400E248 = 0x0400E248;
|
||||
D_0400E260 = 0x0400E260;
|
||||
D_0400E270 = 0x0400E270;
|
||||
D_0400E278 = 0x0400E278;
|
||||
D_0400E290 = 0x0400E290;
|
||||
D_0400E298 = 0x0400E298;
|
||||
D_0400E2A0 = 0x0400E2A0;
|
||||
D_0400E2A8 = 0x0400E2A8;
|
||||
D_0400E2B0 = 0x0400E2B0;
|
||||
D_0400E2B8 = 0x0400E2B8;
|
||||
D_0400E2C0 = 0x0400E2C0;
|
||||
D_0400E2C8 = 0x0400E2C8;
|
||||
D_0400E2D0 = 0x0400E2D0;
|
||||
D_0400E2D8 = 0x0400E2D8;
|
||||
D_0400E2E8 = 0x0400E2E8;
|
||||
D_0400E2F0 = 0x0400E2F0;
|
||||
D_0400E2F8 = 0x0400E2F8;
|
||||
D_0400E318 = 0x0400E318;
|
||||
D_0400E330 = 0x0400E330;
|
||||
D_0400E348 = 0x0400E348;
|
||||
D_0400E350 = 0x0400E350;
|
||||
D_0400E398 = 0x0400E398;
|
||||
D_0400E3A0 = 0x0400E3A0;
|
||||
D_0400E3A8 = 0x0400E3A8;
|
||||
D_0400E3B0 = 0x0400E3B0;
|
||||
D_0400E3B8 = 0x0400E3B8;
|
||||
D_0400E3C0 = 0x0400E3C0;
|
||||
D_0400E3D8 = 0x0400E3D8;
|
||||
D_0400E3E0 = 0x0400E3E0;
|
||||
D_0400E3E8 = 0x0400E3E8;
|
||||
D_0400E3F0 = 0x0400E3F0;
|
||||
D_0400E3F8 = 0x0400E3F8;
|
||||
D_0400E408 = 0x0400E408;
|
||||
D_0400E410 = 0x0400E410;
|
||||
D_0400E418 = 0x0400E418;
|
||||
D_0400E430 = 0x0400E430;
|
||||
D_04012860 = 0x04012860;
|
||||
D_040128BC = 0x040128BC;
|
||||
D_04014560 = 0x04014560;
|
||||
D_04015DB0 = 0x04015DB0;
|
||||
D_04015FA0 = 0x04015FA0;
|
||||
D_04016360 = 0x04016360;
|
||||
D_0401ACF0 = 0x0401ACF0;
|
||||
D_0401ED00 = 0x0401ED00;
|
||||
D_0401F0F0 = 0x0401F0F0;
|
||||
D_04020658 = 0x04020658;
|
||||
D_04020BB8 = 0x04020BB8;
|
||||
D_04020D00 = 0x04020D00;
|
||||
D_040221B8 = 0x040221B8;
|
||||
D_04023130 = 0x04023130;
|
||||
D_04023210 = 0x04023210;
|
||||
D_04023288 = 0x04023288;
|
||||
D_04023348 = 0x04023348;
|
||||
D_040233B8 = 0x040233B8;
|
||||
D_04023428 = 0x04023428;
|
||||
D_04023480 = 0x04023480;
|
||||
D_040234F0 = 0x040234F0;
|
||||
D_04025850 = 0x04025850;
|
||||
D_04025970 = 0x04025970;
|
||||
D_04025DD0 = 0x04025DD0;
|
||||
D_04025EF0 = 0x04025EF0;
|
||||
D_040268F0 = 0x040268F0;
|
||||
D_04027CA0 = 0x04027CA0;
|
||||
D_040281DC = 0x040281DC;
|
||||
D_04028FEC = 0x04028FEC;
|
||||
D_0402900C = 0x0402900C;
|
||||
D_04029140 = 0x04029140;
|
||||
D_04029CB0 = 0x04029CB0;
|
||||
D_04029CF0 = 0x04029CF0;
|
||||
D_04029D20 = 0x04029D20;
|
||||
D_0402AF58 = 0x0402AF58;
|
||||
D_0402E510 = 0x0402E510;
|
||||
D_0402E65C = 0x0402E65C;
|
||||
D_0402F028 = 0x0402F028;
|
||||
D_0402F0EC = 0x0402F0EC;
|
||||
D_04030100 = 0x04030100;
|
||||
D_040301B0 = 0x040301B0;
|
||||
D_040367B0 = 0x040367B0;
|
||||
D_040377B0 = 0x040377B0;
|
||||
D_04037850 = 0x04037850;
|
||||
D_0403A0F0 = 0x0403A0F0;
|
||||
D_0403F230 = 0x0403F230;
|
||||
D_0404F250 = 0x0404F250;
|
||||
D_04050550 = 0x04050550;
|
||||
D_04050D10 = 0x04050D10;
|
||||
D_040510B0 = 0x040510B0;
|
||||
D_04051180 = 0x04051180;
|
||||
D_04051238 = 0x04051238;
|
||||
D_0405140C = 0x0405140C;
|
||||
D_040527A0 = 0x040527A0;
|
||||
D_040527F0 = 0x040527F0;
|
||||
D_040528B0 = 0x040528B0;
|
||||
D_04054940 = 0x04054940;
|
||||
D_040549A8 = 0x040549A8;
|
||||
D_04054A90 = 0x04054A90;
|
||||
D_04054C90 = 0x04054C90;
|
||||
D_04054F18 = 0x04054F18;
|
||||
D_04058BA0 = 0x04058BA0;
|
||||
D_0405AAB0 = 0x0405AAB0;
|
||||
D_0405AED0 = 0x0405AED0;
|
||||
D_0405BEF0 = 0x0405BEF0;
|
||||
D_0405CEF0 = 0x0405CEF0;
|
||||
D_0405E6F0 = 0x0405E6F0;
|
||||
D_0405F6F0 = 0x0405F6F0;
|
||||
D_0405FFC0 = 0x0405FFC0;
|
||||
D_040617C0 = 0x040617C0;
|
||||
D_040622C0 = 0x040622C0;
|
||||
D_0406A800 = 0x0406A800;
|
||||
D_0406AB30 = 0x0406AB30;
|
||||
D_0406B6A0 = 0x0406B6A0;
|
||||
D_0406B730 = 0x0406B730;
|
||||
D_0406BB0C = 0x0406BB0C;
|
||||
D_0406EB70 = 0x0406EB70;
|
||||
D_0406F380 = 0x0406F380;
|
||||
D_0406F9F0 = 0x0406F9F0;
|
||||
D_0406FAE0 = 0x0406FAE0;
|
||||
D_040706E0 = 0x040706E0;
|
||||
D_04075A40 = 0x04075A40;
|
||||
D_04076BC0 = 0x04076BC0;
|
||||
D_04079B10 = 0x04079B10;
|
||||
D_0407AB10 = 0x0407AB10;
|
||||
D_0407AB58 = 0x0407AB58;
|
||||
D_0407AB70 = 0x0407AB70;
|
||||
D_0407AFB0 = 0x0407AFB0;
|
||||
D_0407D590 = 0x0407D590;
|
||||
D_0407D650 = 0x0407D650;
|
||||
D_0407E8C0 = 0x0407E8C0;
|
||||
D_0407F218 = 0x0407F218;
|
||||
D_04080FC8 = 0x04080FC8;
|
||||
D_040815D0 = 0x040815D0;
|
||||
D_04081628 = 0x04081628;
|
||||
D_04083534 = 0x04083534;
|
||||
D_04085640 = 0x04085640;
|
||||
D_0408DBE0 = 0x0408DBE0;
|
||||
D_0408EBE0 = 0x0408EBE0;
|
||||
D_04091BE0 = 0x04091BE0;
|
||||
D_04091CE0 = 0x04091CE0;
|
||||
D_04091DE0 = 0x04091DE0;
|
||||
D_04091FE0 = 0x04091FE0;
|
||||
D_040921E0 = 0x040921E0;
|
||||
D_040923E0 = 0x040923E0;
|
||||
|
||||
// segment 0x05
|
||||
|
||||
D_05001D20 = 0x05001D20;
|
||||
D_05002FA0 = 0x05002FA0;
|
||||
D_050061E8 = 0x050061E8;
|
||||
D_05006420 = 0x05006420;
|
||||
D_050066B0 = 0x050066B0;
|
||||
D_05006760 = 0x05006760;
|
||||
D_05007498 = 0x05007498;
|
||||
D_050078A0 = 0x050078A0;
|
||||
D_05007938 = 0x05007938;
|
||||
D_050085F0 = 0x050085F0;
|
||||
D_050089D0 = 0x050089D0;
|
||||
D_050182A8 = 0x050182A8;
|
||||
D_0501B370 = 0x0501B370;
|
||||
D_0501BEE0 = 0x0501BEE0;
|
||||
D_0501BFB8 = 0x0501BFB8;
|
||||
D_0501C058 = 0x0501C058;
|
||||
D_0501C118 = 0x0501C118;
|
||||
D_05021EF0 = 0x05021EF0;
|
||||
D_05023008 = 0x05023008;
|
||||
D_0502324C = 0x0502324C;
|
||||
|
||||
// segment 0x06
|
||||
|
||||
// code
|
||||
|
||||
D_06001254 = 0x06001254;
|
||||
D_06001C60 = 0x06001C60;
|
||||
D_06007390 = 0x06007390;
|
||||
D_06008AA0 = 0x06008AA0;
|
||||
D_06008C50 = 0x06008C50;
|
||||
D_0600A348 = 0x0600A348;
|
||||
D_0600E088 = 0x0600E088;
|
||||
D_0600E2A0 = 0x0600E2A0;
|
||||
D_0600FBB8 = 0x0600FBB8;
|
||||
D_0600FC18 = 0x0600FC18;
|
||||
D_0600FDF0 = 0x0600FDF0;
|
||||
D_060110A8 = 0x060110A8;
|
||||
D_06011210 = 0x06011210;
|
||||
D_06011710 = 0x06011710;
|
||||
D_06011760 = 0x06011760;
|
||||
D_06011AB8 = 0x06011AB8;
|
||||
D_06012A80 = 0x06012A80;
|
||||
D_06013138 = 0x06013138;
|
||||
|
||||
// ovl_Bg_Crace_Movebg
|
||||
|
||||
D_060003A0 = 0x060003A0;
|
||||
D_06000E00 = 0x06000E00;
|
||||
|
||||
// ovl_Bg_Dblue_Elevator
|
||||
|
||||
D_060002C8 = 0x060002C8;
|
||||
D_060005C4 = 0x060005C4;
|
||||
|
||||
// ovl_Bg_Dkjail_Ivy
|
||||
|
||||
D_06000080 = 0x06000080;
|
||||
D_060011A8 = 0x060011A8;
|
||||
|
||||
// ovl_Bg_Dy_Yoseizo
|
||||
|
||||
D_06008090 = 0x06008090;
|
||||
|
@ -558,33 +199,8 @@ D_0600D228 = 0x0600D228;
|
|||
D_0601C6F4 = 0x0601C6F4;
|
||||
D_0601C8B4 = 0x0601C8B4;
|
||||
|
||||
// ovl_Bg_F40_Flift
|
||||
// ovl_Bg_Lotus
|
||||
|
||||
D_06004038 = 0x06004038;
|
||||
D_06004240 = 0x06004240;
|
||||
|
||||
// ovl_Bg_F40_Swlift
|
||||
|
||||
D_06003B08 = 0x06003B08;
|
||||
D_06003E80 = 0x06003E80;
|
||||
|
||||
// ovl_Bg_Haka_Bombwall
|
||||
|
||||
D_06001680 = 0x06001680;
|
||||
|
||||
// ovl_Bg_Ikana_Bombwall
|
||||
|
||||
D_06000288 = 0x06000288;
|
||||
|
||||
// ovl_Bg_Keikoku_Spr
|
||||
|
||||
D_06000100 = 0x06000100;
|
||||
D_060001F8 = 0x060001F8;
|
||||
D_060003F8 = 0x060003F8;
|
||||
D_06000500 = 0x06000500;
|
||||
D_060005F8 = 0x060005F8;
|
||||
|
||||
/* ovl_Bg_Lotus */
|
||||
D_06000A20 = 0x06000A20;
|
||||
D_06000040 = 0x06000040;
|
||||
|
||||
|
@ -745,12 +361,6 @@ D_06009278 = 0x06009278;
|
|||
D_06012B70 = 0x06012B70;
|
||||
D_06013EA8 = 0x06013EA8;
|
||||
|
||||
// ovl_Eff_Stk
|
||||
|
||||
D_06008920 = 0x06008920;
|
||||
D_06008A38 = 0x06008A38;
|
||||
D_06009F60 = 0x06009F60;
|
||||
|
||||
// ovl_En_An
|
||||
|
||||
D_06000308 = 0x06000308;
|
||||
|
@ -797,51 +407,15 @@ D_0600CB2C = 0x0600CB2C;
|
|||
D_0600CB84 = 0x0600CB84;
|
||||
D_0600CBC0 = 0x0600CBC0;
|
||||
|
||||
// ovl_En_Dnh
|
||||
|
||||
D_06002950 = 0x06002950;
|
||||
|
||||
// ovl_En_Dt
|
||||
|
||||
D_0600112C = 0x0600112C;
|
||||
D_0600B0CC = 0x0600B0CC;
|
||||
|
||||
// ovl_En_Egblock
|
||||
|
||||
D_06001698 = 0x06001698;
|
||||
D_06001820 = 0x06001820;
|
||||
D_06001918 = 0x06001918;
|
||||
D_06001BF8 = 0x06001BF8;
|
||||
|
||||
// ovl_En_Egol
|
||||
|
||||
D_06000040 = 0x06000040;
|
||||
D_06001170 = 0x06001170;
|
||||
D_060013B0 = 0x060013B0;
|
||||
D_06001918 = 0x06001918;
|
||||
D_060041F0 = 0x060041F0;
|
||||
D_060094E4 = 0x060094E4;
|
||||
D_06009664 = 0x06009664;
|
||||
D_0600EE4C = 0x0600EE4C;
|
||||
|
||||
// ovl_En_Encount3
|
||||
|
||||
D_060009A0 = 0x060009A0;
|
||||
|
||||
// ovl_En_Estone
|
||||
|
||||
D_06010240 = 0x06010240;
|
||||
|
||||
// ovl_En_Ge2
|
||||
|
||||
D_0600030C = 0x0600030C;
|
||||
D_06000460 = 0x06000460;
|
||||
D_06001664 = 0x06001664;
|
||||
D_06008DD8 = 0x06008DD8;
|
||||
D_060091D0 = 0x060091D0;
|
||||
D_06009D1C = 0x06009D1C;
|
||||
D_0600A344 = 0x0600A344;
|
||||
|
||||
// ovl_En_Ge3
|
||||
|
||||
D_06001EFC = 0x06001EFC;
|
||||
|
@ -1020,22 +594,6 @@ D_06006F38 = 0x06006F38;
|
|||
D_06006FD8 = 0x06006FD8;
|
||||
D_06009930 = 0x06009930;
|
||||
|
||||
// ovl_En_Slime
|
||||
|
||||
D_060004C0 = 0x060004C0;
|
||||
D_06000650 = 0x06000650;
|
||||
D_06000828 = 0x06000828;
|
||||
D_06000A10 = 0x06000A10;
|
||||
|
||||
// ovl_En_Snowwd
|
||||
|
||||
D_06000198 = 0x06000198;
|
||||
D_06001AA0 = 0x06001AA0;
|
||||
|
||||
// ovl_En_Ssh
|
||||
|
||||
D_06000304 = 0x06000304;
|
||||
|
||||
// ovl_En_Takaraya
|
||||
|
||||
D_06000968 = 0x06000968;
|
||||
|
@ -1045,17 +603,6 @@ D_06009890 = 0x06009890;
|
|||
D_0600A280 = 0x0600A280;
|
||||
D_0600AD98 = 0x0600AD98;
|
||||
|
||||
// ovl_En_Test3
|
||||
|
||||
D_0600CB60 = 0x0600CB60;
|
||||
D_0600EDD0 = 0x0600EDD0;
|
||||
D_0600F7EC = 0x0600F7EC;
|
||||
|
||||
// ovl_En_Tru
|
||||
|
||||
D_0601A820 = 0x0601A820;
|
||||
D_0601A830 = 0x0601A830;
|
||||
|
||||
// ovl_En_Wdhand
|
||||
|
||||
D_060000F4 = 0x060000F4;
|
||||
|
@ -1070,17 +617,6 @@ D_06001E20 = 0x06001E20;
|
|||
|
||||
D_06013328 = 0x06013328;
|
||||
|
||||
// ovl_En_Zod
|
||||
|
||||
D_06000D94 = 0x06000D94;
|
||||
D_06007650 = 0x06007650;
|
||||
D_0600D658 = 0x0600D658;
|
||||
|
||||
// ovl_Item_B_Heart
|
||||
|
||||
D_06001290 = 0x06001290;
|
||||
D_06001470 = 0x06001470;
|
||||
|
||||
// ovl_Obj_Boyo
|
||||
|
||||
D_06000300 = 0x06000300;
|
||||
|
@ -1097,28 +633,20 @@ D_06002188 = 0x06002188;
|
|||
D_06000B70 = 0x06000B70;
|
||||
D_06000D60 = 0x06000D60;
|
||||
|
||||
// segment 0x07
|
||||
|
||||
// segment 0x08
|
||||
|
||||
D_08000000 = 0x08000000;
|
||||
|
||||
// segment 0x09
|
||||
|
||||
// segment 0x0A
|
||||
|
||||
D_0A0001A0 = 0x0A0001A0;
|
||||
D_0A000440 = 0x0A000440;
|
||||
D_0A0004A0 = 0x0A0004A0;
|
||||
D_0A000D40 = 0x0A000D40;
|
||||
D_0A0011F8 = 0x0A0011F8;
|
||||
D_0A001CD8 = 0x0A001CD8;
|
||||
|
||||
// segment 0x0B
|
||||
|
||||
D_0B000000 = 0x0B000000;
|
||||
D_0B000090 = 0x0B000090;
|
||||
D_0B0000E0 = 0x0B0000E0;
|
||||
D_0B000130 = 0x0B000130;
|
||||
D_0B000188 = 0x0B000188;
|
||||
|
||||
// segment 0x0C
|
||||
|
||||
D_0C000000 = 0x0C000000;
|
||||
|
@ -1128,16 +656,9 @@ D_0C000000 = 0x0C000000;
|
|||
D_0E000000 = 0x0E000000;
|
||||
|
||||
// TODO the following are fake and are offsets into the structure at D_0E000000
|
||||
D_0E000048 = 0x0E000048;
|
||||
D_0E000088 = 0x0E000088;
|
||||
D_0E000140 = 0x0E000140;
|
||||
D_0E0001C8 = 0x0E0001C8;
|
||||
D_0E0002A0 = 0x0E0002A0;
|
||||
D_0E0002A8 = 0x0E0002A8;
|
||||
D_0E0002B0 = 0x0E0002B0;
|
||||
D_0E0002B8 = 0x0E0002B8;
|
||||
D_0E0002C8 = 0x0E0002C8;
|
||||
D_0E0002E0 = 0x0E0002E0;
|
||||
|
||||
// segment 0x0F
|
||||
|
||||
|
|
Loading…
Reference in New Issue