diff --git a/src/globals.c b/src/globals.c index 99eb3ab54..f92d6346b 100644 --- a/src/globals.c +++ b/src/globals.c @@ -34489,116 +34489,451 @@ u16 proptable[] = { }; u32 var00021e58 = 0x00001000; -u32 var00021e5c = 0x080b0604; -u32 var00021e60 = 0x00000000; -u32 var00021e64 = 0x00000000; -u32 var00021e68 = 0x00000000; -u32 var00021e6c = 0x00030006; -u32 var00021e70 = 0x00000006; -u32 var00021e74 = 0x09000000; -u32 var00021e78 = 0x00000000; -u32 var00021e7c = 0x03030300; -u32 var00021e80 = 0x00000000; -u32 var00021e84 = 0x00000000; -u32 var00021e88 = 0x00000000; -u32 var00021e8c = 0x0000000c; -u32 var00021e90 = 0x00000000; -u32 var00021e94 = 0x00000b00; -u32 var00021e98 = 0x00000000; -u32 var00021e9c = 0x00000000; -u32 var00021ea0 = 0x00000000; -u32 var00021ea4 = 0x00000000; -u32 var00021ea8 = 0x00000000; -u32 var00021eac = 0x0d0d0d0d; -u32 var00021eb0 = 0x0d000000; -u32 var00021eb4 = 0x0007040c; -u32 var00021eb8 = 0x00000300; -u32 var00021ebc = 0x00000000; -u32 var00021ec0 = 0x00000c0c; -u32 var00021ec4 = 0x00000000; -u32 var00021ec8 = 0x00000000; -u32 var00021ecc = 0x00000000; -u32 var00021ed0 = 0x00000d00; -u32 var00021ed4 = 0x00000000; -u32 var00021ed8 = 0x00000000; -u32 var00021edc = 0x00000000; -u32 var00021ee0 = 0x000d0c0c; -u32 var00021ee4 = 0x00000000; -u32 var00021ee8 = 0x00000000; -u32 var00021eec = 0x00000000; -u32 var00021ef0 = 0x0000000d; -u32 var00021ef4 = 0x00000000; -u32 var00021ef8 = 0x00000009; -u32 var00021efc = 0x00000000; -u32 var00021f00 = 0x00000000; -u32 var00021f04 = 0x00000000; -u32 var00021f08 = 0x00000007; -u32 var00021f0c = 0x06000900; -u32 var00021f10 = 0x00060606; -u32 var00021f14 = 0x00000b00; -u32 var00021f18 = 0x00060900; -u32 var00021f1c = 0x000b0600; -u32 var00021f20 = 0x00000000; -u32 var00021f24 = 0x19000000; -u32 var00021f28 = 0x00000000; -u32 var00021f2c = 0x00000000; -u32 var00021f30 = 0x00000000; -u32 var00021f34 = 0x00000000; -u32 var00021f38 = 0x00000000; -u32 var00021f3c = 0x00000b00; -u32 var00021f40 = 0x00000000; -u32 var00021f44 = 0x00000011; -u32 var00021f48 = 0x00000000; -u32 var00021f4c = 0x00000000; -u32 var00021f50 = 0x00000000; -u32 var00021f54 = 0x00000000; -u32 var00021f58 = 0x00000000; -u32 var00021f5c = 0x00000000; -u32 var00021f60 = 0x00000000; -u32 var00021f64 = 0x00000000; -u32 var00021f68 = 0x00000000; -u32 var00021f6c = 0x00000d0d; -u32 var00021f70 = 0x0d0d0000; -u32 var00021f74 = 0x00000000; -u32 var00021f78 = 0x0000000d; -u32 var00021f7c = 0x0d000d0d; -u32 var00021f80 = 0x0800000c; -u32 var00021f84 = 0x0d070b00; -u32 var00021f88 = 0x07070000; -u32 var00021f8c = 0x00000000; -u32 var00021f90 = 0x00000000; -u32 var00021f94 = 0x00000000; -u32 var00021f98 = 0x00000000; -u32 var00021f9c = 0x0000000d; -u32 var00021fa0 = 0x07000000; -u32 var00021fa4 = 0x00070000; -u32 var00021fa8 = 0x00000007; -u32 var00021fac = 0x08060606; -u32 var00021fb0 = 0x06080707; -u32 var00021fb4 = 0x00000000; -u32 var00021fb8 = 0x00000000; -u32 var00021fbc = 0x00000000; -u32 var00021fc0 = 0x00000000; -u32 var00021fc4 = 0x00000000; -u32 var00021fc8 = 0x06000000; -u32 var00021fcc = 0x07000000; -u32 var00021fd0 = 0x00000006; -u32 var00021fd4 = 0x08080800; -u32 var00021fd8 = 0x00000000; -u32 var00021fdc = 0x00000000; -u32 var00021fe0 = 0x00060000; -u32 var00021fe4 = 0x06000707; -u32 var00021fe8 = 0x00000000; -u32 var00021fec = 0x0d000000; -u32 var00021ff0 = 0x00000600; -u32 var00021ff4 = 0x00001100; -u32 var00021ff8 = 0x00000000; -u32 var00021ffc = 0x00000000; -u32 var00022000 = 0x0000000b; -u32 var00022004 = 0x00000006; -u32 var00022008 = 0x00000000; -u32 var0002200c = 0x00000000; -u32 var00022010 = 0x00000000; + +// 21e5c +u8 propexplosiontypes[] = { + /*0x0000*/ 0x08, + /*0x0001*/ 0x0b, + /*0x0002*/ 0x06, + /*0x0003*/ 0x04, + /*0x0004*/ 0x00, + /*0x0005*/ 0x00, + /*0x0006*/ 0x00, + /*0x0007*/ 0x00, + /*0x0008*/ 0x00, + /*0x0009*/ 0x00, + /*0x000a*/ 0x00, + /*0x000b*/ 0x00, + /*0x000c*/ 0x00, + /*0x000d*/ 0x00, + /*0x000e*/ 0x00, + /*0x000f*/ 0x00, + /*0x0010*/ 0x00, + /*0x0011*/ 0x03, + /*0x0012*/ 0x00, + /*0x0013*/ 0x06, + /*0x0014*/ 0x00, + /*0x0015*/ 0x00, + /*0x0016*/ 0x00, + /*0x0017*/ 0x06, + /*0x0018*/ 0x09, + /*0x0019*/ 0x00, + /*0x001a*/ 0x00, + /*0x001b*/ 0x00, + /*0x001c*/ 0x00, + /*0x001d*/ 0x00, + /*0x001e*/ 0x00, + /*0x001f*/ 0x00, + /*0x0020*/ 0x03, + /*0x0021*/ 0x03, + /*0x0022*/ 0x03, + /*0x0023*/ 0x00, + /*0x0024*/ 0x00, + /*0x0025*/ 0x00, + /*0x0026*/ 0x00, + /*0x0027*/ 0x00, + /*0x0028*/ 0x00, + /*0x0029*/ 0x00, + /*0x002a*/ 0x00, + /*0x002b*/ 0x00, + /*0x002c*/ 0x00, + /*0x002d*/ 0x00, + /*0x002e*/ 0x00, + /*0x002f*/ 0x00, + /*0x0030*/ 0x00, + /*0x0031*/ 0x00, + /*0x0032*/ 0x00, + /*0x0033*/ 0x0c, + /*0x0034*/ 0x00, + /*0x0035*/ 0x00, + /*0x0036*/ 0x00, + /*0x0037*/ 0x00, + /*0x0038*/ 0x00, + /*0x0039*/ 0x00, + /*0x003a*/ 0x0b, + /*0x003b*/ 0x00, + /*0x003c*/ 0x00, + /*0x003d*/ 0x00, + /*0x003e*/ 0x00, + /*0x003f*/ 0x00, + /*0x0040*/ 0x00, + /*0x0041*/ 0x00, + /*0x0042*/ 0x00, + /*0x0043*/ 0x00, + /*0x0044*/ 0x00, + /*0x0045*/ 0x00, + /*0x0046*/ 0x00, + /*0x0047*/ 0x00, + /*0x0048*/ 0x00, + /*0x0049*/ 0x00, + /*0x004a*/ 0x00, + /*0x004b*/ 0x00, + /*0x004c*/ 0x00, + /*0x004d*/ 0x00, + /*0x004e*/ 0x00, + /*0x004f*/ 0x00, + /*0x0050*/ 0x0d, + /*0x0051*/ 0x0d, + /*0x0052*/ 0x0d, + /*0x0053*/ 0x0d, + /*0x0054*/ 0x0d, + /*0x0055*/ 0x00, + /*0x0056*/ 0x00, + /*0x0057*/ 0x00, + /*0x0058*/ 0x00, + /*0x0059*/ 0x07, + /*0x005a*/ 0x04, + /*0x005b*/ 0x0c, + /*0x005c*/ 0x00, + /*0x005d*/ 0x00, + /*0x005e*/ 0x03, + /*0x005f*/ 0x00, + /*0x0060*/ 0x00, + /*0x0061*/ 0x00, + /*0x0062*/ 0x00, + /*0x0063*/ 0x00, + /*0x0064*/ 0x00, + /*0x0065*/ 0x00, + /*0x0066*/ 0x0c, + /*0x0067*/ 0x0c, + /*0x0068*/ 0x00, + /*0x0069*/ 0x00, + /*0x006a*/ 0x00, + /*0x006b*/ 0x00, + /*0x006c*/ 0x00, + /*0x006d*/ 0x00, + /*0x006e*/ 0x00, + /*0x006f*/ 0x00, + /*0x0070*/ 0x00, + /*0x0071*/ 0x00, + /*0x0072*/ 0x00, + /*0x0073*/ 0x00, + /*0x0074*/ 0x00, + /*0x0075*/ 0x00, + /*0x0076*/ 0x0d, + /*0x0077*/ 0x00, + /*0x0078*/ 0x00, + /*0x0079*/ 0x00, + /*0x007a*/ 0x00, + /*0x007b*/ 0x00, + /*0x007c*/ 0x00, + /*0x007d*/ 0x00, + /*0x007e*/ 0x00, + /*0x007f*/ 0x00, + /*0x0080*/ 0x00, + /*0x0081*/ 0x00, + /*0x0082*/ 0x00, + /*0x0083*/ 0x00, + /*0x0084*/ 0x00, + /*0x0085*/ 0x0d, + /*0x0086*/ 0x0c, + /*0x0087*/ 0x0c, + /*0x0088*/ 0x00, + /*0x0089*/ 0x00, + /*0x008a*/ 0x00, + /*0x008b*/ 0x00, + /*0x008c*/ 0x00, + /*0x008d*/ 0x00, + /*0x008e*/ 0x00, + /*0x008f*/ 0x00, + /*0x0090*/ 0x00, + /*0x0091*/ 0x00, + /*0x0092*/ 0x00, + /*0x0093*/ 0x00, + /*0x0094*/ 0x00, + /*0x0095*/ 0x00, + /*0x0096*/ 0x00, + /*0x0097*/ 0x0d, + /*0x0098*/ 0x00, + /*0x0099*/ 0x00, + /*0x009a*/ 0x00, + /*0x009b*/ 0x00, + /*0x009c*/ 0x00, + /*0x009d*/ 0x00, + /*0x009e*/ 0x00, + /*0x009f*/ 0x09, + /*0x00a0*/ 0x00, + /*0x00a1*/ 0x00, + /*0x00a2*/ 0x00, + /*0x00a3*/ 0x00, + /*0x00a4*/ 0x00, + /*0x00a5*/ 0x00, + /*0x00a6*/ 0x00, + /*0x00a7*/ 0x00, + /*0x00a8*/ 0x00, + /*0x00a9*/ 0x00, + /*0x00aa*/ 0x00, + /*0x00ab*/ 0x00, + /*0x00ac*/ 0x00, + /*0x00ad*/ 0x00, + /*0x00ae*/ 0x00, + /*0x00af*/ 0x07, + /*0x00b0*/ 0x06, + /*0x00b1*/ 0x00, + /*0x00b2*/ 0x09, + /*0x00b3*/ 0x00, + /*0x00b4*/ 0x00, + /*0x00b5*/ 0x06, + /*0x00b6*/ 0x06, + /*0x00b7*/ 0x06, + /*0x00b8*/ 0x00, + /*0x00b9*/ 0x00, + /*0x00ba*/ 0x0b, + /*0x00bb*/ 0x00, + /*0x00bc*/ 0x00, + /*0x00bd*/ 0x06, + /*0x00be*/ 0x09, + /*0x00bf*/ 0x00, + /*0x00c0*/ 0x00, + /*0x00c1*/ 0x0b, + /*0x00c2*/ 0x06, + /*0x00c3*/ 0x00, + /*0x00c4*/ 0x00, + /*0x00c5*/ 0x00, + /*0x00c6*/ 0x00, + /*0x00c7*/ 0x00, + /*0x00c8*/ 0x19, + /*0x00c9*/ 0x00, + /*0x00ca*/ 0x00, + /*0x00cb*/ 0x00, + /*0x00cc*/ 0x00, + /*0x00cd*/ 0x00, + /*0x00ce*/ 0x00, + /*0x00cf*/ 0x00, + /*0x00d0*/ 0x00, + /*0x00d1*/ 0x00, + /*0x00d2*/ 0x00, + /*0x00d3*/ 0x00, + /*0x00d4*/ 0x00, + /*0x00d5*/ 0x00, + /*0x00d6*/ 0x00, + /*0x00d7*/ 0x00, + /*0x00d8*/ 0x00, + /*0x00d9*/ 0x00, + /*0x00da*/ 0x00, + /*0x00db*/ 0x00, + /*0x00dc*/ 0x00, + /*0x00dd*/ 0x00, + /*0x00de*/ 0x00, + /*0x00df*/ 0x00, + /*0x00e0*/ 0x00, + /*0x00e1*/ 0x00, + /*0x00e2*/ 0x0b, + /*0x00e3*/ 0x00, + /*0x00e4*/ 0x00, + /*0x00e5*/ 0x00, + /*0x00e6*/ 0x00, + /*0x00e7*/ 0x00, + /*0x00e8*/ 0x00, + /*0x00e9*/ 0x00, + /*0x00ea*/ 0x00, + /*0x00eb*/ 0x11, + /*0x00ec*/ 0x00, + /*0x00ed*/ 0x00, + /*0x00ee*/ 0x00, + /*0x00ef*/ 0x00, + /*0x00f0*/ 0x00, + /*0x00f1*/ 0x00, + /*0x00f2*/ 0x00, + /*0x00f3*/ 0x00, + /*0x00f4*/ 0x00, + /*0x00f5*/ 0x00, + /*0x00f6*/ 0x00, + /*0x00f7*/ 0x00, + /*0x00f8*/ 0x00, + /*0x00f9*/ 0x00, + /*0x00fa*/ 0x00, + /*0x00fb*/ 0x00, + /*0x00fc*/ 0x00, + /*0x00fd*/ 0x00, + /*0x00fe*/ 0x00, + /*0x00ff*/ 0x00, + /*0x0100*/ 0x00, + /*0x0101*/ 0x00, + /*0x0102*/ 0x00, + /*0x0103*/ 0x00, + /*0x0104*/ 0x00, + /*0x0105*/ 0x00, + /*0x0106*/ 0x00, + /*0x0107*/ 0x00, + /*0x0108*/ 0x00, + /*0x0109*/ 0x00, + /*0x010a*/ 0x00, + /*0x010b*/ 0x00, + /*0x010c*/ 0x00, + /*0x010d*/ 0x00, + /*0x010e*/ 0x00, + /*0x010f*/ 0x00, + /*0x0110*/ 0x00, + /*0x0111*/ 0x00, + /*0x0112*/ 0x0d, + /*0x0113*/ 0x0d, + /*0x0114*/ 0x0d, + /*0x0115*/ 0x0d, + /*0x0116*/ 0x00, + /*0x0117*/ 0x00, + /*0x0118*/ 0x00, + /*0x0119*/ 0x00, + /*0x011a*/ 0x00, + /*0x011b*/ 0x00, + /*0x011c*/ 0x00, + /*0x011d*/ 0x00, + /*0x011e*/ 0x00, + /*0x011f*/ 0x0d, + /*0x0120*/ 0x0d, + /*0x0121*/ 0x00, + /*0x0122*/ 0x0d, + /*0x0123*/ 0x0d, + /*0x0124*/ 0x08, + /*0x0125*/ 0x00, + /*0x0126*/ 0x00, + /*0x0127*/ 0x0c, + /*0x0128*/ 0x0d, + /*0x0129*/ 0x07, + /*0x012a*/ 0x0b, + /*0x012b*/ 0x00, + /*0x012c*/ 0x07, + /*0x012d*/ 0x07, + /*0x012e*/ 0x00, + /*0x012f*/ 0x00, + /*0x0130*/ 0x00, + /*0x0131*/ 0x00, + /*0x0132*/ 0x00, + /*0x0133*/ 0x00, + /*0x0134*/ 0x00, + /*0x0135*/ 0x00, + /*0x0136*/ 0x00, + /*0x0137*/ 0x00, + /*0x0138*/ 0x00, + /*0x0139*/ 0x00, + /*0x013a*/ 0x00, + /*0x013b*/ 0x00, + /*0x013c*/ 0x00, + /*0x013d*/ 0x00, + /*0x013e*/ 0x00, + /*0x013f*/ 0x00, + /*0x0140*/ 0x00, + /*0x0141*/ 0x00, + /*0x0142*/ 0x00, + /*0x0143*/ 0x0d, + /*0x0144*/ 0x07, + /*0x0145*/ 0x00, + /*0x0146*/ 0x00, + /*0x0147*/ 0x00, + /*0x0148*/ 0x00, + /*0x0149*/ 0x07, + /*0x014a*/ 0x00, + /*0x014b*/ 0x00, + /*0x014c*/ 0x00, + /*0x014d*/ 0x00, + /*0x014e*/ 0x00, + /*0x014f*/ 0x07, + /*0x0150*/ 0x08, + /*0x0151*/ 0x06, + /*0x0152*/ 0x06, + /*0x0153*/ 0x06, + /*0x0154*/ 0x06, + /*0x0155*/ 0x08, + /*0x0156*/ 0x07, + /*0x0157*/ 0x07, + /*0x0158*/ 0x00, + /*0x0159*/ 0x00, + /*0x015a*/ 0x00, + /*0x015b*/ 0x00, + /*0x015c*/ 0x00, + /*0x015d*/ 0x00, + /*0x015e*/ 0x00, + /*0x015f*/ 0x00, + /*0x0160*/ 0x00, + /*0x0161*/ 0x00, + /*0x0162*/ 0x00, + /*0x0163*/ 0x00, + /*0x0164*/ 0x00, + /*0x0165*/ 0x00, + /*0x0166*/ 0x00, + /*0x0167*/ 0x00, + /*0x0168*/ 0x00, + /*0x0169*/ 0x00, + /*0x016a*/ 0x00, + /*0x016b*/ 0x00, + /*0x016c*/ 0x06, + /*0x016d*/ 0x00, + /*0x016e*/ 0x00, + /*0x016f*/ 0x00, + /*0x0170*/ 0x07, + /*0x0171*/ 0x00, + /*0x0172*/ 0x00, + /*0x0173*/ 0x00, + /*0x0174*/ 0x00, + /*0x0175*/ 0x00, + /*0x0176*/ 0x00, + /*0x0177*/ 0x06, + /*0x0178*/ 0x08, + /*0x0179*/ 0x08, + /*0x017a*/ 0x08, + /*0x017b*/ 0x00, + /*0x017c*/ 0x00, + /*0x017d*/ 0x00, + /*0x017e*/ 0x00, + /*0x017f*/ 0x00, + /*0x0180*/ 0x00, + /*0x0181*/ 0x00, + /*0x0182*/ 0x00, + /*0x0183*/ 0x00, + /*0x0184*/ 0x00, + /*0x0185*/ 0x06, + /*0x0186*/ 0x00, + /*0x0187*/ 0x00, + /*0x0188*/ 0x06, + /*0x0189*/ 0x00, + /*0x018a*/ 0x07, + /*0x018b*/ 0x07, + /*0x018c*/ 0x00, + /*0x018d*/ 0x00, + /*0x018e*/ 0x00, + /*0x018f*/ 0x00, + /*0x0190*/ 0x0d, + /*0x0191*/ 0x00, + /*0x0192*/ 0x00, + /*0x0193*/ 0x00, + /*0x0194*/ 0x00, + /*0x0195*/ 0x00, + /*0x0196*/ 0x06, + /*0x0197*/ 0x00, + /*0x0198*/ 0x00, + /*0x0199*/ 0x00, + /*0x019a*/ 0x11, + /*0x019b*/ 0x00, + /*0x019c*/ 0x00, + /*0x019d*/ 0x00, + /*0x019e*/ 0x00, + /*0x019f*/ 0x00, + /*0x01a0*/ 0x00, + /*0x01a1*/ 0x00, + /*0x01a2*/ 0x00, + /*0x01a3*/ 0x00, + /*0x01a4*/ 0x00, + /*0x01a5*/ 0x00, + /*0x01a6*/ 0x00, + /*0x01a7*/ 0x0b, + /*0x01a8*/ 0x00, + /*0x01a9*/ 0x00, + /*0x01aa*/ 0x00, + /*0x01ab*/ 0x06, + /*0x01ac*/ 0x00, + /*0x01ad*/ 0x00, + /*0x01ae*/ 0x00, + /*0x01af*/ 0x00, + /*0x01b0*/ 0x00, + /*0x01b1*/ 0x00, + /*0x01b2*/ 0x00, + /*0x01b3*/ 0x00, + /*0x01b4*/ 0x00, + /*0x01b5*/ 0x00, + /*0x01b6*/ 0x00, + /*0x01b7*/ 0x00, +}; + u32 var00022014 = 0x0000ff00; u32 var00022018 = 0x00000000; u32 var0002201c = 0x00000000; @@ -34618,6 +34953,7 @@ u32 var00022050 = 0xffffffff; u32 var00022054 = 0x00000000; u32 var00022058 = 0x00000000; u32 var0002205c = 0x00000000; + // 22060 u16 var00022060[] = { 0x0000,