diff --git a/asm/code_08001A7C.s b/asm/code_08001A7C.s new file mode 100644 index 00000000..2b2ce6f5 --- /dev/null +++ b/asm/code_08001A7C.s @@ -0,0 +1,1254 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + +gUnk_08001A7C:: @ 08001A7C + .4byte gUnk_08001C5C + .4byte gUnk_08001C62 + .4byte gUnk_08001C68 + .4byte gUnk_08001C6E + .4byte gUnk_08001C74 + .4byte gUnk_08001C6E + .4byte gUnk_08001C7A + .4byte gUnk_08001C7A + .4byte gUnk_08001C7A + .4byte gUnk_08001C80 + .4byte gUnk_08001C86 + .4byte gUnk_08001C8C + .4byte gUnk_08001C92 + .4byte gUnk_08001C92 + .4byte gUnk_08001C92 + .4byte gUnk_08001C92 + .4byte gUnk_08001C92 + .4byte gUnk_08001C92 + .4byte gUnk_08001C98 + .4byte gUnk_08001C9E + .4byte gUnk_08001C86 + .4byte gUnk_08001C9E + .4byte gUnk_08001C86 + .4byte gUnk_08001CA4 + .4byte gUnk_08001C9E + .4byte gUnk_08001C9E + .4byte gUnk_08001CAA + .4byte gUnk_08001CB0 + .4byte gUnk_08001CB6 + .4byte gUnk_08001C92 + .4byte gUnk_08001C92 + .4byte gUnk_08001C92 + .4byte gUnk_08001CBC + .4byte gUnk_08001CC2 + .4byte gUnk_08001CC2 + .4byte gUnk_08001CC2 + .4byte gUnk_08001CC2 + .4byte gUnk_08001C9E + .4byte gUnk_08001C86 + .4byte gUnk_08001C86 + .4byte gUnk_08001C9E + .4byte gUnk_08001C86 + .4byte gUnk_08001C86 + .4byte gUnk_08001C86 + .4byte gUnk_08001DAC + .4byte gUnk_08001C6E + .4byte gUnk_08001C6E + .4byte gUnk_08001CA4 + .4byte gUnk_08001C9E + .4byte gUnk_08001C86 + .4byte gUnk_08001C86 + .4byte gUnk_08001C92 + .4byte gUnk_08001CA4 + .4byte gUnk_08001CC8 + .4byte gUnk_08001C6E + .4byte gUnk_08001CCE + .4byte gUnk_08001CD4 + .4byte gUnk_08001CDA + .4byte gUnk_08001CE0 + .4byte gUnk_08001CE6 + .4byte gUnk_08001CEC + .4byte gUnk_08001CF2 + .4byte gUnk_08001CF8 + .4byte gUnk_08001CFE + .4byte gUnk_08001D04 + .4byte gUnk_08001D0A + .4byte gUnk_08001D16 + .4byte gUnk_08001D1C + .4byte gUnk_08001D22 + .4byte gUnk_08001D28 + .4byte gUnk_08001D2E + .4byte gUnk_08001D34 + .4byte gUnk_08001D3A + .4byte gUnk_08001D40 + .4byte gUnk_08001D40 + .4byte gUnk_08001D40 + .4byte gUnk_08001D40 + .4byte gUnk_08001D40 + .4byte gUnk_08001D46 + .4byte gUnk_08001D4C + .4byte gUnk_08001D4C + .4byte gUnk_08001D4C + .4byte gUnk_08001D4C + .4byte gUnk_08001D52 + .4byte gUnk_08001D58 + .4byte gUnk_08001D5E + .4byte gUnk_08001D64 + .4byte gUnk_08001D40 + .4byte gUnk_08001D40 + .4byte gUnk_08001D40 + .4byte gUnk_08001D6A + .4byte gUnk_08001DB8 + .4byte gUnk_08001D40 + .4byte gUnk_08001DBE + .4byte gUnk_08001D70 + .4byte gUnk_08001D40 + .4byte gUnk_08001D40 + .4byte gUnk_08001D40 + .4byte gUnk_08001D40 + .4byte gUnk_08001D40 + .4byte gUnk_08001D76 + .4byte gUnk_08001DC4 + .4byte gUnk_08001D7C + .4byte gUnk_08001D7C + .4byte gUnk_08001D7C + .4byte gUnk_08001D7C + .4byte gUnk_08001D7C + .4byte gUnk_08001D82 + .4byte gUnk_08001D82 + .4byte gUnk_08001D88 + .4byte gUnk_08001D88 + .4byte gUnk_08001D88 + .4byte gUnk_08001D8E + .4byte gUnk_08001D8E + .4byte gUnk_08001D8E + .4byte gUnk_08001D94 + .4byte gUnk_08001D94 + .4byte gUnk_08001D9A + .4byte gUnk_08001DA0 + .4byte gUnk_08001DA6 + +gUnk_08001C5C:: @ 08001C5C + .incbin "code_080011C4/gUnk_08001C5C.bin" + +gUnk_08001C62:: @ 08001C62 + .incbin "code_080011C4/gUnk_08001C62.bin" + +gUnk_08001C68:: @ 08001C68 + .incbin "code_080011C4/gUnk_08001C68.bin" + +gUnk_08001C6E:: @ 08001C6E + .incbin "code_080011C4/gUnk_08001C6E.bin" + +gUnk_08001C74:: @ 08001C74 + .incbin "code_080011C4/gUnk_08001C74.bin" + +gUnk_08001C7A:: @ 08001C7A + .incbin "code_080011C4/gUnk_08001C7A.bin" + +gUnk_08001C80:: @ 08001C80 + .incbin "code_080011C4/gUnk_08001C80.bin" + +gUnk_08001C86:: @ 08001C86 + .incbin "code_080011C4/gUnk_08001C86.bin" + +gUnk_08001C8C:: @ 08001C8C + .incbin "code_080011C4/gUnk_08001C8C.bin" + +gUnk_08001C92:: @ 08001C92 + .incbin "code_080011C4/gUnk_08001C92.bin" + +gUnk_08001C98:: @ 08001C98 + .incbin "code_080011C4/gUnk_08001C98.bin" + +gUnk_08001C9E:: @ 08001C9E + .incbin "code_080011C4/gUnk_08001C9E.bin" + +gUnk_08001CA4:: @ 08001CA4 + .incbin "code_080011C4/gUnk_08001CA4.bin" + +gUnk_08001CAA:: @ 08001CAA + .incbin "code_080011C4/gUnk_08001CAA.bin" + +gUnk_08001CB0:: @ 08001CB0 + .incbin "code_080011C4/gUnk_08001CB0.bin" + +gUnk_08001CB6:: @ 08001CB6 + .incbin "code_080011C4/gUnk_08001CB6.bin" + +gUnk_08001CBC:: @ 08001CBC + .incbin "code_080011C4/gUnk_08001CBC.bin" + +gUnk_08001CC2:: @ 08001CC2 + .incbin "code_080011C4/gUnk_08001CC2.bin" + +gUnk_08001CC8:: @ 08001CC8 + .incbin "code_080011C4/gUnk_08001CC8.bin" + +gUnk_08001CCE:: @ 08001CCE + .incbin "code_080011C4/gUnk_08001CCE.bin" + +gUnk_08001CD4:: @ 08001CD4 + .incbin "code_080011C4/gUnk_08001CD4.bin" + +gUnk_08001CDA:: @ 08001CDA + .incbin "code_080011C4/gUnk_08001CDA.bin" + +gUnk_08001CE0:: @ 08001CE0 + .incbin "code_080011C4/gUnk_08001CE0.bin" + +gUnk_08001CE6:: @ 08001CE6 + .incbin "code_080011C4/gUnk_08001CE6.bin" + +gUnk_08001CEC:: @ 08001CEC + .incbin "code_080011C4/gUnk_08001CEC.bin" + +gUnk_08001CF2:: @ 08001CF2 + .incbin "code_080011C4/gUnk_08001CF2.bin" + +gUnk_08001CF8:: @ 08001CF8 + .incbin "code_080011C4/gUnk_08001CF8.bin" + +gUnk_08001CFE:: @ 08001CFE + .incbin "code_080011C4/gUnk_08001CFE.bin" + +gUnk_08001D04:: @ 08001D04 + .incbin "code_080011C4/gUnk_08001D04.bin" + +gUnk_08001D0A:: @ 08001D0A + .incbin "code_080011C4/gUnk_08001D0A.bin" + +gUnk_08001D16:: @ 08001D16 + .incbin "code_080011C4/gUnk_08001D16.bin" + +gUnk_08001D1C:: @ 08001D1C + .incbin "code_080011C4/gUnk_08001D1C.bin" + +gUnk_08001D22:: @ 08001D22 + .incbin "code_080011C4/gUnk_08001D22.bin" + +gUnk_08001D28:: @ 08001D28 + .incbin "code_080011C4/gUnk_08001D28.bin" + +gUnk_08001D2E:: @ 08001D2E + .incbin "code_080011C4/gUnk_08001D2E.bin" + +gUnk_08001D34:: @ 08001D34 + .incbin "code_080011C4/gUnk_08001D34.bin" + +gUnk_08001D3A:: @ 08001D3A + .incbin "code_080011C4/gUnk_08001D3A.bin" + +gUnk_08001D40:: @ 08001D40 + .incbin "code_080011C4/gUnk_08001D40.bin" + +gUnk_08001D46:: @ 08001D46 + .incbin "code_080011C4/gUnk_08001D46.bin" + +gUnk_08001D4C:: @ 08001D4C + .incbin "code_080011C4/gUnk_08001D4C.bin" + +gUnk_08001D52:: @ 08001D52 + .incbin "code_080011C4/gUnk_08001D52.bin" + +gUnk_08001D58:: @ 08001D58 + .incbin "code_080011C4/gUnk_08001D58.bin" + +gUnk_08001D5E:: @ 08001D5E + .incbin "code_080011C4/gUnk_08001D5E.bin" + +gUnk_08001D64:: @ 08001D64 + .incbin "code_080011C4/gUnk_08001D64.bin" + +gUnk_08001D6A:: @ 08001D6A + .incbin "code_080011C4/gUnk_08001D6A.bin" + +gUnk_08001D70:: @ 08001D70 + .incbin "code_080011C4/gUnk_08001D70.bin" + +gUnk_08001D76:: @ 08001D76 + .incbin "code_080011C4/gUnk_08001D76.bin" + +gUnk_08001D7C:: @ 08001D7C + .incbin "code_080011C4/gUnk_08001D7C.bin" + +gUnk_08001D82:: @ 08001D82 + .incbin "code_080011C4/gUnk_08001D82.bin" + +gUnk_08001D88:: @ 08001D88 + .incbin "code_080011C4/gUnk_08001D88.bin" + +gUnk_08001D8E:: @ 08001D8E + .incbin "code_080011C4/gUnk_08001D8E.bin" + +gUnk_08001D94:: @ 08001D94 + .incbin "code_080011C4/gUnk_08001D94.bin" + +gUnk_08001D9A:: @ 08001D9A + .incbin "code_080011C4/gUnk_08001D9A.bin" + +gUnk_08001DA0:: @ 08001DA0 + .incbin "code_080011C4/gUnk_08001DA0.bin" + +gUnk_08001DA6:: @ 08001DA6 + .incbin "code_080011C4/gUnk_08001DA6.bin" + +gUnk_08001DAC:: @ 08001DAC + .incbin "code_080011C4/gUnk_08001DAC.bin" + +gUnk_08001DB8:: @ 08001DB8 + .incbin "code_080011C4/gUnk_08001DB8.bin" + +gUnk_08001DBE:: @ 08001DBE + .incbin "code_080011C4/gUnk_08001DBE.bin" + +gUnk_08001DC4:: @ 08001DC4 + .incbin "code_080011C4/gUnk_08001DC4.bin" + +gUnk_08001DCC:: @ 08001DCC + .4byte gUnk_08001FAC + .4byte gUnk_08001FB4 + .4byte gUnk_08001FBC + .4byte gUnk_08001FC3 + .4byte gUnk_08001FCA + .4byte gUnk_08001FD1 + .4byte gUnk_08001FD8 + .4byte gUnk_08001FDF + .4byte gUnk_08001FE6 + .4byte gUnk_08001FED + .4byte gUnk_08001FF8 + .4byte gUnk_08001FFF + .4byte gUnk_08002006 + .4byte gUnk_0800200D + .4byte gUnk_08002014 + .4byte gUnk_0800201B + .4byte gUnk_08002022 + .4byte gUnk_08002029 + .4byte gUnk_08002030 + .4byte gUnk_08002037 + .4byte gUnk_0800203E + .4byte gUnk_08002045 + .4byte gUnk_0800204C + .4byte gUnk_08002053 + .4byte gUnk_0800205A + .4byte gUnk_08002061 + .4byte gUnk_08002068 + .4byte gUnk_08002071 + .4byte gUnk_0800207A + .4byte gUnk_08002081 + .4byte gUnk_0800208A + .4byte gUnk_08002091 + .4byte gUnk_08002098 + .4byte gUnk_0800209F + .4byte gUnk_080020A6 + .4byte gUnk_080020AD + .4byte gUnk_080020B4 + .4byte gUnk_080020BB + .4byte gUnk_080020C2 + .4byte gUnk_080020C9 + .4byte gUnk_080020D0 + .4byte gUnk_080020D7 + .4byte gUnk_080020DE + .4byte gUnk_080020E5 + .4byte gUnk_080020EC + .4byte gUnk_080020F4 + .4byte gUnk_080020FB + .4byte gUnk_08002102 + .4byte gUnk_08002109 + .4byte gUnk_08002110 + .4byte gUnk_08002117 + .4byte gUnk_0800211E + .4byte gUnk_08002125 + .4byte gUnk_0800212D + .4byte gUnk_08002135 + .4byte gUnk_0800213D + .4byte gUnk_08002144 + .4byte gUnk_0800214B + .4byte gUnk_08002152 + .4byte gUnk_0800215A + .4byte gUnk_08002162 + .4byte gUnk_08002169 + .4byte gUnk_08002170 + .4byte gUnk_08002178 + .4byte gUnk_08002184 + .4byte gUnk_0800218B + .4byte gUnk_08002193 + .4byte gUnk_0800219B + .4byte gUnk_080021A3 + .4byte gUnk_080021AB + .4byte gUnk_080021B3 + .4byte gUnk_080021BC + .4byte gUnk_080021C3 + .4byte gUnk_080021CA + .4byte gUnk_080021D1 + .4byte gUnk_080021D8 + .4byte gUnk_080021E1 + .4byte gUnk_080021E8 + .4byte gUnk_080021F1 + .4byte gUnk_080021F8 + .4byte gUnk_080021FF + .4byte gUnk_08002206 + .4byte gUnk_0800220D + .4byte gUnk_08002214 + .4byte gUnk_0800221B + .4byte gUnk_08002222 + .4byte gUnk_08002229 + .4byte gUnk_08002230 + .4byte gUnk_08002239 + .4byte gUnk_08002240 + .4byte gUnk_08002247 + .4byte gUnk_0800224E + .4byte gUnk_08002255 + .4byte gUnk_0800225C + .4byte gUnk_08002263 + .4byte gUnk_0800226A + .4byte gUnk_08002271 + .4byte gUnk_08002278 + .4byte gUnk_0800227F + .4byte gUnk_08002286 + .4byte gUnk_0800228D + .4byte gUnk_08002294 + .4byte gUnk_0800229B + .4byte gUnk_080022A7 + .4byte gUnk_080022B3 + .4byte gUnk_080022BF + .4byte gUnk_080022CB + .4byte gUnk_080022D7 + .4byte gUnk_080022DE + .4byte gUnk_080022E5 + .4byte gUnk_080022EC + .4byte gUnk_080022F3 + .4byte gUnk_080022FB + .4byte gUnk_08002302 + .4byte gUnk_08002309 + .4byte gUnk_08002310 + .4byte gUnk_08002317 + .4byte gUnk_0800231E + .4byte gUnk_08002325 + .4byte gUnk_0800232C + +gUnk_08001FAC:: @ 08001FAC + .incbin "code_080011C4/gUnk_08001FAC.bin" + +gUnk_08001FB4:: @ 08001FB4 + .incbin "code_080011C4/gUnk_08001FB4.bin" + +gUnk_08001FBC:: @ 08001FBC + .incbin "code_080011C4/gUnk_08001FBC.bin" + +gUnk_08001FC3:: @ 08001FC3 + .incbin "code_080011C4/gUnk_08001FC3.bin" + +gUnk_08001FCA:: @ 08001FCA + .incbin "code_080011C4/gUnk_08001FCA.bin" + +gUnk_08001FD1:: @ 08001FD1 + .incbin "code_080011C4/gUnk_08001FD1.bin" + +gUnk_08001FD8:: @ 08001FD8 + .incbin "code_080011C4/gUnk_08001FD8.bin" + +gUnk_08001FDF:: @ 08001FDF + .incbin "code_080011C4/gUnk_08001FDF.bin" + +gUnk_08001FE6:: @ 08001FE6 + .incbin "code_080011C4/gUnk_08001FE6.bin" + +gUnk_08001FED:: @ 08001FED + .incbin "code_080011C4/gUnk_08001FED.bin" + +gUnk_08001FF8:: @ 08001FF8 + .incbin "code_080011C4/gUnk_08001FF8.bin" + +gUnk_08001FFF:: @ 08001FFF + .incbin "code_080011C4/gUnk_08001FFF.bin" + +gUnk_08002006:: @ 08002006 + .incbin "code_080011C4/gUnk_08002006.bin" + +gUnk_0800200D:: @ 0800200D + .incbin "code_080011C4/gUnk_0800200D.bin" + +gUnk_08002014:: @ 08002014 + .incbin "code_080011C4/gUnk_08002014.bin" + +gUnk_0800201B:: @ 0800201B + .incbin "code_080011C4/gUnk_0800201B.bin" + +gUnk_08002022:: @ 08002022 + .incbin "code_080011C4/gUnk_08002022.bin" + +gUnk_08002029:: @ 08002029 + .incbin "code_080011C4/gUnk_08002029.bin" + +gUnk_08002030:: @ 08002030 + .incbin "code_080011C4/gUnk_08002030.bin" + +gUnk_08002037:: @ 08002037 + .incbin "code_080011C4/gUnk_08002037.bin" + +gUnk_0800203E:: @ 0800203E + .incbin "code_080011C4/gUnk_0800203E.bin" + +gUnk_08002045:: @ 08002045 + .incbin "code_080011C4/gUnk_08002045.bin" + +gUnk_0800204C:: @ 0800204C + .incbin "code_080011C4/gUnk_0800204C.bin" + +gUnk_08002053:: @ 08002053 + .incbin "code_080011C4/gUnk_08002053.bin" + +gUnk_0800205A:: @ 0800205A + .incbin "code_080011C4/gUnk_0800205A.bin" + +gUnk_08002061:: @ 08002061 + .incbin "code_080011C4/gUnk_08002061.bin" + +gUnk_08002068:: @ 08002068 + .incbin "code_080011C4/gUnk_08002068.bin" + +gUnk_08002071:: @ 08002071 + .incbin "code_080011C4/gUnk_08002071.bin" + +gUnk_0800207A:: @ 0800207A + .incbin "code_080011C4/gUnk_0800207A.bin" + +gUnk_08002081:: @ 08002081 + .incbin "code_080011C4/gUnk_08002081.bin" + +gUnk_0800208A:: @ 0800208A + .incbin "code_080011C4/gUnk_0800208A.bin" + +gUnk_08002091:: @ 08002091 + .incbin "code_080011C4/gUnk_08002091.bin" + +gUnk_08002098:: @ 08002098 + .incbin "code_080011C4/gUnk_08002098.bin" + +gUnk_0800209F:: @ 0800209F + .incbin "code_080011C4/gUnk_0800209F.bin" + +gUnk_080020A6:: @ 080020A6 + .incbin "code_080011C4/gUnk_080020A6.bin" + +gUnk_080020AD:: @ 080020AD + .incbin "code_080011C4/gUnk_080020AD.bin" + +gUnk_080020B4:: @ 080020B4 + .incbin "code_080011C4/gUnk_080020B4.bin" + +gUnk_080020BB:: @ 080020BB + .incbin "code_080011C4/gUnk_080020BB.bin" + +gUnk_080020C2:: @ 080020C2 + .incbin "code_080011C4/gUnk_080020C2.bin" + +gUnk_080020C9:: @ 080020C9 + .incbin "code_080011C4/gUnk_080020C9.bin" + +gUnk_080020D0:: @ 080020D0 + .incbin "code_080011C4/gUnk_080020D0.bin" + +gUnk_080020D7:: @ 080020D7 + .incbin "code_080011C4/gUnk_080020D7.bin" + +gUnk_080020DE:: @ 080020DE + .incbin "code_080011C4/gUnk_080020DE.bin" + +gUnk_080020E5:: @ 080020E5 + .incbin "code_080011C4/gUnk_080020E5.bin" + +gUnk_080020EC:: @ 080020EC + .incbin "code_080011C4/gUnk_080020EC.bin" + +gUnk_080020F4:: @ 080020F4 + .incbin "code_080011C4/gUnk_080020F4.bin" + +gUnk_080020FB:: @ 080020FB + .incbin "code_080011C4/gUnk_080020FB.bin" + +gUnk_08002102:: @ 08002102 + .incbin "code_080011C4/gUnk_08002102.bin" + +gUnk_08002109:: @ 08002109 + .incbin "code_080011C4/gUnk_08002109.bin" + +gUnk_08002110:: @ 08002110 + .incbin "code_080011C4/gUnk_08002110.bin" + +gUnk_08002117:: @ 08002117 + .incbin "code_080011C4/gUnk_08002117.bin" + +gUnk_0800211E:: @ 0800211E + .incbin "code_080011C4/gUnk_0800211E.bin" + +gUnk_08002125:: @ 08002125 + .incbin "code_080011C4/gUnk_08002125.bin" + +gUnk_0800212D:: @ 0800212D + .incbin "code_080011C4/gUnk_0800212D.bin" + +gUnk_08002135:: @ 08002135 + .incbin "code_080011C4/gUnk_08002135.bin" + +gUnk_0800213D:: @ 0800213D + .incbin "code_080011C4/gUnk_0800213D.bin" + +gUnk_08002144:: @ 08002144 + .incbin "code_080011C4/gUnk_08002144.bin" + +gUnk_0800214B:: @ 0800214B + .incbin "code_080011C4/gUnk_0800214B.bin" + +gUnk_08002152:: @ 08002152 + .incbin "code_080011C4/gUnk_08002152.bin" + +gUnk_0800215A:: @ 0800215A + .incbin "code_080011C4/gUnk_0800215A.bin" + +gUnk_08002162:: @ 08002162 + .incbin "code_080011C4/gUnk_08002162.bin" + +gUnk_08002169:: @ 08002169 + .incbin "code_080011C4/gUnk_08002169.bin" + +gUnk_08002170:: @ 08002170 + .incbin "code_080011C4/gUnk_08002170.bin" + +gUnk_08002178:: @ 08002178 + .incbin "code_080011C4/gUnk_08002178.bin" + +gUnk_08002184:: @ 08002184 + .incbin "code_080011C4/gUnk_08002184.bin" + +gUnk_0800218B:: @ 0800218B + .incbin "code_080011C4/gUnk_0800218B.bin" + +gUnk_08002193:: @ 08002193 + .incbin "code_080011C4/gUnk_08002193.bin" + +gUnk_0800219B:: @ 0800219B + .incbin "code_080011C4/gUnk_0800219B.bin" + +gUnk_080021A3:: @ 080021A3 + .incbin "code_080011C4/gUnk_080021A3.bin" + +gUnk_080021AB:: @ 080021AB + .incbin "code_080011C4/gUnk_080021AB.bin" + +gUnk_080021B3:: @ 080021B3 + .incbin "code_080011C4/gUnk_080021B3.bin" + +gUnk_080021BC:: @ 080021BC + .incbin "code_080011C4/gUnk_080021BC.bin" + +gUnk_080021C3:: @ 080021C3 + .incbin "code_080011C4/gUnk_080021C3.bin" + +gUnk_080021CA:: @ 080021CA + .incbin "code_080011C4/gUnk_080021CA.bin" + +gUnk_080021D1:: @ 080021D1 + .incbin "code_080011C4/gUnk_080021D1.bin" + +gUnk_080021D8:: @ 080021D8 + .incbin "code_080011C4/gUnk_080021D8.bin" + +gUnk_080021E1:: @ 080021E1 + .incbin "code_080011C4/gUnk_080021E1.bin" + +gUnk_080021E8:: @ 080021E8 + .incbin "code_080011C4/gUnk_080021E8.bin" + +gUnk_080021F1:: @ 080021F1 + .incbin "code_080011C4/gUnk_080021F1.bin" + +gUnk_080021F8:: @ 080021F8 + .incbin "code_080011C4/gUnk_080021F8.bin" + +gUnk_080021FF:: @ 080021FF + .incbin "code_080011C4/gUnk_080021FF.bin" + +gUnk_08002206:: @ 08002206 + .incbin "code_080011C4/gUnk_08002206.bin" + +gUnk_0800220D:: @ 0800220D + .incbin "code_080011C4/gUnk_0800220D.bin" + +gUnk_08002214:: @ 08002214 + .incbin "code_080011C4/gUnk_08002214.bin" + +gUnk_0800221B:: @ 0800221B + .incbin "code_080011C4/gUnk_0800221B.bin" + +gUnk_08002222:: @ 08002222 + .incbin "code_080011C4/gUnk_08002222.bin" + +gUnk_08002229:: @ 08002229 + .incbin "code_080011C4/gUnk_08002229.bin" + +gUnk_08002230:: @ 08002230 + .incbin "code_080011C4/gUnk_08002230.bin" + +gUnk_08002239:: @ 08002239 + .incbin "code_080011C4/gUnk_08002239.bin" + +gUnk_08002240:: @ 08002240 + .incbin "code_080011C4/gUnk_08002240.bin" + +gUnk_08002247:: @ 08002247 + .incbin "code_080011C4/gUnk_08002247.bin" + +gUnk_0800224E:: @ 0800224E + .incbin "code_080011C4/gUnk_0800224E.bin" + +gUnk_08002255:: @ 08002255 + .incbin "code_080011C4/gUnk_08002255.bin" + +gUnk_0800225C:: @ 0800225C + .incbin "code_080011C4/gUnk_0800225C.bin" + +gUnk_08002263:: @ 08002263 + .incbin "code_080011C4/gUnk_08002263.bin" + +gUnk_0800226A:: @ 0800226A + .incbin "code_080011C4/gUnk_0800226A.bin" + +gUnk_08002271:: @ 08002271 + .incbin "code_080011C4/gUnk_08002271.bin" + +gUnk_08002278:: @ 08002278 + .incbin "code_080011C4/gUnk_08002278.bin" + +gUnk_0800227F:: @ 0800227F + .incbin "code_080011C4/gUnk_0800227F.bin" + +gUnk_08002286:: @ 08002286 + .incbin "code_080011C4/gUnk_08002286.bin" + +gUnk_0800228D:: @ 0800228D + .incbin "code_080011C4/gUnk_0800228D.bin" + +gUnk_08002294:: @ 08002294 + .incbin "code_080011C4/gUnk_08002294.bin" + +gUnk_0800229B:: @ 0800229B + .incbin "code_080011C4/gUnk_0800229B.bin" + +gUnk_080022A7:: @ 080022A7 + .incbin "code_080011C4/gUnk_080022A7.bin" + +gUnk_080022B3:: @ 080022B3 + .incbin "code_080011C4/gUnk_080022B3.bin" + +gUnk_080022BF:: @ 080022BF + .incbin "code_080011C4/gUnk_080022BF.bin" + +gUnk_080022CB:: @ 080022CB + .incbin "code_080011C4/gUnk_080022CB.bin" + +gUnk_080022D7:: @ 080022D7 + .incbin "code_080011C4/gUnk_080022D7.bin" + +gUnk_080022DE:: @ 080022DE + .incbin "code_080011C4/gUnk_080022DE.bin" + +gUnk_080022E5:: @ 080022E5 + .incbin "code_080011C4/gUnk_080022E5.bin" + +gUnk_080022EC:: @ 080022EC + .incbin "code_080011C4/gUnk_080022EC.bin" + +gUnk_080022F3:: @ 080022F3 + .incbin "code_080011C4/gUnk_080022F3.bin" + +gUnk_080022FB:: @ 080022FB + .incbin "code_080011C4/gUnk_080022FB.bin" + +gUnk_08002302:: @ 08002302 + .incbin "code_080011C4/gUnk_08002302.bin" + +gUnk_08002309:: @ 08002309 + .incbin "code_080011C4/gUnk_08002309.bin" + +gUnk_08002310:: @ 08002310 + .incbin "code_080011C4/gUnk_08002310.bin" + +gUnk_08002317:: @ 08002317 + .incbin "code_080011C4/gUnk_08002317.bin" + +gUnk_0800231E:: @ 0800231E + .incbin "code_080011C4/gUnk_0800231E.bin" + +gUnk_08002325:: @ 08002325 + .incbin "code_080011C4/gUnk_08002325.bin" + +gUnk_0800232C:: @ 0800232C + .incbin "code_080011C4/gUnk_0800232C.bin" + +gUnk_0800232E:: @ 0800232E + .incbin "code_080011C4/gUnk_0800232E.bin" + +gUnk_08002342:: @ 08002342 + .incbin "code_080011C4/gUnk_08002342.bin" + + non_word_aligned_thumb_func_start sub_08002632 +sub_08002632: @ 0x08002632 + push {r4, r5, r6, r7, lr} + ldr r4, _0800269C @ =gUnk_0800232E + ldrb r3, [r0, #8] + cmp r3, #3 + beq _08002642 + cmp r3, #7 + bne _08002684 + ldr r4, _080026A0 @ =gUnk_08002342 +_08002642: + ldrb r3, [r0, #9] + lsls r1, r3, #0x10 + ldrb r3, [r0, #0xa] + lsls r3, r3, #8 + orrs r1, r3 + ldrb r3, [r0, #0xb] + orrs r1, r3 + add r6, pc, #0x38 +_08002652: + adds r4, #6 + ldrb r3, [r4] + lsls r2, r3, #0x10 + beq _08002684 + movs r5, #0 + ldrb r3, [r4, #1] + cmp r3, #0xff + bne _08002664 + movs r5, #8 +_08002664: + lsls r3, r3, #8 + orrs r2, r3 + ldrb r3, [r4, #2] + cmp r3, #0xff + bne _08002670 + adds r5, #4 +_08002670: + orrs r2, r3 + ldr r5, [r6, r5] + adds r3, r1, #0 + ands r3, r5 + ands r2, r5 + cmp r3, r2 + bne _08002652 + ldrb r0, [r4, #3] + ldrh r1, [r4, #4] + pop {r4, r5, r6, r7, pc} +_08002684: + movs r0, #0 + movs r1, #0 + pop {r4, r5, r6, r7, pc} + .align 2, 0 +_0800268C: + .byte 0xFF, 0xFF, 0xFF, 0x00 + .byte 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00 +_0800269C: .4byte gUnk_0800232E +_080026A0: .4byte gUnk_08002342 + +gUnk_080026A4:: +@ normal entities + .4byte gUnk_020000B0 @ enemy target? (player) + .4byte gEntityLists - 8 @ first linked list + .4byte gEntityLists + 64 @ last linked list + .4byte gUnk_03005FBC @ entity table +@ managers + .4byte gUnk_020000B0 + .4byte gEntityLists + 56 + .4byte gCollidableCount + .4byte gUnk_03005FBC + + thumb_func_start sub_080026C4 +sub_080026C4: @ 0x080026C4 + push {r4, r5, r6, lr} + lsrs r4, r3, #3 + lsls r4, r4, #6 + adds r1, r1, r4 + movs r6, #0xf0 + lsls r4, r3, #0x1d + lsrs r4, r4, #0x1e + blo _080026D8 + movs r6, #0xf + adds r2, #0x10 +_080026D8: + adds r1, r1, r4 + movs r3, #0x10 +_080026DC: + ldrb r4, [r0] + ldrb r4, [r2, r4] + ldrb r5, [r1] + ands r5, r6 + orrs r5, r4 + strb r5, [r1] + adds r1, #4 + adds r0, #8 + subs r3, #1 + bne _080026DC + pop {r4, r5, r6, pc} + + non_word_aligned_thumb_func_start sub_080026F2 +sub_080026F2: @ 0x080026F2 + push {r4, r5, r6, lr} + lsrs r4, r3, #3 + lsls r4, r4, #6 + adds r1, r1, r4 + movs r6, #0xf0 + lsls r4, r3, #0x1d + lsrs r4, r4, #0x1e + blo _08002706 + movs r6, #0xf + adds r2, #0x10 +_08002706: + adds r1, r1, r4 + movs r3, #0x10 +_0800270A: + ldrb r4, [r0] + ldrb r4, [r2, r4] + cmp r4, #0 + beq _0800271A + ldrb r5, [r1] + ands r5, r6 + orrs r5, r4 + strb r5, [r1] +_0800271A: + adds r1, #4 + adds r0, #8 + subs r3, #1 + bne _0800270A + pop {r4, r5, r6, pc} + + thumb_func_start sub_08002724 +sub_08002724: @ 0x08002724 + push {r4, r5, lr} + movs r2, #0x10 + movs r3, #0xf +_0800272A: + ldrb r4, [r0] + lsrs r5, r4, #4 + ands r4, r3 + strb r4, [r1] + strb r5, [r1, #1] + ldrb r4, [r0, #1] + lsrs r5, r4, #4 + ands r4, r3 + strb r4, [r1, #2] + strb r5, [r1, #3] + ldrb r4, [r0, #2] + lsrs r5, r4, #4 + ands r4, r3 + strb r4, [r1, #4] + strb r5, [r1, #5] + ldrb r4, [r0, #3] + lsrs r5, r4, #4 + ands r4, r3 + strb r4, [r1, #6] + strb r5, [r1, #7] + adds r0, #4 + adds r1, #8 + subs r2, #1 + bne _0800272A + pop {r4, r5, pc} + +gUnk_0800275C:: + .byte 0x06, 0x00, 0x06, 0x60 + .byte 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x00, 0x60, 0x60, 0x60 + .byte 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x06 + .byte 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x00, 0x06, 0x06, 0x06 + .byte 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06 + + thumb_func_start GetNextFunction +GetNextFunction: @ 0x0800279C + movs r1, #0x3a + ldrb r3, [r0, r1] + movs r2, #4 + ands r2, r3 + bne _080027AE + movs r1, #0x41 + ldrb r2, [r0, r1] + lsrs r2, r2, #7 + bne _080027CE +_080027AE: + movs r1, #0x42 + ldrb r2, [r0, r1] + cmp r2, #0 + bne _080027D2 + movs r1, #0x45 + ldrb r2, [r0, r1] + cmp r2, #0 + beq _080027D6 + lsrs r2, r3, #3 + bhs _080027E2 + movs r1, #0x43 + ldrb r2, [r0, r1] + cmp r2, #0 + bne _080027E6 +_080027CA: + movs r0, #0 + bx lr +_080027CE: + movs r0, #1 + bx lr +_080027D2: + movs r0, #2 + bx lr +_080027D6: + ldrb r2, [r0, #0xc] + ldrb r0, [r0, #0xd] + orrs r0, r2 + beq _080027CA + movs r0, #3 + bx lr +_080027E2: + movs r0, #5 + bx lr +_080027E6: + movs r0, #4 + bx lr + + non_word_aligned_thumb_func_start sub_080027EA +sub_080027EA: @ 0x080027EA + push {r4, r5, r6, r7, lr} + movs r3, #0x80 + tst r2, r3 + bne _08002860 + movs r4, #0x2a + ldrh r3, [r0, r4] + movs r4, #7 + tst r2, r4 + bne _08002812 + push {r0, r1, r2, r3} + adds r0, r2, #0 + adds r1, r3, #0 + bl sub_08002864 + adds r4, r0, #0 + pop {r0, r1, r2, r3} + cmp r2, r4 + beq _08002812 + adds r2, r4, #0 + ldr r1, _0800296C @ =0x00000100 +_08002812: + ldr r4, _08002970 @ =gUnk_0800275C + lsls r2, r2, #1 + ldrh r4, [r4, r2] + lsls r2, r2, #3 + ands r3, r4 + ldr r4, _08002974 @ =0x0000EE00 + tst r3, r4 + bne _0800283E + push {r0, r1, r2, r3} + ldr r4, _08002978 @ =gSineTable + ldrh r0, [r4, r2] + cmp r0, #0 + beq _08002834 + adds r6, #1 + bl FixedMul + lsls r0, r0, #8 +_08002834: + adds r4, r0, #0 + pop {r0, r1, r2, r3} + ldr r5, [r0, #0x2c] + adds r5, r5, r4 + str r5, [r0, #0x2c] +_0800283E: + movs r4, #0xee + tst r3, r4 + bne _08002860 + push {r0, r1, r2, r3} + ldr r4, _0800297C @ =gCosineTable + ldrh r0, [r4, r2] + cmp r0, #0 + beq _08002856 + adds r6, #2 + bl FixedMul + lsls r0, r0, #8 +_08002856: + adds r4, r0, #0 + pop {r0, r1, r2, r3} + ldr r5, [r0, #0x30] + subs r5, r5, r4 + str r5, [r0, #0x30] +_08002860: + adds r1, r6, #0 + pop {r4, r5, r6, r7, pc} + + thumb_func_start sub_08002864 +sub_08002864: @ 0x08002864 + adds r2, r0, #0 + lsrs r2, r2, #3 + cmp r2, #0 + beq _080028A8 + subs r2, #1 + beq _0800288E + subs r2, #1 + beq _080028C2 + ldr r3, _08002980 @ =0x00000E00 + ands r3, r1 + bne _0800287C + bx lr +_0800287C: + movs r2, #0 + ldr r3, _08002984 @ =0x0000020E + tst r3, r1 + beq _080028DC + movs r2, #0x10 + ldr r3, _08002988 @ =0x000004E0 + tst r3, r1 + beq _080028DC + bx lr +_0800288E: + ldr r3, _0800298C @ =0x0000E000 + ands r3, r1 + bne _08002896 + bx lr +_08002896: + movs r2, #0 + ldr r3, _08002990 @ =0x0000200E + tst r3, r1 + beq _080028DC + movs r2, #0x10 + ldr r3, _08002994 @ =0x000040E0 + tst r3, r1 + beq _080028DC + bx lr +_080028A8: + movs r3, #0xe + ands r3, r1 + bne _080028B0 + bx lr +_080028B0: + movs r2, #8 + ldr r3, _08002998 @ =0x0000E004 + tst r3, r1 + beq _080028DC + movs r2, #0x18 + ldr r3, _0800299C @ =0x00000E02 + tst r3, r1 + beq _080028DC + bx lr +_080028C2: + movs r3, #0xe0 + ands r3, r1 + bne _080028CA + bx lr +_080028CA: + movs r2, #8 + ldr r3, _080029A0 @ =0x0000E040 + tst r3, r1 + beq _080028DC + movs r2, #0x18 + ldr r3, _080029A4 @ =0x00000E20 + tst r3, r1 + beq _080028DC + bx lr +_080028DC: + adds r0, r2, #0 + bx lr + + thumb_func_start sub_080028E0 +sub_080028E0: @ 0x080028E0 + movs r1, #0x3d + movs r3, #1 + ldrsb r2, [r0, r1] + cmp r2, #0 + beq _080028F2 + bmi _080028EE + rsbs r3, r3, #0 +_080028EE: + adds r2, r2, r3 + strb r2, [r0, r1] +_080028F2: + bx lr + + thumb_func_start GetRandomByWeight +GetRandomByWeight: @ 0x080028F4 + push {r4, lr} + adds r4, r0, #0 + bl Random + lsls r0, r0, #0x18 + lsrs r0, r0, #0x18 + movs r1, #0 +_08002902: + ldrb r2, [r4, r1] + adds r1, #1 + subs r0, r0, r2 + bpl _08002902 + subs r0, r1, #1 + pop {r4, pc} + + non_word_aligned_thumb_func_start CheckRectOnScreen +CheckRectOnScreen: @ 0x0800290E + push {r4, r5, r6, lr} + ldr r4, _080029A8 @ =gRoomControls + ldrh r5, [r4, #0xa] + ldrh r6, [r4, #6] + subs r5, r5, r6 + subs r5, r5, r2 + subs r0, r0, r5 + lsls r2, r2, #1 + adds r2, #0xf0 + cmp r0, r2 + bhs _0800293A + ldrh r5, [r4, #0xc] + ldrh r6, [r4, #8] + subs r5, r5, r6 + subs r5, r5, r3 + subs r1, r1, r5 + lsls r3, r3, #1 + adds r3, #0xa0 + cmp r1, r3 + bhs _0800293A + movs r0, #1 + pop {r4, r5, r6, pc} +_0800293A: + movs r0, #0 + pop {r4, r5, r6, pc} + + non_word_aligned_thumb_func_start CheckPlayerInRegion +CheckPlayerInRegion: @ 0x0800293E + push {r4, r5, r6, r7, lr} + ldr r4, _080029AC @ =gRoomControls + ldr r7, _080029B0 @ =gPlayerEntity + ldrh r6, [r4, #6] + ldrh r5, [r7, #0x2e] + subs r5, r5, r6 + subs r5, r5, r2 + subs r0, r0, r5 + lsls r2, r2, #1 + cmp r0, r2 + bhs _08002968 + ldrh r6, [r4, #8] + ldrh r5, [r7, #0x32] + subs r5, r5, r6 + subs r5, r5, r3 + subs r1, r1, r5 + lsls r3, r3, #1 + cmp r1, r3 + bhs _08002968 + movs r0, #1 + pop {r4, r5, r6, r7, pc} +_08002968: + movs r0, #0 + pop {r4, r5, r6, r7, pc} + .align 2, 0 +_0800296C: .4byte 0x00000100 +_08002970: .4byte gUnk_0800275C +_08002974: .4byte 0x0000EE00 +_08002978: .4byte gSineTable +_0800297C: .4byte gCosineTable +_08002980: .4byte 0x00000E00 +_08002984: .4byte 0x0000020E +_08002988: .4byte 0x000004E0 +_0800298C: .4byte 0x0000E000 +_08002990: .4byte 0x0000200E +_08002994: .4byte 0x000040E0 +_08002998: .4byte 0x0000E004 +_0800299C: .4byte 0x00000E02 +_080029A0: .4byte 0x0000E040 +_080029A4: .4byte 0x00000E20 +_080029A8: .4byte gRoomControls +_080029AC: .4byte gRoomControls +_080029B0: .4byte gPlayerEntity diff --git a/asm/enemy.s b/asm/enemy.s index 899451cb..25f67759 100644 --- a/asm/enemy.s +++ b/asm/enemy.s @@ -248,1289 +248,3 @@ _0800136C: .4byte gUnk_080012C8 _08001370: .4byte sub_080AF18C _08001374: .4byte sub_080AF1BC _08001378: .4byte GetFacingDirection - -gUnk_0800137C:: @ 0800137C - .incbin "code_080011C4/gUnk_0800137C.bin" - -gUnk_0800143C:: @ 0800143C - .incbin "code_080011C4/gUnk_0800143C.bin" - -gUnk_080015BC:: @ 080015BC - .incbin "code_080011C4/gUnk_080015BC.bin" - -gUnk_0800161C:: @ 0800161C - .incbin "code_080011C4/gUnk_0800161C.bin" -.ifdef EU - @ TODO only small differences - .incbin "code_080011C4/gUnk_0800161C_1_EU.bin" -.else - .incbin "code_080011C4/gUnk_0800161C_2_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - .incbin "code_080011C4/gUnk_0800161C_3.bin" - -.ifdef EU - .incbin "code_080011C4/gUnk_0800161C_4_EU.bin" -.else - .incbin "code_080011C4/gUnk_0800161C_5_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - .incbin "code_080011C4/gUnk_0800161C_6.bin" - -gUnk_0800191C:: @ 0800191C -.ifdef EU - @ TODO mostly 0 bytes? - .incbin "code_080011C4/gUnk_0800191C_EU.bin" -.else - .incbin "code_080011C4/gUnk_0800191C_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - .incbin "code_080011C4/gUnk_0800191C_2.bin" - -gUnk_08001A1C:: @ 08001A1C - .incbin "code_080011C4/gUnk_08001A1C.bin" - -gUnk_08001A7C:: @ 08001A7C - .4byte gUnk_08001C5C - .4byte gUnk_08001C62 - .4byte gUnk_08001C68 - .4byte gUnk_08001C6E - .4byte gUnk_08001C74 - .4byte gUnk_08001C6E - .4byte gUnk_08001C7A - .4byte gUnk_08001C7A - .4byte gUnk_08001C7A - .4byte gUnk_08001C80 - .4byte gUnk_08001C86 - .4byte gUnk_08001C8C - .4byte gUnk_08001C92 - .4byte gUnk_08001C92 - .4byte gUnk_08001C92 - .4byte gUnk_08001C92 - .4byte gUnk_08001C92 - .4byte gUnk_08001C92 - .4byte gUnk_08001C98 - .4byte gUnk_08001C9E - .4byte gUnk_08001C86 - .4byte gUnk_08001C9E - .4byte gUnk_08001C86 - .4byte gUnk_08001CA4 - .4byte gUnk_08001C9E - .4byte gUnk_08001C9E - .4byte gUnk_08001CAA - .4byte gUnk_08001CB0 - .4byte gUnk_08001CB6 - .4byte gUnk_08001C92 - .4byte gUnk_08001C92 - .4byte gUnk_08001C92 - .4byte gUnk_08001CBC - .4byte gUnk_08001CC2 - .4byte gUnk_08001CC2 - .4byte gUnk_08001CC2 - .4byte gUnk_08001CC2 - .4byte gUnk_08001C9E - .4byte gUnk_08001C86 - .4byte gUnk_08001C86 - .4byte gUnk_08001C9E - .4byte gUnk_08001C86 - .4byte gUnk_08001C86 - .4byte gUnk_08001C86 - .4byte gUnk_08001DAC - .4byte gUnk_08001C6E - .4byte gUnk_08001C6E - .4byte gUnk_08001CA4 - .4byte gUnk_08001C9E - .4byte gUnk_08001C86 - .4byte gUnk_08001C86 - .4byte gUnk_08001C92 - .4byte gUnk_08001CA4 - .4byte gUnk_08001CC8 - .4byte gUnk_08001C6E - .4byte gUnk_08001CCE - .4byte gUnk_08001CD4 - .4byte gUnk_08001CDA - .4byte gUnk_08001CE0 - .4byte gUnk_08001CE6 - .4byte gUnk_08001CEC - .4byte gUnk_08001CF2 - .4byte gUnk_08001CF8 - .4byte gUnk_08001CFE - .4byte gUnk_08001D04 - .4byte gUnk_08001D0A - .4byte gUnk_08001D16 - .4byte gUnk_08001D1C - .4byte gUnk_08001D22 - .4byte gUnk_08001D28 - .4byte gUnk_08001D2E - .4byte gUnk_08001D34 - .4byte gUnk_08001D3A - .4byte gUnk_08001D40 - .4byte gUnk_08001D40 - .4byte gUnk_08001D40 - .4byte gUnk_08001D40 - .4byte gUnk_08001D40 - .4byte gUnk_08001D46 - .4byte gUnk_08001D4C - .4byte gUnk_08001D4C - .4byte gUnk_08001D4C - .4byte gUnk_08001D4C - .4byte gUnk_08001D52 - .4byte gUnk_08001D58 - .4byte gUnk_08001D5E - .4byte gUnk_08001D64 - .4byte gUnk_08001D40 - .4byte gUnk_08001D40 - .4byte gUnk_08001D40 - .4byte gUnk_08001D6A - .4byte gUnk_08001DB8 - .4byte gUnk_08001D40 - .4byte gUnk_08001DBE - .4byte gUnk_08001D70 - .4byte gUnk_08001D40 - .4byte gUnk_08001D40 - .4byte gUnk_08001D40 - .4byte gUnk_08001D40 - .4byte gUnk_08001D40 - .4byte gUnk_08001D76 - .4byte gUnk_08001DC4 - .4byte gUnk_08001D7C - .4byte gUnk_08001D7C - .4byte gUnk_08001D7C - .4byte gUnk_08001D7C - .4byte gUnk_08001D7C - .4byte gUnk_08001D82 - .4byte gUnk_08001D82 - .4byte gUnk_08001D88 - .4byte gUnk_08001D88 - .4byte gUnk_08001D88 - .4byte gUnk_08001D8E - .4byte gUnk_08001D8E - .4byte gUnk_08001D8E - .4byte gUnk_08001D94 - .4byte gUnk_08001D94 - .4byte gUnk_08001D9A - .4byte gUnk_08001DA0 - .4byte gUnk_08001DA6 - -gUnk_08001C5C:: @ 08001C5C - .incbin "code_080011C4/gUnk_08001C5C.bin" - -gUnk_08001C62:: @ 08001C62 - .incbin "code_080011C4/gUnk_08001C62.bin" - -gUnk_08001C68:: @ 08001C68 - .incbin "code_080011C4/gUnk_08001C68.bin" - -gUnk_08001C6E:: @ 08001C6E - .incbin "code_080011C4/gUnk_08001C6E.bin" - -gUnk_08001C74:: @ 08001C74 - .incbin "code_080011C4/gUnk_08001C74.bin" - -gUnk_08001C7A:: @ 08001C7A - .incbin "code_080011C4/gUnk_08001C7A.bin" - -gUnk_08001C80:: @ 08001C80 - .incbin "code_080011C4/gUnk_08001C80.bin" - -gUnk_08001C86:: @ 08001C86 - .incbin "code_080011C4/gUnk_08001C86.bin" - -gUnk_08001C8C:: @ 08001C8C - .incbin "code_080011C4/gUnk_08001C8C.bin" - -gUnk_08001C92:: @ 08001C92 - .incbin "code_080011C4/gUnk_08001C92.bin" - -gUnk_08001C98:: @ 08001C98 - .incbin "code_080011C4/gUnk_08001C98.bin" - -gUnk_08001C9E:: @ 08001C9E - .incbin "code_080011C4/gUnk_08001C9E.bin" - -gUnk_08001CA4:: @ 08001CA4 - .incbin "code_080011C4/gUnk_08001CA4.bin" - -gUnk_08001CAA:: @ 08001CAA - .incbin "code_080011C4/gUnk_08001CAA.bin" - -gUnk_08001CB0:: @ 08001CB0 - .incbin "code_080011C4/gUnk_08001CB0.bin" - -gUnk_08001CB6:: @ 08001CB6 - .incbin "code_080011C4/gUnk_08001CB6.bin" - -gUnk_08001CBC:: @ 08001CBC - .incbin "code_080011C4/gUnk_08001CBC.bin" - -gUnk_08001CC2:: @ 08001CC2 - .incbin "code_080011C4/gUnk_08001CC2.bin" - -gUnk_08001CC8:: @ 08001CC8 - .incbin "code_080011C4/gUnk_08001CC8.bin" - -gUnk_08001CCE:: @ 08001CCE - .incbin "code_080011C4/gUnk_08001CCE.bin" - -gUnk_08001CD4:: @ 08001CD4 - .incbin "code_080011C4/gUnk_08001CD4.bin" - -gUnk_08001CDA:: @ 08001CDA - .incbin "code_080011C4/gUnk_08001CDA.bin" - -gUnk_08001CE0:: @ 08001CE0 - .incbin "code_080011C4/gUnk_08001CE0.bin" - -gUnk_08001CE6:: @ 08001CE6 - .incbin "code_080011C4/gUnk_08001CE6.bin" - -gUnk_08001CEC:: @ 08001CEC - .incbin "code_080011C4/gUnk_08001CEC.bin" - -gUnk_08001CF2:: @ 08001CF2 - .incbin "code_080011C4/gUnk_08001CF2.bin" - -gUnk_08001CF8:: @ 08001CF8 - .incbin "code_080011C4/gUnk_08001CF8.bin" - -gUnk_08001CFE:: @ 08001CFE - .incbin "code_080011C4/gUnk_08001CFE.bin" - -gUnk_08001D04:: @ 08001D04 - .incbin "code_080011C4/gUnk_08001D04.bin" - -gUnk_08001D0A:: @ 08001D0A - .incbin "code_080011C4/gUnk_08001D0A.bin" - -gUnk_08001D16:: @ 08001D16 - .incbin "code_080011C4/gUnk_08001D16.bin" - -gUnk_08001D1C:: @ 08001D1C - .incbin "code_080011C4/gUnk_08001D1C.bin" - -gUnk_08001D22:: @ 08001D22 - .incbin "code_080011C4/gUnk_08001D22.bin" - -gUnk_08001D28:: @ 08001D28 - .incbin "code_080011C4/gUnk_08001D28.bin" - -gUnk_08001D2E:: @ 08001D2E - .incbin "code_080011C4/gUnk_08001D2E.bin" - -gUnk_08001D34:: @ 08001D34 - .incbin "code_080011C4/gUnk_08001D34.bin" - -gUnk_08001D3A:: @ 08001D3A - .incbin "code_080011C4/gUnk_08001D3A.bin" - -gUnk_08001D40:: @ 08001D40 - .incbin "code_080011C4/gUnk_08001D40.bin" - -gUnk_08001D46:: @ 08001D46 - .incbin "code_080011C4/gUnk_08001D46.bin" - -gUnk_08001D4C:: @ 08001D4C - .incbin "code_080011C4/gUnk_08001D4C.bin" - -gUnk_08001D52:: @ 08001D52 - .incbin "code_080011C4/gUnk_08001D52.bin" - -gUnk_08001D58:: @ 08001D58 - .incbin "code_080011C4/gUnk_08001D58.bin" - -gUnk_08001D5E:: @ 08001D5E - .incbin "code_080011C4/gUnk_08001D5E.bin" - -gUnk_08001D64:: @ 08001D64 - .incbin "code_080011C4/gUnk_08001D64.bin" - -gUnk_08001D6A:: @ 08001D6A - .incbin "code_080011C4/gUnk_08001D6A.bin" - -gUnk_08001D70:: @ 08001D70 - .incbin "code_080011C4/gUnk_08001D70.bin" - -gUnk_08001D76:: @ 08001D76 - .incbin "code_080011C4/gUnk_08001D76.bin" - -gUnk_08001D7C:: @ 08001D7C - .incbin "code_080011C4/gUnk_08001D7C.bin" - -gUnk_08001D82:: @ 08001D82 - .incbin "code_080011C4/gUnk_08001D82.bin" - -gUnk_08001D88:: @ 08001D88 - .incbin "code_080011C4/gUnk_08001D88.bin" - -gUnk_08001D8E:: @ 08001D8E - .incbin "code_080011C4/gUnk_08001D8E.bin" - -gUnk_08001D94:: @ 08001D94 - .incbin "code_080011C4/gUnk_08001D94.bin" - -gUnk_08001D9A:: @ 08001D9A - .incbin "code_080011C4/gUnk_08001D9A.bin" - -gUnk_08001DA0:: @ 08001DA0 - .incbin "code_080011C4/gUnk_08001DA0.bin" - -gUnk_08001DA6:: @ 08001DA6 - .incbin "code_080011C4/gUnk_08001DA6.bin" - -gUnk_08001DAC:: @ 08001DAC - .incbin "code_080011C4/gUnk_08001DAC.bin" - -gUnk_08001DB8:: @ 08001DB8 - .incbin "code_080011C4/gUnk_08001DB8.bin" - -gUnk_08001DBE:: @ 08001DBE - .incbin "code_080011C4/gUnk_08001DBE.bin" - -gUnk_08001DC4:: @ 08001DC4 - .incbin "code_080011C4/gUnk_08001DC4.bin" - -gUnk_08001DCC:: @ 08001DCC - .4byte gUnk_08001FAC - .4byte gUnk_08001FB4 - .4byte gUnk_08001FBC - .4byte gUnk_08001FC3 - .4byte gUnk_08001FCA - .4byte gUnk_08001FD1 - .4byte gUnk_08001FD8 - .4byte gUnk_08001FDF - .4byte gUnk_08001FE6 - .4byte gUnk_08001FED - .4byte gUnk_08001FF8 - .4byte gUnk_08001FFF - .4byte gUnk_08002006 - .4byte gUnk_0800200D - .4byte gUnk_08002014 - .4byte gUnk_0800201B - .4byte gUnk_08002022 - .4byte gUnk_08002029 - .4byte gUnk_08002030 - .4byte gUnk_08002037 - .4byte gUnk_0800203E - .4byte gUnk_08002045 - .4byte gUnk_0800204C - .4byte gUnk_08002053 - .4byte gUnk_0800205A - .4byte gUnk_08002061 - .4byte gUnk_08002068 - .4byte gUnk_08002071 - .4byte gUnk_0800207A - .4byte gUnk_08002081 - .4byte gUnk_0800208A - .4byte gUnk_08002091 - .4byte gUnk_08002098 - .4byte gUnk_0800209F - .4byte gUnk_080020A6 - .4byte gUnk_080020AD - .4byte gUnk_080020B4 - .4byte gUnk_080020BB - .4byte gUnk_080020C2 - .4byte gUnk_080020C9 - .4byte gUnk_080020D0 - .4byte gUnk_080020D7 - .4byte gUnk_080020DE - .4byte gUnk_080020E5 - .4byte gUnk_080020EC - .4byte gUnk_080020F4 - .4byte gUnk_080020FB - .4byte gUnk_08002102 - .4byte gUnk_08002109 - .4byte gUnk_08002110 - .4byte gUnk_08002117 - .4byte gUnk_0800211E - .4byte gUnk_08002125 - .4byte gUnk_0800212D - .4byte gUnk_08002135 - .4byte gUnk_0800213D - .4byte gUnk_08002144 - .4byte gUnk_0800214B - .4byte gUnk_08002152 - .4byte gUnk_0800215A - .4byte gUnk_08002162 - .4byte gUnk_08002169 - .4byte gUnk_08002170 - .4byte gUnk_08002178 - .4byte gUnk_08002184 - .4byte gUnk_0800218B - .4byte gUnk_08002193 - .4byte gUnk_0800219B - .4byte gUnk_080021A3 - .4byte gUnk_080021AB - .4byte gUnk_080021B3 - .4byte gUnk_080021BC - .4byte gUnk_080021C3 - .4byte gUnk_080021CA - .4byte gUnk_080021D1 - .4byte gUnk_080021D8 - .4byte gUnk_080021E1 - .4byte gUnk_080021E8 - .4byte gUnk_080021F1 - .4byte gUnk_080021F8 - .4byte gUnk_080021FF - .4byte gUnk_08002206 - .4byte gUnk_0800220D - .4byte gUnk_08002214 - .4byte gUnk_0800221B - .4byte gUnk_08002222 - .4byte gUnk_08002229 - .4byte gUnk_08002230 - .4byte gUnk_08002239 - .4byte gUnk_08002240 - .4byte gUnk_08002247 - .4byte gUnk_0800224E - .4byte gUnk_08002255 - .4byte gUnk_0800225C - .4byte gUnk_08002263 - .4byte gUnk_0800226A - .4byte gUnk_08002271 - .4byte gUnk_08002278 - .4byte gUnk_0800227F - .4byte gUnk_08002286 - .4byte gUnk_0800228D - .4byte gUnk_08002294 - .4byte gUnk_0800229B - .4byte gUnk_080022A7 - .4byte gUnk_080022B3 - .4byte gUnk_080022BF - .4byte gUnk_080022CB - .4byte gUnk_080022D7 - .4byte gUnk_080022DE - .4byte gUnk_080022E5 - .4byte gUnk_080022EC - .4byte gUnk_080022F3 - .4byte gUnk_080022FB - .4byte gUnk_08002302 - .4byte gUnk_08002309 - .4byte gUnk_08002310 - .4byte gUnk_08002317 - .4byte gUnk_0800231E - .4byte gUnk_08002325 - .4byte gUnk_0800232C - -gUnk_08001FAC:: @ 08001FAC - .incbin "code_080011C4/gUnk_08001FAC.bin" - -gUnk_08001FB4:: @ 08001FB4 - .incbin "code_080011C4/gUnk_08001FB4.bin" - -gUnk_08001FBC:: @ 08001FBC - .incbin "code_080011C4/gUnk_08001FBC.bin" - -gUnk_08001FC3:: @ 08001FC3 - .incbin "code_080011C4/gUnk_08001FC3.bin" - -gUnk_08001FCA:: @ 08001FCA - .incbin "code_080011C4/gUnk_08001FCA.bin" - -gUnk_08001FD1:: @ 08001FD1 - .incbin "code_080011C4/gUnk_08001FD1.bin" - -gUnk_08001FD8:: @ 08001FD8 - .incbin "code_080011C4/gUnk_08001FD8.bin" - -gUnk_08001FDF:: @ 08001FDF - .incbin "code_080011C4/gUnk_08001FDF.bin" - -gUnk_08001FE6:: @ 08001FE6 - .incbin "code_080011C4/gUnk_08001FE6.bin" - -gUnk_08001FED:: @ 08001FED - .incbin "code_080011C4/gUnk_08001FED.bin" - -gUnk_08001FF8:: @ 08001FF8 - .incbin "code_080011C4/gUnk_08001FF8.bin" - -gUnk_08001FFF:: @ 08001FFF - .incbin "code_080011C4/gUnk_08001FFF.bin" - -gUnk_08002006:: @ 08002006 - .incbin "code_080011C4/gUnk_08002006.bin" - -gUnk_0800200D:: @ 0800200D - .incbin "code_080011C4/gUnk_0800200D.bin" - -gUnk_08002014:: @ 08002014 - .incbin "code_080011C4/gUnk_08002014.bin" - -gUnk_0800201B:: @ 0800201B - .incbin "code_080011C4/gUnk_0800201B.bin" - -gUnk_08002022:: @ 08002022 - .incbin "code_080011C4/gUnk_08002022.bin" - -gUnk_08002029:: @ 08002029 - .incbin "code_080011C4/gUnk_08002029.bin" - -gUnk_08002030:: @ 08002030 - .incbin "code_080011C4/gUnk_08002030.bin" - -gUnk_08002037:: @ 08002037 - .incbin "code_080011C4/gUnk_08002037.bin" - -gUnk_0800203E:: @ 0800203E - .incbin "code_080011C4/gUnk_0800203E.bin" - -gUnk_08002045:: @ 08002045 - .incbin "code_080011C4/gUnk_08002045.bin" - -gUnk_0800204C:: @ 0800204C - .incbin "code_080011C4/gUnk_0800204C.bin" - -gUnk_08002053:: @ 08002053 - .incbin "code_080011C4/gUnk_08002053.bin" - -gUnk_0800205A:: @ 0800205A - .incbin "code_080011C4/gUnk_0800205A.bin" - -gUnk_08002061:: @ 08002061 - .incbin "code_080011C4/gUnk_08002061.bin" - -gUnk_08002068:: @ 08002068 - .incbin "code_080011C4/gUnk_08002068.bin" - -gUnk_08002071:: @ 08002071 - .incbin "code_080011C4/gUnk_08002071.bin" - -gUnk_0800207A:: @ 0800207A - .incbin "code_080011C4/gUnk_0800207A.bin" - -gUnk_08002081:: @ 08002081 - .incbin "code_080011C4/gUnk_08002081.bin" - -gUnk_0800208A:: @ 0800208A - .incbin "code_080011C4/gUnk_0800208A.bin" - -gUnk_08002091:: @ 08002091 - .incbin "code_080011C4/gUnk_08002091.bin" - -gUnk_08002098:: @ 08002098 - .incbin "code_080011C4/gUnk_08002098.bin" - -gUnk_0800209F:: @ 0800209F - .incbin "code_080011C4/gUnk_0800209F.bin" - -gUnk_080020A6:: @ 080020A6 - .incbin "code_080011C4/gUnk_080020A6.bin" - -gUnk_080020AD:: @ 080020AD - .incbin "code_080011C4/gUnk_080020AD.bin" - -gUnk_080020B4:: @ 080020B4 - .incbin "code_080011C4/gUnk_080020B4.bin" - -gUnk_080020BB:: @ 080020BB - .incbin "code_080011C4/gUnk_080020BB.bin" - -gUnk_080020C2:: @ 080020C2 - .incbin "code_080011C4/gUnk_080020C2.bin" - -gUnk_080020C9:: @ 080020C9 - .incbin "code_080011C4/gUnk_080020C9.bin" - -gUnk_080020D0:: @ 080020D0 - .incbin "code_080011C4/gUnk_080020D0.bin" - -gUnk_080020D7:: @ 080020D7 - .incbin "code_080011C4/gUnk_080020D7.bin" - -gUnk_080020DE:: @ 080020DE - .incbin "code_080011C4/gUnk_080020DE.bin" - -gUnk_080020E5:: @ 080020E5 - .incbin "code_080011C4/gUnk_080020E5.bin" - -gUnk_080020EC:: @ 080020EC - .incbin "code_080011C4/gUnk_080020EC.bin" - -gUnk_080020F4:: @ 080020F4 - .incbin "code_080011C4/gUnk_080020F4.bin" - -gUnk_080020FB:: @ 080020FB - .incbin "code_080011C4/gUnk_080020FB.bin" - -gUnk_08002102:: @ 08002102 - .incbin "code_080011C4/gUnk_08002102.bin" - -gUnk_08002109:: @ 08002109 - .incbin "code_080011C4/gUnk_08002109.bin" - -gUnk_08002110:: @ 08002110 - .incbin "code_080011C4/gUnk_08002110.bin" - -gUnk_08002117:: @ 08002117 - .incbin "code_080011C4/gUnk_08002117.bin" - -gUnk_0800211E:: @ 0800211E - .incbin "code_080011C4/gUnk_0800211E.bin" - -gUnk_08002125:: @ 08002125 - .incbin "code_080011C4/gUnk_08002125.bin" - -gUnk_0800212D:: @ 0800212D - .incbin "code_080011C4/gUnk_0800212D.bin" - -gUnk_08002135:: @ 08002135 - .incbin "code_080011C4/gUnk_08002135.bin" - -gUnk_0800213D:: @ 0800213D - .incbin "code_080011C4/gUnk_0800213D.bin" - -gUnk_08002144:: @ 08002144 - .incbin "code_080011C4/gUnk_08002144.bin" - -gUnk_0800214B:: @ 0800214B - .incbin "code_080011C4/gUnk_0800214B.bin" - -gUnk_08002152:: @ 08002152 - .incbin "code_080011C4/gUnk_08002152.bin" - -gUnk_0800215A:: @ 0800215A - .incbin "code_080011C4/gUnk_0800215A.bin" - -gUnk_08002162:: @ 08002162 - .incbin "code_080011C4/gUnk_08002162.bin" - -gUnk_08002169:: @ 08002169 - .incbin "code_080011C4/gUnk_08002169.bin" - -gUnk_08002170:: @ 08002170 - .incbin "code_080011C4/gUnk_08002170.bin" - -gUnk_08002178:: @ 08002178 - .incbin "code_080011C4/gUnk_08002178.bin" - -gUnk_08002184:: @ 08002184 - .incbin "code_080011C4/gUnk_08002184.bin" - -gUnk_0800218B:: @ 0800218B - .incbin "code_080011C4/gUnk_0800218B.bin" - -gUnk_08002193:: @ 08002193 - .incbin "code_080011C4/gUnk_08002193.bin" - -gUnk_0800219B:: @ 0800219B - .incbin "code_080011C4/gUnk_0800219B.bin" - -gUnk_080021A3:: @ 080021A3 - .incbin "code_080011C4/gUnk_080021A3.bin" - -gUnk_080021AB:: @ 080021AB - .incbin "code_080011C4/gUnk_080021AB.bin" - -gUnk_080021B3:: @ 080021B3 - .incbin "code_080011C4/gUnk_080021B3.bin" - -gUnk_080021BC:: @ 080021BC - .incbin "code_080011C4/gUnk_080021BC.bin" - -gUnk_080021C3:: @ 080021C3 - .incbin "code_080011C4/gUnk_080021C3.bin" - -gUnk_080021CA:: @ 080021CA - .incbin "code_080011C4/gUnk_080021CA.bin" - -gUnk_080021D1:: @ 080021D1 - .incbin "code_080011C4/gUnk_080021D1.bin" - -gUnk_080021D8:: @ 080021D8 - .incbin "code_080011C4/gUnk_080021D8.bin" - -gUnk_080021E1:: @ 080021E1 - .incbin "code_080011C4/gUnk_080021E1.bin" - -gUnk_080021E8:: @ 080021E8 - .incbin "code_080011C4/gUnk_080021E8.bin" - -gUnk_080021F1:: @ 080021F1 - .incbin "code_080011C4/gUnk_080021F1.bin" - -gUnk_080021F8:: @ 080021F8 - .incbin "code_080011C4/gUnk_080021F8.bin" - -gUnk_080021FF:: @ 080021FF - .incbin "code_080011C4/gUnk_080021FF.bin" - -gUnk_08002206:: @ 08002206 - .incbin "code_080011C4/gUnk_08002206.bin" - -gUnk_0800220D:: @ 0800220D - .incbin "code_080011C4/gUnk_0800220D.bin" - -gUnk_08002214:: @ 08002214 - .incbin "code_080011C4/gUnk_08002214.bin" - -gUnk_0800221B:: @ 0800221B - .incbin "code_080011C4/gUnk_0800221B.bin" - -gUnk_08002222:: @ 08002222 - .incbin "code_080011C4/gUnk_08002222.bin" - -gUnk_08002229:: @ 08002229 - .incbin "code_080011C4/gUnk_08002229.bin" - -gUnk_08002230:: @ 08002230 - .incbin "code_080011C4/gUnk_08002230.bin" - -gUnk_08002239:: @ 08002239 - .incbin "code_080011C4/gUnk_08002239.bin" - -gUnk_08002240:: @ 08002240 - .incbin "code_080011C4/gUnk_08002240.bin" - -gUnk_08002247:: @ 08002247 - .incbin "code_080011C4/gUnk_08002247.bin" - -gUnk_0800224E:: @ 0800224E - .incbin "code_080011C4/gUnk_0800224E.bin" - -gUnk_08002255:: @ 08002255 - .incbin "code_080011C4/gUnk_08002255.bin" - -gUnk_0800225C:: @ 0800225C - .incbin "code_080011C4/gUnk_0800225C.bin" - -gUnk_08002263:: @ 08002263 - .incbin "code_080011C4/gUnk_08002263.bin" - -gUnk_0800226A:: @ 0800226A - .incbin "code_080011C4/gUnk_0800226A.bin" - -gUnk_08002271:: @ 08002271 - .incbin "code_080011C4/gUnk_08002271.bin" - -gUnk_08002278:: @ 08002278 - .incbin "code_080011C4/gUnk_08002278.bin" - -gUnk_0800227F:: @ 0800227F - .incbin "code_080011C4/gUnk_0800227F.bin" - -gUnk_08002286:: @ 08002286 - .incbin "code_080011C4/gUnk_08002286.bin" - -gUnk_0800228D:: @ 0800228D - .incbin "code_080011C4/gUnk_0800228D.bin" - -gUnk_08002294:: @ 08002294 - .incbin "code_080011C4/gUnk_08002294.bin" - -gUnk_0800229B:: @ 0800229B - .incbin "code_080011C4/gUnk_0800229B.bin" - -gUnk_080022A7:: @ 080022A7 - .incbin "code_080011C4/gUnk_080022A7.bin" - -gUnk_080022B3:: @ 080022B3 - .incbin "code_080011C4/gUnk_080022B3.bin" - -gUnk_080022BF:: @ 080022BF - .incbin "code_080011C4/gUnk_080022BF.bin" - -gUnk_080022CB:: @ 080022CB - .incbin "code_080011C4/gUnk_080022CB.bin" - -gUnk_080022D7:: @ 080022D7 - .incbin "code_080011C4/gUnk_080022D7.bin" - -gUnk_080022DE:: @ 080022DE - .incbin "code_080011C4/gUnk_080022DE.bin" - -gUnk_080022E5:: @ 080022E5 - .incbin "code_080011C4/gUnk_080022E5.bin" - -gUnk_080022EC:: @ 080022EC - .incbin "code_080011C4/gUnk_080022EC.bin" - -gUnk_080022F3:: @ 080022F3 - .incbin "code_080011C4/gUnk_080022F3.bin" - -gUnk_080022FB:: @ 080022FB - .incbin "code_080011C4/gUnk_080022FB.bin" - -gUnk_08002302:: @ 08002302 - .incbin "code_080011C4/gUnk_08002302.bin" - -gUnk_08002309:: @ 08002309 - .incbin "code_080011C4/gUnk_08002309.bin" - -gUnk_08002310:: @ 08002310 - .incbin "code_080011C4/gUnk_08002310.bin" - -gUnk_08002317:: @ 08002317 - .incbin "code_080011C4/gUnk_08002317.bin" - -gUnk_0800231E:: @ 0800231E - .incbin "code_080011C4/gUnk_0800231E.bin" - -gUnk_08002325:: @ 08002325 - .incbin "code_080011C4/gUnk_08002325.bin" - -gUnk_0800232C:: @ 0800232C - .incbin "code_080011C4/gUnk_0800232C.bin" - -gUnk_0800232E:: @ 0800232E - .incbin "code_080011C4/gUnk_0800232E.bin" - -gUnk_08002342:: @ 08002342 - .incbin "code_080011C4/gUnk_08002342.bin" - - non_word_aligned_thumb_func_start sub_08002632 -sub_08002632: @ 0x08002632 - push {r4, r5, r6, r7, lr} - ldr r4, _0800269C @ =gUnk_0800232E - ldrb r3, [r0, #8] - cmp r3, #3 - beq _08002642 - cmp r3, #7 - bne _08002684 - ldr r4, _080026A0 @ =gUnk_08002342 -_08002642: - ldrb r3, [r0, #9] - lsls r1, r3, #0x10 - ldrb r3, [r0, #0xa] - lsls r3, r3, #8 - orrs r1, r3 - ldrb r3, [r0, #0xb] - orrs r1, r3 - add r6, pc, #0x38 -_08002652: - adds r4, #6 - ldrb r3, [r4] - lsls r2, r3, #0x10 - beq _08002684 - movs r5, #0 - ldrb r3, [r4, #1] - cmp r3, #0xff - bne _08002664 - movs r5, #8 -_08002664: - lsls r3, r3, #8 - orrs r2, r3 - ldrb r3, [r4, #2] - cmp r3, #0xff - bne _08002670 - adds r5, #4 -_08002670: - orrs r2, r3 - ldr r5, [r6, r5] - adds r3, r1, #0 - ands r3, r5 - ands r2, r5 - cmp r3, r2 - bne _08002652 - ldrb r0, [r4, #3] - ldrh r1, [r4, #4] - pop {r4, r5, r6, r7, pc} -_08002684: - movs r0, #0 - movs r1, #0 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_0800268C: - .byte 0xFF, 0xFF, 0xFF, 0x00 - .byte 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00 -_0800269C: .4byte gUnk_0800232E -_080026A0: .4byte gUnk_08002342 - -gUnk_080026A4:: -@ normal entities - .4byte gUnk_020000B0 @ enemy target? (player) - .4byte gEntityLists - 8 @ first linked list - .4byte gEntityLists + 64 @ last linked list - .4byte gUnk_03005FBC @ entity table -@ managers - .4byte gUnk_020000B0 - .4byte gEntityLists + 56 - .4byte gCollidableCount - .4byte gUnk_03005FBC - - thumb_func_start sub_080026C4 -sub_080026C4: @ 0x080026C4 - push {r4, r5, r6, lr} - lsrs r4, r3, #3 - lsls r4, r4, #6 - adds r1, r1, r4 - movs r6, #0xf0 - lsls r4, r3, #0x1d - lsrs r4, r4, #0x1e - blo _080026D8 - movs r6, #0xf - adds r2, #0x10 -_080026D8: - adds r1, r1, r4 - movs r3, #0x10 -_080026DC: - ldrb r4, [r0] - ldrb r4, [r2, r4] - ldrb r5, [r1] - ands r5, r6 - orrs r5, r4 - strb r5, [r1] - adds r1, #4 - adds r0, #8 - subs r3, #1 - bne _080026DC - pop {r4, r5, r6, pc} - - non_word_aligned_thumb_func_start sub_080026F2 -sub_080026F2: @ 0x080026F2 - push {r4, r5, r6, lr} - lsrs r4, r3, #3 - lsls r4, r4, #6 - adds r1, r1, r4 - movs r6, #0xf0 - lsls r4, r3, #0x1d - lsrs r4, r4, #0x1e - blo _08002706 - movs r6, #0xf - adds r2, #0x10 -_08002706: - adds r1, r1, r4 - movs r3, #0x10 -_0800270A: - ldrb r4, [r0] - ldrb r4, [r2, r4] - cmp r4, #0 - beq _0800271A - ldrb r5, [r1] - ands r5, r6 - orrs r5, r4 - strb r5, [r1] -_0800271A: - adds r1, #4 - adds r0, #8 - subs r3, #1 - bne _0800270A - pop {r4, r5, r6, pc} - - thumb_func_start sub_08002724 -sub_08002724: @ 0x08002724 - push {r4, r5, lr} - movs r2, #0x10 - movs r3, #0xf -_0800272A: - ldrb r4, [r0] - lsrs r5, r4, #4 - ands r4, r3 - strb r4, [r1] - strb r5, [r1, #1] - ldrb r4, [r0, #1] - lsrs r5, r4, #4 - ands r4, r3 - strb r4, [r1, #2] - strb r5, [r1, #3] - ldrb r4, [r0, #2] - lsrs r5, r4, #4 - ands r4, r3 - strb r4, [r1, #4] - strb r5, [r1, #5] - ldrb r4, [r0, #3] - lsrs r5, r4, #4 - ands r4, r3 - strb r4, [r1, #6] - strb r5, [r1, #7] - adds r0, #4 - adds r1, #8 - subs r2, #1 - bne _0800272A - pop {r4, r5, pc} - -gUnk_0800275C:: - .byte 0x06, 0x00, 0x06, 0x60 - .byte 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x00, 0x60, 0x60, 0x60 - .byte 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x06 - .byte 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x00, 0x06, 0x06, 0x06 - .byte 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06 - - thumb_func_start GetNextFunction -GetNextFunction: @ 0x0800279C - movs r1, #0x3a - ldrb r3, [r0, r1] - movs r2, #4 - ands r2, r3 - bne _080027AE - movs r1, #0x41 - ldrb r2, [r0, r1] - lsrs r2, r2, #7 - bne _080027CE -_080027AE: - movs r1, #0x42 - ldrb r2, [r0, r1] - cmp r2, #0 - bne _080027D2 - movs r1, #0x45 - ldrb r2, [r0, r1] - cmp r2, #0 - beq _080027D6 - lsrs r2, r3, #3 - bhs _080027E2 - movs r1, #0x43 - ldrb r2, [r0, r1] - cmp r2, #0 - bne _080027E6 -_080027CA: - movs r0, #0 - bx lr -_080027CE: - movs r0, #1 - bx lr -_080027D2: - movs r0, #2 - bx lr -_080027D6: - ldrb r2, [r0, #0xc] - ldrb r0, [r0, #0xd] - orrs r0, r2 - beq _080027CA - movs r0, #3 - bx lr -_080027E2: - movs r0, #5 - bx lr -_080027E6: - movs r0, #4 - bx lr - - non_word_aligned_thumb_func_start sub_080027EA -sub_080027EA: @ 0x080027EA - push {r4, r5, r6, r7, lr} - movs r3, #0x80 - tst r2, r3 - bne _08002860 - movs r4, #0x2a - ldrh r3, [r0, r4] - movs r4, #7 - tst r2, r4 - bne _08002812 - push {r0, r1, r2, r3} - adds r0, r2, #0 - adds r1, r3, #0 - bl sub_08002864 - adds r4, r0, #0 - pop {r0, r1, r2, r3} - cmp r2, r4 - beq _08002812 - adds r2, r4, #0 - ldr r1, _0800296C @ =0x00000100 -_08002812: - ldr r4, _08002970 @ =gUnk_0800275C - lsls r2, r2, #1 - ldrh r4, [r4, r2] - lsls r2, r2, #3 - ands r3, r4 - ldr r4, _08002974 @ =0x0000EE00 - tst r3, r4 - bne _0800283E - push {r0, r1, r2, r3} - ldr r4, _08002978 @ =gSineTable - ldrh r0, [r4, r2] - cmp r0, #0 - beq _08002834 - adds r6, #1 - bl FixedMul - lsls r0, r0, #8 -_08002834: - adds r4, r0, #0 - pop {r0, r1, r2, r3} - ldr r5, [r0, #0x2c] - adds r5, r5, r4 - str r5, [r0, #0x2c] -_0800283E: - movs r4, #0xee - tst r3, r4 - bne _08002860 - push {r0, r1, r2, r3} - ldr r4, _0800297C @ =gCosineTable - ldrh r0, [r4, r2] - cmp r0, #0 - beq _08002856 - adds r6, #2 - bl FixedMul - lsls r0, r0, #8 -_08002856: - adds r4, r0, #0 - pop {r0, r1, r2, r3} - ldr r5, [r0, #0x30] - subs r5, r5, r4 - str r5, [r0, #0x30] -_08002860: - adds r1, r6, #0 - pop {r4, r5, r6, r7, pc} - - thumb_func_start sub_08002864 -sub_08002864: @ 0x08002864 - adds r2, r0, #0 - lsrs r2, r2, #3 - cmp r2, #0 - beq _080028A8 - subs r2, #1 - beq _0800288E - subs r2, #1 - beq _080028C2 - ldr r3, _08002980 @ =0x00000E00 - ands r3, r1 - bne _0800287C - bx lr -_0800287C: - movs r2, #0 - ldr r3, _08002984 @ =0x0000020E - tst r3, r1 - beq _080028DC - movs r2, #0x10 - ldr r3, _08002988 @ =0x000004E0 - tst r3, r1 - beq _080028DC - bx lr -_0800288E: - ldr r3, _0800298C @ =0x0000E000 - ands r3, r1 - bne _08002896 - bx lr -_08002896: - movs r2, #0 - ldr r3, _08002990 @ =0x0000200E - tst r3, r1 - beq _080028DC - movs r2, #0x10 - ldr r3, _08002994 @ =0x000040E0 - tst r3, r1 - beq _080028DC - bx lr -_080028A8: - movs r3, #0xe - ands r3, r1 - bne _080028B0 - bx lr -_080028B0: - movs r2, #8 - ldr r3, _08002998 @ =0x0000E004 - tst r3, r1 - beq _080028DC - movs r2, #0x18 - ldr r3, _0800299C @ =0x00000E02 - tst r3, r1 - beq _080028DC - bx lr -_080028C2: - movs r3, #0xe0 - ands r3, r1 - bne _080028CA - bx lr -_080028CA: - movs r2, #8 - ldr r3, _080029A0 @ =0x0000E040 - tst r3, r1 - beq _080028DC - movs r2, #0x18 - ldr r3, _080029A4 @ =0x00000E20 - tst r3, r1 - beq _080028DC - bx lr -_080028DC: - adds r0, r2, #0 - bx lr - - thumb_func_start sub_080028E0 -sub_080028E0: @ 0x080028E0 - movs r1, #0x3d - movs r3, #1 - ldrsb r2, [r0, r1] - cmp r2, #0 - beq _080028F2 - bmi _080028EE - rsbs r3, r3, #0 -_080028EE: - adds r2, r2, r3 - strb r2, [r0, r1] -_080028F2: - bx lr - - thumb_func_start GetRandomByWeight -GetRandomByWeight: @ 0x080028F4 - push {r4, lr} - adds r4, r0, #0 - bl Random - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - movs r1, #0 -_08002902: - ldrb r2, [r4, r1] - adds r1, #1 - subs r0, r0, r2 - bpl _08002902 - subs r0, r1, #1 - pop {r4, pc} - - non_word_aligned_thumb_func_start CheckRectOnScreen -CheckRectOnScreen: @ 0x0800290E - push {r4, r5, r6, lr} - ldr r4, _080029A8 @ =gRoomControls - ldrh r5, [r4, #0xa] - ldrh r6, [r4, #6] - subs r5, r5, r6 - subs r5, r5, r2 - subs r0, r0, r5 - lsls r2, r2, #1 - adds r2, #0xf0 - cmp r0, r2 - bhs _0800293A - ldrh r5, [r4, #0xc] - ldrh r6, [r4, #8] - subs r5, r5, r6 - subs r5, r5, r3 - subs r1, r1, r5 - lsls r3, r3, #1 - adds r3, #0xa0 - cmp r1, r3 - bhs _0800293A - movs r0, #1 - pop {r4, r5, r6, pc} -_0800293A: - movs r0, #0 - pop {r4, r5, r6, pc} - - non_word_aligned_thumb_func_start CheckPlayerInRegion -CheckPlayerInRegion: @ 0x0800293E - push {r4, r5, r6, r7, lr} - ldr r4, _080029AC @ =gRoomControls - ldr r7, _080029B0 @ =gPlayerEntity - ldrh r6, [r4, #6] - ldrh r5, [r7, #0x2e] - subs r5, r5, r6 - subs r5, r5, r2 - subs r0, r0, r5 - lsls r2, r2, #1 - cmp r0, r2 - bhs _08002968 - ldrh r6, [r4, #8] - ldrh r5, [r7, #0x32] - subs r5, r5, r6 - subs r5, r5, r3 - subs r1, r1, r5 - lsls r3, r3, #1 - cmp r1, r3 - bhs _08002968 - movs r0, #1 - pop {r4, r5, r6, r7, pc} -_08002968: - movs r0, #0 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_0800296C: .4byte 0x00000100 -_08002970: .4byte gUnk_0800275C -_08002974: .4byte 0x0000EE00 -_08002978: .4byte gSineTable -_0800297C: .4byte gCosineTable -_08002980: .4byte 0x00000E00 -_08002984: .4byte 0x0000020E -_08002988: .4byte 0x000004E0 -_0800298C: .4byte 0x0000E000 -_08002990: .4byte 0x0000200E -_08002994: .4byte 0x000040E0 -_08002998: .4byte 0x0000E004 -_0800299C: .4byte 0x00000E02 -_080029A0: .4byte 0x0000E040 -_080029A4: .4byte 0x00000E20 -_080029A8: .4byte gRoomControls -_080029AC: .4byte gRoomControls -_080029B0: .4byte gPlayerEntity diff --git a/asm/object/deathFx.s b/asm/object/deathFx.s index 2cd620db..ac049903 100644 --- a/asm/object/deathFx.s +++ b/asm/object/deathFx.s @@ -209,7 +209,7 @@ sub_08081790: @ 0x08081790 adds r1, r1, r0 ldrb r1, [r1] adds r0, r2, #0 - bl sub_0805457C + bl CreateRandomItemDrop b _080817C6 .align 2, 0 _080817B0: .4byte gUnk_0811EC64 @@ -231,7 +231,7 @@ _080817C8: .4byte gUnk_0811EC24 sub_080817CC: @ 0x080817CC push {lr} movs r1, #9 - bl sub_0805457C + bl CreateRandomItemDrop pop {pc} .align 2, 0 @@ -239,7 +239,7 @@ sub_080817CC: @ 0x080817CC sub_080817D8: @ 0x080817D8 push {lr} movs r1, #0xd - bl sub_0805457C + bl CreateRandomItemDrop pop {pc} .align 2, 0 @@ -247,7 +247,7 @@ sub_080817D8: @ 0x080817D8 sub_080817E4: @ 0x080817E4 push {lr} movs r1, #0xe - bl sub_0805457C + bl CreateRandomItemDrop pop {pc} .align 2, 0 @@ -255,7 +255,7 @@ sub_080817E4: @ 0x080817E4 sub_080817F0: @ 0x080817F0 push {lr} movs r1, #1 - bl sub_0805457C + bl CreateRandomItemDrop pop {pc} .align 2, 0 diff --git a/asm/object/object1E.s b/asm/object/object1E.s index 3791f55e..5d040780 100644 --- a/asm/object/object1E.s +++ b/asm/object/object1E.s @@ -214,7 +214,7 @@ sub_08087640: @ 0x08087640 _08087676: adds r0, r4, #0 adds r1, r2, #0 - bl sub_0805457C + bl CreateRandomItemDrop strh r5, [r4, #0x2e] strh r6, [r4, #0x32] pop {r4, r5, r6, pc} diff --git a/asm/object/object63.s b/asm/object/object63.s index 336dddc8..76bf8b49 100644 --- a/asm/object/object63.s +++ b/asm/object/object63.s @@ -43,7 +43,7 @@ sub_08093D88: @ 0x08093D88 _08093DAC: adds r0, r4, #0 movs r1, #4 - bl sub_0805457C + bl CreateRandomItemDrop cmp r0, #0 bne _08093DBC movs r0, #2 diff --git a/asm/object/specialFx.s b/asm/object/specialFx.s index 286e0046..7d0ac4c2 100644 --- a/asm/object/specialFx.s +++ b/asm/object/specialFx.s @@ -110,7 +110,7 @@ _08084582: beq _08084594 ldrb r1, [r4, #1] adds r0, r5, #0 - bl sub_0805457C + bl CreateRandomItemDrop _08084594: ldrb r1, [r5, #0xb] movs r0, #0x20 diff --git a/assets/assets.json b/assets/assets.json index 84d3d877..346e36c5 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -55,119 +55,16 @@ "start": 4484, "size": 64 }, - { - "path": "code_080011C4/gUnk_0800137C.bin", - "start": 4988, - "size": 192 - }, - { - "path": "code_080011C4/gUnk_0800143C.bin", - "start": 5180, - "size": 384 - }, - { - "path": "code_080011C4/gUnk_080015BC.bin", - "start": 5564, - "size": 96 - }, - { - "path": "code_080011C4/gUnk_0800161C.bin", - "start": 5660, - "size": 230 - }, - { - "path": "code_080011C4/gUnk_0800161C_1_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 5962 - }, - "size": 20 - }, - { - "path": "code_080011C4/gUnk_0800161C_2_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 5890, - "size": 20 - }, - { - "path": "code_080011C4/gUnk_0800161C_3.bin", - "start": 5910, - "size": 398 - }, - { - "path": "code_080011C4/gUnk_0800161C_4_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 6380 - }, - "size": 126 - }, - { - "path": "code_080011C4/gUnk_0800161C_5_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 6308, - "size": 94 - }, { "offsets": { "EU": 104 } }, - { - "path": "code_080011C4/gUnk_0800161C_6.bin", - "start": 6402, - "size": 26 - }, - { - "path": "code_080011C4/gUnk_0800191C_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 6532 - }, - "size": 143 - }, - { - "path": "code_080011C4/gUnk_0800191C_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 6428, - "size": 79 - }, { "offsets": { "EU": 168 } }, - { - "path": "code_080011C4/gUnk_0800191C_2.bin", - "start": 6507, - "size": 177 - }, - { - "path": "code_080011C4/gUnk_08001A1C.bin", - "start": 6684, - "size": 96 - }, { "path": "code_080011C4/gUnk_08001C5C.bin", "start": 7260, diff --git a/include/droptables.h b/include/droptables.h new file mode 100644 index 00000000..481923e6 --- /dev/null +++ b/include/droptables.h @@ -0,0 +1,34 @@ +#ifndef TMC_DROPTABLES_H +#define TMC_DROPTABLES_H + +typedef union { + struct { + s16 none; + s16 rupee1; + s16 rupee5; + s16 rupee20; + s16 hearts; + s16 fairy; + s16 bombs; + s16 arrows; + s16 mysteriousShells; + s16 kinstoneGreen; + s16 kinstoneBlue; + s16 kinstoneRed; + s16 none2; + s16 none3; + s16 none4; + s16 none5; + } s; + s16 a[16]; +} Droptable; +static_assert(sizeof(Droptable) == 0x20); + +extern const Droptable gUnk_0800137C[]; +extern const Droptable gUnk_0800143C[]; +extern const Droptable gUnk_080015BC[]; +extern const Droptable gUnk_0800161C[]; +extern const Droptable gUnk_0800191C[]; +extern const Droptable gUnk_08001A1C[]; + +#endif // TMC_DROPTABLES_H diff --git a/include/functions.h b/include/functions.h index b0dfbee0..171e6c90 100644 --- a/include/functions.h +++ b/include/functions.h @@ -168,7 +168,7 @@ extern void sub_080044AE(Entity*, u32, u32); extern void sub_0801AF18(u8*, u32, u32); extern void sub_0807B9B8(s32, s32, s32); extern void sub_08000148(u32, u32, u32); -extern void sub_0805457C(Entity*, s32); +extern void CreateRandomItemDrop(Entity*, s32); extern Entity* sub_080A2A3C(Entity*, u32, u32, u32); extern void sub_0806FCF4(Entity*, s32, s32, s32); extern u32 sub_080041DC(Entity*, u32, u32); diff --git a/include/item.h b/include/item.h index e7460936..20516e0f 100644 --- a/include/item.h +++ b/include/item.h @@ -143,6 +143,12 @@ typedef enum { ITEM_SKILL_FAST_SPIN, ITEM_SKILL_FAST_SPLIT, ITEM_SKILL_LONG_SPIN, + + // these are not actually item ids but special values used by item drops for example + ITEM_KINSTONE_GREEN = 0xfc, + ITEM_KINSTONE_BLUE, + ITEM_KINSTONE_RED, + ITEM_ENEMY_BEETLE } Item; #endif diff --git a/include/player.h b/include/player.h index 568d614f..68086a81 100644 --- a/include/player.h +++ b/include/player.h @@ -255,7 +255,8 @@ typedef struct { /*0x0c*/ u8 itemButtons[2]; /*0x0e*/ u8 bottles[4]; /*0x12*/ u8 effect; - /*0x13*/ u8 filler3[5]; + /*0x13*/ u8 hasAllFigurines; + /*0x14*/ u8 filler3[4]; /*0x18*/ u16 rupees; /*0x1a*/ u16 field_0x1a; /*0x1c*/ u16 charmTimer; diff --git a/linker.ld b/linker.ld index e2071a6c..166665cb 100644 --- a/linker.ld +++ b/linker.ld @@ -283,6 +283,8 @@ SECTIONS { asm/code_08000F10.o(.text); data/data_08000F54.o(.rodata); asm/enemy.o(.text); + src/droptables.o(.rodata); + asm/code_08001A7C.o(.text); data/gfx/sprite_ptrs.o(.rodata); asm/code_08003FC4.o(.text); asm/code_080043E8.o(.text); diff --git a/src/code_0805436C.c b/src/code_0805436C.c index abf54825..1e6a0243 100644 --- a/src/code_0805436C.c +++ b/src/code_0805436C.c @@ -8,6 +8,7 @@ #include "item.h" #include "object.h" #include "enemy.h" +#include "droptables.h" typedef struct { u8 unk; @@ -18,9 +19,8 @@ extern struct_080FD5B4 gUnk_080FD5B4[]; extern u8 gUnk_0200AF13; extern u8 gUnk_0200AF14; -extern u32 gUnk_080015BC; extern u8 gUnk_080FE1C6[]; -extern u32 gUnk_02034398; +extern Droptable gUnk_02034398; extern void (*const gUnk_080FE2A0[])(void); void ForceEquipItem(u32, u8); @@ -79,7 +79,6 @@ void PutItemOnSlot(u32 itemID) { ASM_FUNC("asm/non_matching/ForceEquipItem.inc", void ForceEquipItem(u32 itemID, u8 itemSlot)) u32 SetBottleContents(u32 itemID, u32 bottleIndex) { - if (bottleIndex > 3) { bottleIndex = 0; if (gSave.stats.bottles[0] != 0x20) { @@ -159,7 +158,7 @@ NONMATCH("asm/non_matching/sub_08054524.inc", void sub_08054524(void)) { bVar1 = 0; } - MemCopy(&gUnk_080015BC + gUnk_080FE1C6[bVar1] * 0x8, &gUnk_02034398, 0x20); + MemCopy(&gUnk_080015BC[0] + gUnk_080FE1C6[bVar1] * 0x8, &gUnk_02034398, 0x20); } END_NONMATCH @@ -171,68 +170,162 @@ void sub_08054570(void) { gRoomVars.field_0x2 = 0; } -ASM_FUNC("asm/non_matching/sub_0805457C.inc", u32 sub_0805457C(u32 arg0, u32 arg1)); +// BUG? +extern const Droptable gUnk_080014e4[]; +extern void sub_08000F14(s16*, const s16*, const s16*, const s16*); +extern u32 sub_08000F2C(s16*, const s16*, const s16*, const s16*); +u32 CreateItemDrop(Entity* arg0, u32 itemID, u32 itemParameter); +u32 CreateRandomItemDrop(Entity* arg0, u32 arg1) { + extern const u8 gUnk_080FE1B4[]/* = { + ITEM_NONE, ITEM_RUPEE1, ITEM_RUPEE5, ITEM_RUPEE20, ITEM_HEART, ITEM_FAIRY, + ITEM_BOMBS5, ITEM_ARROWS5, ITEM_SHELLS, ITEM_KINSTONE_GREEN, ITEM_KINSTONE_BLUE, ITEM_KINSTONE_RED, + ITEM_ENEMY_BEETLE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, + }*/; + + int r0, r1, r2, r4, r5; + u32 r3; + const Droptable *ptr2, *ptr3, *ptr4; + Droptable s0; + r3 = arg1; + if (gRoomVars.field_0x2 != 1) { + ptr2 = &gUnk_08001A1C[0]; + ptr4 = 0; + switch (r3) { + case 1 ... 12: + ptr4 = &gUnk_0800137C[r3]; + break; +#ifndef EU + case 24: + case 25: + r0 = gRoomVars.unk2; + ptr4 = &gUnk_0800191C[0]; + if (r0) { + ptr4++; + } + break; +#endif + case 16 ... 23: +#ifdef EU + case 24: +#endif + ptr2 = &gUnk_0800161C[r3]; + case 15: + ptr4 = &gUnk_02034398; + break; + case 0: + default: + break; + } + if (ptr4 != 0) { + if ((r1 = gSave.stats.unkB) == 0) { + ptr3 = &gUnk_08001A1C[0]; + } else { +#ifdef EU + ptr3 = &gUnk_0800143C[r1+3]; +#else + ptr3 = &gUnk_0800143C[r1]; +#endif + } + sub_08000F14(s0.a, ptr4->a, ptr2->a, ptr3->a); + if (gSave.stats.health <= 8) { + s0.s.hearts += 5; + } + if (gSave.stats.bombCount == 0) { + s0.s.bombs += 3; + } + if (gSave.stats.arrowCount == 0) { + s0.s.arrows += 3; + } + if (gSave.stats.rupees <= 10) { + s0.s.rupee5 += 1; + } + ptr2 = &gUnk_08001A1C[0]; + r0 = gSave.stats.hasAllFigurines; + ptr3 = ptr2; + if (r0 != 0) { + ptr2++; + } + if (gSave.fillerD0[0x46] != 0) { + ptr3 += 2; + } + r4 = sub_08000F2C(s0.a, s0.a, ptr2->a, ptr3->a); + r2 = Random(); + r5 = (r2 >> 0x18); + r5 &= 0xF; + r2 = r2 % r4; + { + u32 r3; + for (r3 = 0, r1 = 0; r3 < 0x10; r3++, r5 = (r5 + 1) & 0xF) { + if ((r1 += s0.a[r5]) > r2) { + break; + } + } + } + r1 = gUnk_080FE1B4[r5]; + if (r1 != 0) { + r2 = 0; + return CreateItemDrop(arg0, r1, r2); + } + } + } + return 0; +} u32 CreateItemDrop(Entity* arg0, u32 itemID, u32 itemParameter) { - u32 prereqID; u32 adjustedParam = itemParameter; - u32 uVar1; Entity* itemEntity; switch (itemID) { - case 0xff: - if (!GetInventoryValue(0x1)) { - return 0; + case ITEM_ENEMY_BEETLE: + if (!GetInventoryValue(ITEM_SMITH_SWORD)) { + return ITEM_NONE; } break; - case 0x5d: - if (!GetInventoryValue(0x65)) { - return 0; + case ITEM_BOMBS5: + if (!GetInventoryValue(ITEM_BOMBBAG)) { + return ITEM_NONE; } break; - case 0x5e: - if (!GetInventoryValue(0x9)) { - return 0; + case ITEM_ARROWS5: + if (!GetInventoryValue(ITEM_BOW)) { + return ITEM_NONE; } break; - case 0x3f: { - if (!GetInventoryValue(0x40)) { - return 0; + case ITEM_SHELLS: { + if (!GetInventoryValue(ITEM_EARTH_ELEMENT)) { + return ITEM_NONE; } if (itemParameter == 0) { adjustedParam = 1; } break; } - case 0x5c: - case 0xfc ... 0xfe: { - u32 tmp, tmp2; + case ITEM_KINSTONE: + case ITEM_KINSTONE_GREEN ... ITEM_KINSTONE_RED: { u32 rand; - u8* ptr; - if (GetInventoryValue(0x67) == 0) { + if (GetInventoryValue(ITEM_KINSTONE_BAG) == 0) { return 0; } if (3 < gRoomVars.filler1[0]) { return 0; } - if (itemID != 0x5c) { - adjustedParam = itemID - 0xfc; + if (itemID != ITEM_KINSTONE) { + adjustedParam = itemID - ITEM_KINSTONE_GREEN; rand = (Random() & 0x3f); - ptr = gUnk_080FE1DD; adjustedParam = gUnk_080FE1DD[(rand + adjustedParam * 0x40)]; if (adjustedParam == 0) { - itemID = 0; + itemID = ITEM_NONE; } else { - itemID = 0x5c; + itemID = ITEM_KINSTONE; } } break; } } - if (itemID != 0) { - if (itemID != 0xff) { + if (itemID != ITEM_NONE) { + if (itemID != ITEM_ENEMY_BEETLE) { itemEntity = CreateObject(GROUND_ITEM, itemID, adjustedParam); if (itemEntity != NULL) { if (arg0 == &gPlayerEntity) { diff --git a/src/droptables.c b/src/droptables.c new file mode 100644 index 00000000..3ca5ae6e --- /dev/null +++ b/src/droptables.c @@ -0,0 +1,1128 @@ +#include "global.h" +#include "droptables.h" + +const Droptable gUnk_0800137C[] = { + { { + .none = -999, + .rupee1 = -999, + .rupee5 = -999, + .rupee20 = -999, + .hearts = -999, + .fairy = -999, + .bombs = -999, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 300, + .rupee1 = -999, + .rupee5 = -999, + .rupee20 = -999, + .hearts = 100, + .fairy = -999, + .bombs = -999, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = -999, + .rupee1 = -999, + .rupee5 = -999, + .rupee20 = -999, + .hearts = -999, + .fairy = 100, + .bombs = -999, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 36, + .rupee1 = 28, + .rupee5 = 20, + .rupee20 = 16, + .hearts = -999, + .fairy = -999, + .bombs = -999, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 74, + .rupee1 = 10, + .rupee5 = 5, + .rupee20 = 1, + .hearts = 5, + .fairy = -999, + .bombs = -999, + .arrows = -999, + .mysteriousShells = 5, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 100, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, +}; +// not 100% sure +const Droptable gUnk_0800143C[] = { + { { + .none = 73, + .rupee1 = 25, + .rupee5 = -999, + .rupee20 = -999, + .hearts = 5, + .fairy = 0, + .bombs = 1, + .arrows = 1, + .mysteriousShells = 0, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 55, + .rupee1 = -999, + .rupee5 = 70, + .rupee20 = -999, + .hearts = 3, + .fairy = 0, + .bombs = -999, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = 10, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 50, + .rupee1 = -999, + .rupee5 = 26, + .rupee20 = 15, + .hearts = 3, + .fairy = 0, + .bombs = -999, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = 15, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 45, + .rupee1 = -999, + .rupee5 = -999, + .rupee20 = -999, + .hearts = 5, + .fairy = 0, + .bombs = -999, + .arrows = 50, + .mysteriousShells = 0, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 300, + .rupee1 = -999, + .rupee5 = -999, + .rupee20 = -999, + .hearts = -999, + .fairy = -999, + .bombs = 100, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 60, + .rupee1 = 10, + .rupee5 = -999, + .rupee20 = -999, + .hearts = 5, + .fairy = -999, + .bombs = -999, + .arrows = -999, + .mysteriousShells = 10, + .kinstoneGreen = 2, + .kinstoneBlue = 3, + .kinstoneRed = 10, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 70, + .rupee1 = 0, + .rupee5 = -999, + .rupee20 = -999, + .hearts = 30, + .fairy = -999, + .bombs = -999, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 63, + .rupee1 = 10, + .rupee5 = 20, + .rupee20 = -999, + .hearts = 5, + .fairy = 0, + .bombs = 1, + .arrows = 1, + .mysteriousShells = 0, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 50, + .rupee1 = 10, + .rupee5 = 20, + .rupee20 = -999, + .hearts = -999, + .fairy = 0, + .bombs = 20, + .arrows = -999, + .mysteriousShells = 0, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 2, + .kinstoneBlue = 5, + .kinstoneRed = 10, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 40, + .rupee5 = 24, + .rupee20 = 9, + .hearts = 24, + .fairy = 0, + .bombs = 9, + .arrows = 9, + .mysteriousShells = 40, + .kinstoneGreen = 9, + .kinstoneBlue = 12, + .kinstoneRed = 16, + .none2 = 9, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, +}; +// not 100% sure +const Droptable gUnk_080015BC[] = { + { { + .none = 920, + .rupee1 = 15, + .rupee5 = 5, + .rupee20 = -999, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 10, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 900, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = -999, + .hearts = -999, + .fairy = -999, + .bombs = 200, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 11, + .rupee5 = 3, + .rupee20 = 0, + .hearts = 20, + .fairy = 0, + .bombs = 35, + .arrows = 4, + .mysteriousShells = 4, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 3, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, +}; +const Droptable gUnk_0800161C[] = { + { { + .none = 920, + .rupee1 = 30, + .rupee5 = 1, + .rupee20 = 0, + .hearts = 5, + .fairy = 0, + .bombs = 7, + .arrows = 25, + .mysteriousShells = 3, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 9, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 6, + .rupee5 = 1, + .rupee20 = 0, + .hearts = 20, + .fairy = 0, + .bombs = 0, + .arrows = 23, + .mysteriousShells = 2, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 28, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 55, + .rupee5 = 7, + .rupee20 = 0, + .hearts = 1, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 6, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 11, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 23, + .rupee5 = 5, + .rupee20 = 0, + .hearts = 13, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 33, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 6, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 20, + .rupee5 = 3, + .rupee20 = 0, + .hearts = 20, + .fairy = 0, + .bombs = 4, + .arrows = 4, + .mysteriousShells = 3, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 6, + .none2 = 20, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 25, + .rupee5 = 6, + .rupee20 = 0, + .hearts = 40, + .fairy = 0, + .bombs = 1, + .arrows = 1, + .mysteriousShells = 1, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 6, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 18, + .rupee5 = 2, + .rupee20 = 0, + .hearts = 22, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 18, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 5, + .none2 = 15, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 30, + .rupee5 = 1, +#ifdef EU + .rupee20 = 0, +#else + .rupee20 = -10, +#endif + .hearts = 2, + .fairy = 0, + .bombs = 1, + .arrows = 1, + .mysteriousShells = 40, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 5, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 900, + .rupee1 = 16, + .rupee5 = 4, + .rupee20 = 0, + .hearts = 18, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 19, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 15, + .none2 = 28, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 23, + .rupee5 = 15, + .rupee20 = 0, + .hearts = 23, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 9, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 25, + .rupee5 = 25, + .rupee20 = 0, + .hearts = 14, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 1, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 15, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 25, + .rupee5 = 1, + .rupee20 = 0, + .hearts = 25, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 25, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 4, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 800, + .rupee1 = 60, + .rupee5 = 15, + .rupee20 = 0, + .hearts = 80, + .fairy = 0, + .bombs = 20, + .arrows = 0, + .mysteriousShells = 15, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 10, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 15, + .rupee5 = 5, + .rupee20 = -999, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = -999, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 10, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 15, + .rupee5 = 5, + .rupee20 = -999, + .hearts = 0, + .fairy = 0, + .bombs = -999, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 10, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 920, + .rupee1 = 15, + .rupee5 = 5, + .rupee20 = -999, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 10, + .rupee5 = 0, + .rupee20 = -100, + .hearts = 0, + .fairy = 0, + .bombs = -100, + .arrows = -100, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 3, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 4, + .fairy = 0, + .bombs = 1, + .arrows = 1, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = 1, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 100, + .rupee5 = 20, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 140, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = 20, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 300, + .rupee5 = 50, + .rupee20 = 20, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = -999, + .rupee5 = -999, + .rupee20 = -999, + .hearts = 100, + .fairy = -999, + .bombs = -999, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 2, + .rupee5 = 2, + .rupee20 = 2, + .hearts = 2, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, +#ifdef EU + { { + .none = 0, + .rupee1 = -999, + .rupee5 = -999, + .rupee20 = -999, + .hearts = 0, + .fairy = -999, + .bombs = -999, + .arrows = 250, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, +#endif + { { + .none = 0, + .rupee1 = -10, + .rupee5 = -10, + .rupee20 = 10, + .hearts = -10, + .fairy = -10, + .bombs = -10, + .arrows = -10, + .mysteriousShells = 12, + .kinstoneGreen = 1, + .kinstoneBlue = 2, + .kinstoneRed = 10, + .none2 = 30, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = -10, + .rupee5 = 10, + .rupee20 = 20, + .hearts = -10, + .fairy = -10, + .bombs = -10, + .arrows = -10, + .mysteriousShells = 24, + .kinstoneGreen = 2, + .kinstoneBlue = 4, + .kinstoneRed = 20, + .none2 = 10, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, +}; +const Droptable gUnk_0800191C[] = { +#ifdef EU + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, +#else + { { + .none = 78, + .rupee1 = -999, + .rupee5 = -999, + .rupee20 = -999, + .hearts = 2, + .fairy = -999, + .bombs = 0, + .arrows = 20, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 70, + .rupee1 = -999, + .rupee5 = -999, + .rupee20 = -999, + .hearts = 10, + .fairy = -999, + .bombs = 0, + .arrows = 20, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, +#endif + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 250, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 250, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = -999, + .rupee5 = -999, + .rupee20 = 500, + .hearts = -999, + .fairy = -999, + .bombs = -999, + .arrows = -999, + .mysteriousShells = -999, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 250, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 125, + .arrows = 125, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 20, + .kinstoneBlue = 40, + .kinstoneRed = 190, + .none2 = -999, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, +}; + +const Droptable gUnk_08001A1C[] = { + // nop + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 0, + .hearts = 0, + .fairy = 0, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + // all figurines, no more shells + { { + .none = 0, + .rupee1 = 0, + .rupee5 = 0, + .rupee20 = 3, + .hearts = 0, + .fairy = 2, + .bombs = 2, + .arrows = 2, + .mysteriousShells = -999, + .kinstoneGreen = 0, + .kinstoneBlue = 0, + .kinstoneRed = 0, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, + // all fusions, no more kinstones + { { + .none = 0, + .rupee1 = 3, + .rupee5 = 2, + .rupee20 = 1, + .hearts = 3, + .fairy = 5, + .bombs = 0, + .arrows = 0, + .mysteriousShells = 0, + .kinstoneGreen = -999, + .kinstoneBlue = -999, + .kinstoneRed = -999, + .none2 = 0, + .none3 = 0, + .none4 = 0, + .none5 = 0, + } }, +}; diff --git a/src/npc/percy.c b/src/npc/percy.c index 5514e0ac..dea47a15 100644 --- a/src/npc/percy.c +++ b/src/npc/percy.c @@ -123,7 +123,7 @@ void sub_0806B540(Entity* this) { case 2: if ((gMessage.doTextBox & 0x7f) == 0) { context->unk_18 = 3; - if (gSave.stats.filler3[0] != 0) { + if (gSave.stats.hasAllFigurines != 0) { sub_080A7C18(0x58, 0, 0); } else { sub_080A7C18(0x3f, 100, 0); diff --git a/src/object/mask.c b/src/object/mask.c index 1b960d7a..b79eeec6 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -101,7 +101,7 @@ void sub_08092B0C(Entity* this) { CreateFx(this, FX_POT_SHATTER, 0); - sub_0805457C(this, 3); + CreateRandomItemDrop(this, 3); } else { sub_080044EC(this, this->field_0x78.HWORD); diff --git a/src/playerItemUtils.c b/src/playerItemUtils.c index 1dd23ad1..2a9873db 100644 --- a/src/playerItemUtils.c +++ b/src/playerItemUtils.c @@ -31,7 +31,7 @@ void sub_080A7C18(u32 type, u32 type2, u32 delay) { Entity* GiveItemWithCutscene(u32 type, u32 type2, u32 delay) { Entity* e; - if (type == 63 && gSave.stats.filler3[0]) { + if (type == 63 && gSave.stats.hasAllFigurines) { type = 87; type2 = 0; } diff --git a/src/roomInit.c b/src/roomInit.c index baaadce7..fc86e9ca 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -5279,7 +5279,7 @@ void sub_StateChange_HouseInteriors3_StockwellShop(void) { LoadRoomEntityList(&gUnk_080F5848); } } - if (gSave.stats.filler3[0] == 0) { + if (gSave.stats.hasAllFigurines == 0) { LoadRoomEntityList(&gUnk_080F5788); } }