diff --git a/asm/code_0800857C.s b/asm/code_0800857C.s index 7f97b584..0e9c1fc4 100644 --- a/asm/code_0800857C.s +++ b/asm/code_0800857C.s @@ -3542,384 +3542,9 @@ gUnk_08012430:: @ 08012430 gUnk_08012480:: @ 08012480 .incbin "baserom.gba", 0x012480, 0x000027C -gUnk_080126FC:: @ 080126FC - .incbin "baserom.gba", 0x0126FC, 0x00003B4 -gUnk_08012AB0:: @ 08012AB0 - .incbin "baserom.gba", 0x012AB0, 0x00000F8 -gUnk_08012BA8:: @ 08012BA8 - .incbin "baserom.gba", 0x012BA8, 0x0000050 +@ .incbin "baserom.gba", 0x0126FC, 0x00003B4 -gUnk_08012BF8:: @ 08012BF8 - .incbin "baserom.gba", 0x012BF8, 0x0000014 -gUnk_08012C0C:: @ 08012C0C - .incbin "baserom.gba", 0x012C0C, 0x000003C - -gUnk_08012C48:: @ 08012C48 - .incbin "baserom.gba", 0x012C48, 0x0000050 - -gUnk_08012C98:: @ 08012C98 - .incbin "baserom.gba", 0x012C98, 0x0000040 - -gUnk_08012CD8:: @ 08012CD8 - .incbin "baserom.gba", 0x012CD8, 0x0000040 - -gUnk_08012D18:: @ 08012D18 - .incbin "baserom.gba", 0x012D18, 0x0000058 - -gUnk_08012D70:: @ 08012D70 - .incbin "baserom.gba", 0x012D70, 0x0000031 - -gUnk_08012DA1:: @ 08012DA1 - .incbin "baserom.gba", 0x012DA1, 0x000000F - -gUnk_08012DB0:: @ 08012DB0 - .incbin "baserom.gba", 0x012DB0, 0x0000028 - -gUnk_08012DD8:: @ 08012DD8 - .incbin "baserom.gba", 0x012DD8, 0x0000048 - -gUnk_08012E20:: @ 08012E20 - .incbin "baserom.gba", 0x012E20, 0x0000024 - -gUnk_08012E44:: @ 08012E44 - .incbin "baserom.gba", 0x012E44, 0x0000044 - -gUnk_08012E88:: @ 08012E88 - .incbin "baserom.gba", 0x012E88, 0x0000038 - -gUnk_08012EC0:: @ 08012EC0 - .incbin "baserom.gba", 0x012EC0, 0x000004C - -gUnk_08012F0C:: @ 08012F0C - .incbin "baserom.gba", 0x012F0C, 0x00000F5 - -gUnk_08013001:: @ 08013001 - .incbin "baserom.gba", 0x013001, 0x0000002 - -gUnk_08013003:: @ 08013003 - .incbin "baserom.gba", 0x013003, 0x0000008 - -gUnk_0801300B:: @ 0801300B - .incbin "baserom.gba", 0x01300B, 0x0000031 - -gUnk_0801303C:: @ 0801303C - .incbin "baserom.gba", 0x01303C, 0x0000034 - -gUnk_08013070:: @ 08013070 - .incbin "baserom.gba", 0x013070, 0x0000011 - -gUnk_08013081:: @ 08013081 - .incbin "baserom.gba", 0x013081, 0x000000F - -gUnk_08013090:: @ 08013090 - .incbin "baserom.gba", 0x013090, 0x0000084 - -gUnk_08013114:: @ 08013114 - .incbin "baserom.gba", 0x013114, 0x0000074 - -gUnk_08013188:: @ 08013188 - .incbin "baserom.gba", 0x013188, 0x0000024 - -gUnk_080131AC:: @ 080131AC - .incbin "baserom.gba", 0x0131AC, 0x0000138 - -gUnk_080132E4:: @ 080132E4 - .incbin "baserom.gba", 0x0132E4, 0x000004C - -gUnk_08013330:: @ 08013330 - .incbin "baserom.gba", 0x013330, 0x000001C - -gUnk_0801334C:: @ 0801334C - .incbin "baserom.gba", 0x01334C, 0x000002C - -gUnk_08013378:: @ 08013378 - .incbin "baserom.gba", 0x013378, 0x000004C - -gUnk_080133C4:: @ 080133C4 - .incbin "baserom.gba", 0x0133C4, 0x0000034 - -gUnk_080133F8:: @ 080133F8 - .incbin "baserom.gba", 0x0133F8, 0x00000E4 - -gUnk_080134DC:: @ 080134DC - .incbin "baserom.gba", 0x0134DC, 0x00001FC - -gUnk_080136D8:: @ 080136D8 - .incbin "baserom.gba", 0x0136D8, 0x0000048 - -gUnk_08013720:: @ 08013720 - .incbin "baserom.gba", 0x013720, 0x00000BA - -gUnk_080137DA:: @ 080137DA - .incbin "baserom.gba", 0x0137DA, 0x00000DA - -gUnk_080138B4:: @ 080138B4 - .incbin "baserom.gba", 0x0138B4, 0x0000264 - -gUnk_08013B18:: @ 08013B18 - .incbin "baserom.gba", 0x013B18, 0x0000058 - -gUnk_08013B70:: @ 08013B70 - .incbin "baserom.gba", 0x013B70, 0x0000038 - -gUnk_08013BA8:: @ 08013BA8 - .incbin "baserom.gba", 0x013BA8, 0x0000040 - -gUnk_08013BE8:: @ 08013BE8 - .incbin "baserom.gba", 0x013BE8, 0x00000BC - -gUnk_08013CA4:: @ 08013CA4 - .incbin "baserom.gba", 0x013CA4, 0x0000160 - -gUnk_08013E04:: @ 08013E04 - .incbin "baserom.gba", 0x013E04, 0x0000048 - -gUnk_08013E4C:: @ 08013E4C - .incbin "baserom.gba", 0x013E4C, 0x0000024 - -gUnk_08013E70:: @ 08013E70 - .incbin "baserom.gba", 0x013E70, 0x0000024 - -gUnk_08013E94:: @ 08013E94 - .incbin "baserom.gba", 0x013E94, 0x000001C - -gUnk_08013EB0:: @ 08013EB0 - .incbin "baserom.gba", 0x013EB0, 0x000001C - -gUnk_08013ECC:: @ 08013ECC - .incbin "baserom.gba", 0x013ECC, 0x000001C - -gUnk_08013EE8:: @ 08013EE8 - .incbin "baserom.gba", 0x013EE8, 0x000001C - -gUnk_08013F04:: @ 08013F04 - .incbin "baserom.gba", 0x013F04, 0x0000030 - -gUnk_08013F34:: @ 08013F34 - .incbin "baserom.gba", 0x013F34, 0x0000030 - -gUnk_08013F64:: @ 08013F64 - .incbin "baserom.gba", 0x013F64, 0x0000030 - -gUnk_08013F94:: @ 08013F94 - .incbin "baserom.gba", 0x013F94, 0x0000054 - -gUnk_08013FE8:: @ 08013FE8 - .incbin "baserom.gba", 0x013FE8, 0x000006C - -gUnk_08014054:: @ 08014054 - .incbin "baserom.gba", 0x014054, 0x0000020 - -gUnk_08014074:: @ 08014074 - .incbin "baserom.gba", 0x014074, 0x0000020 - -gUnk_08014094:: @ 08014094 - .incbin "baserom.gba", 0x014094, 0x0000048 - -gUnk_080140DC:: @ 080140DC - .incbin "baserom.gba", 0x0140DC, 0x000001C - -gUnk_080140F8:: @ 080140F8 - .incbin "baserom.gba", 0x0140F8, 0x0000020 - -gUnk_08014118:: @ 08014118 - .incbin "baserom.gba", 0x014118, 0x000003C - -gUnk_08014154:: @ 08014154 - .incbin "baserom.gba", 0x014154, 0x0000088 - -gUnk_080141DC:: @ 080141DC - .incbin "baserom.gba", 0x0141DC, 0x0000034 - -gUnk_08014210:: @ 08014210 - .incbin "baserom.gba", 0x014210, 0x0000064 - -gUnk_08014274:: @ 08014274 - .incbin "baserom.gba", 0x014274, 0x000003C - -gUnk_080142B0:: @ 080142B0 - .incbin "baserom.gba", 0x0142B0, 0x00000D4 - -gUnk_08014384:: @ 08014384 - .incbin "baserom.gba", 0x014384, 0x000003C - -gUnk_080143C0:: @ 080143C0 - .incbin "baserom.gba", 0x0143C0, 0x0000042 - -gUnk_08014402:: @ 08014402 - .incbin "baserom.gba", 0x014402, 0x000004E - -gUnk_08014450:: @ 08014450 - .incbin "baserom.gba", 0x014450, 0x00000BC - -gUnk_0801450C:: @ 0801450C - .incbin "baserom.gba", 0x01450C, 0x000003C - -gUnk_08014548:: @ 08014548 - .incbin "baserom.gba", 0x014548, 0x0000058 - -gUnk_080145A0:: @ 080145A0 - .incbin "baserom.gba", 0x0145A0, 0x0000010 - -gUnk_080145B0:: @ 080145B0 - .incbin "baserom.gba", 0x0145B0, 0x0000038 - -gUnk_080145E8:: @ 080145E8 - .incbin "baserom.gba", 0x0145E8, 0x0000040 - -gUnk_08014628:: @ 08014628 - .incbin "baserom.gba", 0x014628, 0x00001DC - -gUnk_08014804:: @ 08014804 - .incbin "baserom.gba", 0x014804, 0x00000EC - -gUnk_080148F0:: @ 080148F0 - .incbin "baserom.gba", 0x0148F0, 0x0000068 - -gUnk_08014958:: @ 08014958 - .incbin "baserom.gba", 0x014958, 0x000003C - -gUnk_08014994:: @ 08014994 - .incbin "baserom.gba", 0x014994, 0x0000038 - -gUnk_080149CC:: @ 080149CC - .incbin "baserom.gba", 0x0149CC, 0x000005C - -gUnk_08014A28:: @ 08014A28 - .incbin "baserom.gba", 0x014A28, 0x000002C - -gUnk_08014A54:: @ 08014A54 - .incbin "baserom.gba", 0x014A54, 0x000002C - -gUnk_08014A80:: @ 08014A80 - .incbin "baserom.gba", 0x014A80, 0x0000044 - -gUnk_08014AC4:: @ 08014AC4 - .incbin "baserom.gba", 0x014AC4, 0x0000070 - -gUnk_08014B34:: @ 08014B34 - .incbin "baserom.gba", 0x014B34, 0x00000F8 - -gUnk_08014C2C:: @ 08014C2C - .incbin "baserom.gba", 0x014C2C, 0x0000068 - -gUnk_08014C94:: @ 08014C94 - .incbin "baserom.gba", 0x014C94, 0x0000048 - -gUnk_08014CDC:: @ 08014CDC - .incbin "baserom.gba", 0x014CDC, 0x00000F0 - -gUnk_08014DCC:: @ 08014DCC - .incbin "baserom.gba", 0x014DCC, 0x0000048 - -gUnk_08014E14:: @ 08014E14 - .incbin "baserom.gba", 0x014E14, 0x000003C - -gUnk_08014E50:: @ 08014E50 - .incbin "baserom.gba", 0x014E50, 0x000007C - -gUnk_08014ECC:: @ 08014ECC - .incbin "baserom.gba", 0x014ECC, 0x000002C - -gUnk_08014EF8:: @ 08014EF8 - .incbin "baserom.gba", 0x014EF8, 0x0000038 - -gUnk_08014F30:: @ 08014F30 - .incbin "baserom.gba", 0x014F30, 0x000008C - -gUnk_08014FBC:: @ 08014FBC - .incbin "baserom.gba", 0x014FBC, 0x0000045 - -gUnk_08015001:: @ 08015001 - .incbin "baserom.gba", 0x015001, 0x0000086 - -gUnk_08015087:: @ 08015087 - .incbin "baserom.gba", 0x015087, 0x0000068 - -gUnk_080150EF:: @ 080150EF - .incbin "baserom.gba", 0x0150EF, 0x0000145 - -gUnk_08015234:: @ 08015234 - .incbin "baserom.gba", 0x015234, 0x0000080 - -gUnk_080152B4:: @ 080152B4 - .incbin "baserom.gba", 0x0152B4, 0x00000DC - -gUnk_08015390:: @ 08015390 - .incbin "baserom.gba", 0x015390, 0x000005C - -gUnk_080153EC:: @ 080153EC - .incbin "baserom.gba", 0x0153EC, 0x0000120 - -gUnk_0801550C:: @ 0801550C - .incbin "baserom.gba", 0x01550C, 0x000010C - -gUnk_08015618:: @ 08015618 - .incbin "baserom.gba", 0x015618, 0x000006C - -gUnk_08015684:: @ 08015684 - .incbin "baserom.gba", 0x015684, 0x000001C - -gUnk_080156A0:: @ 080156A0 - .incbin "baserom.gba", 0x0156A0, 0x00000B4 - -gUnk_08015754:: @ 08015754 - .incbin "baserom.gba", 0x015754, 0x0000058 - -gUnk_080157AC:: @ 080157AC - .incbin "baserom.gba", 0x0157AC, 0x000014C - -gUnk_080158F8:: @ 080158F8 - .incbin "baserom.gba", 0x0158F8, 0x0000040 - -gUnk_08015938:: @ 08015938 - .incbin "baserom.gba", 0x015938, 0x0000020 - -gUnk_08015958:: @ 08015958 - .incbin "baserom.gba", 0x015958, 0x000016C - -gUnk_08015AC4:: @ 08015AC4 - .incbin "baserom.gba", 0x015AC4, 0x0000050 - -gUnk_08015B14:: @ 08015B14 - .incbin "baserom.gba", 0x015B14, 0x0000020 - -gUnk_08015B34:: @ 08015B34 - .incbin "baserom.gba", 0x015B34, 0x0000050 - -gUnk_08015B84:: @ 08015B84 - .incbin "baserom.gba", 0x015B84, 0x0000024 - -gUnk_08015BA8:: @ 08015BA8 - .incbin "baserom.gba", 0x015BA8, 0x0000040 - -gUnk_08015BE8:: @ 08015BE8 - .incbin "baserom.gba", 0x015BE8, 0x00000EC - -gUnk_08015CD4:: @ 08015CD4 - .incbin "baserom.gba", 0x015CD4, 0x000011C - -gUnk_08015DF0:: @ 08015DF0 - .incbin "baserom.gba", 0x015DF0, 0x0000068 - -gUnk_08015E58:: @ 08015E58 - .incbin "baserom.gba", 0x015E58, 0x00000B0 - -gUnk_08015F08:: @ 08015F08 - .incbin "baserom.gba", 0x015F08, 0x0000034 - -gUnk_08015F3C:: @ 08015F3C - .incbin "baserom.gba", 0x015F3C, 0x0000068 - -gUnk_08015FA4:: @ 08015FA4 - .incbin "baserom.gba", 0x015FA4, 0x000001C - -gUnk_08015FC0:: @ 08015FC0 - .incbin "baserom.gba", 0x015FC0, 0x0000061 - -gUnk_08016021:: @ 08016021 - .incbin "baserom.gba", 0x016021, 0x000000F diff --git a/asm/code_08012AB0.s b/asm/code_08012AB0.s new file mode 100644 index 00000000..cbe339f3 --- /dev/null +++ b/asm/code_08012AB0.s @@ -0,0 +1,384 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text +gUnk_08012AB0:: @ 08012AB0 + .incbin "baserom.gba", 0x012AB0, 0x00000F8 + +gUnk_08012BA8:: @ 08012BA8 + .incbin "baserom.gba", 0x012BA8, 0x0000050 + +gUnk_08012BF8:: @ 08012BF8 + .incbin "baserom.gba", 0x012BF8, 0x0000014 + +gUnk_08012C0C:: @ 08012C0C + .incbin "baserom.gba", 0x012C0C, 0x000003C + +gUnk_08012C48:: @ 08012C48 + .incbin "baserom.gba", 0x012C48, 0x0000050 + +gUnk_08012C98:: @ 08012C98 + .incbin "baserom.gba", 0x012C98, 0x0000040 + +gUnk_08012CD8:: @ 08012CD8 + .incbin "baserom.gba", 0x012CD8, 0x0000040 + +gUnk_08012D18:: @ 08012D18 + .incbin "baserom.gba", 0x012D18, 0x0000058 + +gUnk_08012D70:: @ 08012D70 + .incbin "baserom.gba", 0x012D70, 0x0000031 + +gUnk_08012DA1:: @ 08012DA1 + .incbin "baserom.gba", 0x012DA1, 0x000000F + +gUnk_08012DB0:: @ 08012DB0 + .incbin "baserom.gba", 0x012DB0, 0x0000028 + +gUnk_08012DD8:: @ 08012DD8 + .incbin "baserom.gba", 0x012DD8, 0x0000048 + +gUnk_08012E20:: @ 08012E20 + .incbin "baserom.gba", 0x012E20, 0x0000024 + +gUnk_08012E44:: @ 08012E44 + .incbin "baserom.gba", 0x012E44, 0x0000044 + +gUnk_08012E88:: @ 08012E88 + .incbin "baserom.gba", 0x012E88, 0x0000038 + +gUnk_08012EC0:: @ 08012EC0 + .incbin "baserom.gba", 0x012EC0, 0x000004C + +gUnk_08012F0C:: @ 08012F0C + .incbin "baserom.gba", 0x012F0C, 0x00000F5 + +gUnk_08013001:: @ 08013001 + .incbin "baserom.gba", 0x013001, 0x0000002 + +gUnk_08013003:: @ 08013003 + .incbin "baserom.gba", 0x013003, 0x0000008 + +gUnk_0801300B:: @ 0801300B + .incbin "baserom.gba", 0x01300B, 0x0000031 + +gUnk_0801303C:: @ 0801303C + .incbin "baserom.gba", 0x01303C, 0x0000034 + +gUnk_08013070:: @ 08013070 + .incbin "baserom.gba", 0x013070, 0x0000011 + +gUnk_08013081:: @ 08013081 + .incbin "baserom.gba", 0x013081, 0x000000F + +gUnk_08013090:: @ 08013090 + .incbin "baserom.gba", 0x013090, 0x0000084 + +gUnk_08013114:: @ 08013114 + .incbin "baserom.gba", 0x013114, 0x0000074 + +gUnk_08013188:: @ 08013188 + .incbin "baserom.gba", 0x013188, 0x0000024 + +gUnk_080131AC:: @ 080131AC + .incbin "baserom.gba", 0x0131AC, 0x0000138 + +gUnk_080132E4:: @ 080132E4 + .incbin "baserom.gba", 0x0132E4, 0x000004C + +gUnk_08013330:: @ 08013330 + .incbin "baserom.gba", 0x013330, 0x000001C + +gUnk_0801334C:: @ 0801334C + .incbin "baserom.gba", 0x01334C, 0x000002C + +gUnk_08013378:: @ 08013378 + .incbin "baserom.gba", 0x013378, 0x000004C + +gUnk_080133C4:: @ 080133C4 + .incbin "baserom.gba", 0x0133C4, 0x0000034 + +gUnk_080133F8:: @ 080133F8 + .incbin "baserom.gba", 0x0133F8, 0x00000E4 + +gUnk_080134DC:: @ 080134DC + .incbin "baserom.gba", 0x0134DC, 0x00001FC + +gUnk_080136D8:: @ 080136D8 + .incbin "baserom.gba", 0x0136D8, 0x0000048 + +gUnk_08013720:: @ 08013720 + .incbin "baserom.gba", 0x013720, 0x00000BA + +gUnk_080137DA:: @ 080137DA + .incbin "baserom.gba", 0x0137DA, 0x00000DA + +gUnk_080138B4:: @ 080138B4 + .incbin "baserom.gba", 0x0138B4, 0x0000264 + +gUnk_08013B18:: @ 08013B18 + .incbin "baserom.gba", 0x013B18, 0x0000058 + +gUnk_08013B70:: @ 08013B70 + .incbin "baserom.gba", 0x013B70, 0x0000038 + +gUnk_08013BA8:: @ 08013BA8 + .incbin "baserom.gba", 0x013BA8, 0x0000040 + +gUnk_08013BE8:: @ 08013BE8 + .incbin "baserom.gba", 0x013BE8, 0x00000BC + +gUnk_08013CA4:: @ 08013CA4 + .incbin "baserom.gba", 0x013CA4, 0x0000160 + +gUnk_08013E04:: @ 08013E04 + .incbin "baserom.gba", 0x013E04, 0x0000048 + +gUnk_08013E4C:: @ 08013E4C + .incbin "baserom.gba", 0x013E4C, 0x0000024 + +gUnk_08013E70:: @ 08013E70 + .incbin "baserom.gba", 0x013E70, 0x0000024 + +gUnk_08013E94:: @ 08013E94 + .incbin "baserom.gba", 0x013E94, 0x000001C + +gUnk_08013EB0:: @ 08013EB0 + .incbin "baserom.gba", 0x013EB0, 0x000001C + +gUnk_08013ECC:: @ 08013ECC + .incbin "baserom.gba", 0x013ECC, 0x000001C + +gUnk_08013EE8:: @ 08013EE8 + .incbin "baserom.gba", 0x013EE8, 0x000001C + +gUnk_08013F04:: @ 08013F04 + .incbin "baserom.gba", 0x013F04, 0x0000030 + +gUnk_08013F34:: @ 08013F34 + .incbin "baserom.gba", 0x013F34, 0x0000030 + +gUnk_08013F64:: @ 08013F64 + .incbin "baserom.gba", 0x013F64, 0x0000030 + +gUnk_08013F94:: @ 08013F94 + .incbin "baserom.gba", 0x013F94, 0x0000054 + +gUnk_08013FE8:: @ 08013FE8 + .incbin "baserom.gba", 0x013FE8, 0x000006C + +gUnk_08014054:: @ 08014054 + .incbin "baserom.gba", 0x014054, 0x0000020 + +gUnk_08014074:: @ 08014074 + .incbin "baserom.gba", 0x014074, 0x0000020 + +gUnk_08014094:: @ 08014094 + .incbin "baserom.gba", 0x014094, 0x0000048 + +gUnk_080140DC:: @ 080140DC + .incbin "baserom.gba", 0x0140DC, 0x000001C + +gUnk_080140F8:: @ 080140F8 + .incbin "baserom.gba", 0x0140F8, 0x0000020 + +gUnk_08014118:: @ 08014118 + .incbin "baserom.gba", 0x014118, 0x000003C + +gUnk_08014154:: @ 08014154 + .incbin "baserom.gba", 0x014154, 0x0000088 + +gUnk_080141DC:: @ 080141DC + .incbin "baserom.gba", 0x0141DC, 0x0000034 + +gUnk_08014210:: @ 08014210 + .incbin "baserom.gba", 0x014210, 0x0000064 + +gUnk_08014274:: @ 08014274 + .incbin "baserom.gba", 0x014274, 0x000003C + +gUnk_080142B0:: @ 080142B0 + .incbin "baserom.gba", 0x0142B0, 0x00000D4 + +gUnk_08014384:: @ 08014384 + .incbin "baserom.gba", 0x014384, 0x000003C + +gUnk_080143C0:: @ 080143C0 + .incbin "baserom.gba", 0x0143C0, 0x0000042 + +gUnk_08014402:: @ 08014402 + .incbin "baserom.gba", 0x014402, 0x000004E + +gUnk_08014450:: @ 08014450 + .incbin "baserom.gba", 0x014450, 0x00000BC + +gUnk_0801450C:: @ 0801450C + .incbin "baserom.gba", 0x01450C, 0x000003C + +gUnk_08014548:: @ 08014548 + .incbin "baserom.gba", 0x014548, 0x0000058 + +gUnk_080145A0:: @ 080145A0 + .incbin "baserom.gba", 0x0145A0, 0x0000010 + +gUnk_080145B0:: @ 080145B0 + .incbin "baserom.gba", 0x0145B0, 0x0000038 + +gUnk_080145E8:: @ 080145E8 + .incbin "baserom.gba", 0x0145E8, 0x0000040 + +gUnk_08014628:: @ 08014628 + .incbin "baserom.gba", 0x014628, 0x00001DC + +gUnk_08014804:: @ 08014804 + .incbin "baserom.gba", 0x014804, 0x00000EC + +gUnk_080148F0:: @ 080148F0 + .incbin "baserom.gba", 0x0148F0, 0x0000068 + +gUnk_08014958:: @ 08014958 + .incbin "baserom.gba", 0x014958, 0x000003C + +gUnk_08014994:: @ 08014994 + .incbin "baserom.gba", 0x014994, 0x0000038 + +gUnk_080149CC:: @ 080149CC + .incbin "baserom.gba", 0x0149CC, 0x000005C + +gUnk_08014A28:: @ 08014A28 + .incbin "baserom.gba", 0x014A28, 0x000002C + +gUnk_08014A54:: @ 08014A54 + .incbin "baserom.gba", 0x014A54, 0x000002C + +gUnk_08014A80:: @ 08014A80 + .incbin "baserom.gba", 0x014A80, 0x0000044 + +gUnk_08014AC4:: @ 08014AC4 + .incbin "baserom.gba", 0x014AC4, 0x0000070 + +gUnk_08014B34:: @ 08014B34 + .incbin "baserom.gba", 0x014B34, 0x00000F8 + +gUnk_08014C2C:: @ 08014C2C + .incbin "baserom.gba", 0x014C2C, 0x0000068 + +gUnk_08014C94:: @ 08014C94 + .incbin "baserom.gba", 0x014C94, 0x0000048 + +gUnk_08014CDC:: @ 08014CDC + .incbin "baserom.gba", 0x014CDC, 0x00000F0 + +gUnk_08014DCC:: @ 08014DCC + .incbin "baserom.gba", 0x014DCC, 0x0000048 + +gUnk_08014E14:: @ 08014E14 + .incbin "baserom.gba", 0x014E14, 0x000003C + +gUnk_08014E50:: @ 08014E50 + .incbin "baserom.gba", 0x014E50, 0x000007C + +gUnk_08014ECC:: @ 08014ECC + .incbin "baserom.gba", 0x014ECC, 0x000002C + +gUnk_08014EF8:: @ 08014EF8 + .incbin "baserom.gba", 0x014EF8, 0x0000038 + +gUnk_08014F30:: @ 08014F30 + .incbin "baserom.gba", 0x014F30, 0x000008C + +gUnk_08014FBC:: @ 08014FBC + .incbin "baserom.gba", 0x014FBC, 0x0000045 + +gUnk_08015001:: @ 08015001 + .incbin "baserom.gba", 0x015001, 0x0000086 + +gUnk_08015087:: @ 08015087 + .incbin "baserom.gba", 0x015087, 0x0000068 + +gUnk_080150EF:: @ 080150EF + .incbin "baserom.gba", 0x0150EF, 0x0000145 + +gUnk_08015234:: @ 08015234 + .incbin "baserom.gba", 0x015234, 0x0000080 + +gUnk_080152B4:: @ 080152B4 + .incbin "baserom.gba", 0x0152B4, 0x00000DC + +gUnk_08015390:: @ 08015390 + .incbin "baserom.gba", 0x015390, 0x000005C + +gUnk_080153EC:: @ 080153EC + .incbin "baserom.gba", 0x0153EC, 0x0000120 + +gUnk_0801550C:: @ 0801550C + .incbin "baserom.gba", 0x01550C, 0x000010C + +gUnk_08015618:: @ 08015618 + .incbin "baserom.gba", 0x015618, 0x000006C + +gUnk_08015684:: @ 08015684 + .incbin "baserom.gba", 0x015684, 0x000001C + +gUnk_080156A0:: @ 080156A0 + .incbin "baserom.gba", 0x0156A0, 0x00000B4 + +gUnk_08015754:: @ 08015754 + .incbin "baserom.gba", 0x015754, 0x0000058 + +gUnk_080157AC:: @ 080157AC + .incbin "baserom.gba", 0x0157AC, 0x000014C + +gUnk_080158F8:: @ 080158F8 + .incbin "baserom.gba", 0x0158F8, 0x0000040 + +gUnk_08015938:: @ 08015938 + .incbin "baserom.gba", 0x015938, 0x0000020 + +gUnk_08015958:: @ 08015958 + .incbin "baserom.gba", 0x015958, 0x000016C + +gUnk_08015AC4:: @ 08015AC4 + .incbin "baserom.gba", 0x015AC4, 0x0000050 + +gUnk_08015B14:: @ 08015B14 + .incbin "baserom.gba", 0x015B14, 0x0000020 + +gUnk_08015B34:: @ 08015B34 + .incbin "baserom.gba", 0x015B34, 0x0000050 + +gUnk_08015B84:: @ 08015B84 + .incbin "baserom.gba", 0x015B84, 0x0000024 + +gUnk_08015BA8:: @ 08015BA8 + .incbin "baserom.gba", 0x015BA8, 0x0000040 + +gUnk_08015BE8:: @ 08015BE8 + .incbin "baserom.gba", 0x015BE8, 0x00000EC + +gUnk_08015CD4:: @ 08015CD4 + .incbin "baserom.gba", 0x015CD4, 0x000011C + +gUnk_08015DF0:: @ 08015DF0 + .incbin "baserom.gba", 0x015DF0, 0x0000068 + +gUnk_08015E58:: @ 08015E58 + .incbin "baserom.gba", 0x015E58, 0x00000B0 + +gUnk_08015F08:: @ 08015F08 + .incbin "baserom.gba", 0x015F08, 0x0000034 + +gUnk_08015F3C:: @ 08015F3C + .incbin "baserom.gba", 0x015F3C, 0x0000068 + +gUnk_08015FA4:: @ 08015FA4 + .incbin "baserom.gba", 0x015FA4, 0x000001C + +gUnk_08015FC0:: @ 08015FC0 + .incbin "baserom.gba", 0x015FC0, 0x0000061 + +gUnk_08016021:: @ 08016021 + .incbin "baserom.gba", 0x016021, 0x000000F + diff --git a/asm/code_rest.s b/asm/code_0801606C.s similarity index 100% rename from asm/code_rest.s rename to asm/code_0801606C.s diff --git a/linker.ld b/linker.ld index 29fd6003..a91e8495 100644 --- a/linker.ld +++ b/linker.ld @@ -295,8 +295,10 @@ SECTIONS { asm/code_080043E8.o(.text); data/data_08007DF4.o(.rodata); asm/code_0800857C.o(.text); + src/scripts/ezlo_angry.o(.rodata); + asm/code_08012AB0.o(.text); src/scripts/npc4e_fusion.o(.rodata); - asm/code_rest.o(.text); + asm/code_0801606C.o(.text); asm/sub_08016AE4.o(.text); diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c index 201c0e4e..8b959949 100644 --- a/src/npc/ezloCap.c +++ b/src/npc/ezloCap.c @@ -52,7 +52,7 @@ typedef struct { u8 unk_20[2]; u16 field_22; } paramStruct; - +// This is a ScriptExecutionContext TODO void sub_0806D8A0(Entity* this, paramStruct* param_2) { s32 xOffset; s32 yOffset; diff --git a/src/script.c b/src/script.c index 6d136b5a..bef65e05 100644 --- a/src/script.c +++ b/src/script.c @@ -647,6 +647,7 @@ void sub_0807E014(Entity* unk1, ScriptExecutionContext* unk2) { gUnk_02033280.continueScriptExecutionFlags &= ~2; } +// Jump by offset void sub_0807E024(Entity* unk1, ScriptExecutionContext* unk2) { s16 tmp; // get metadata -> tmp @@ -677,6 +678,7 @@ void sub_0807E078(Entity* unk1, ScriptExecutionContext* unk2) { } } +// repoint the execution somewhere else void sub_0807E0A0(Entity* unk1, ScriptExecutionContext* unk2) { unk2->unk_00.raw = (u16*)GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00.raw); gUnk_02033280.unk_06 = 0; @@ -1483,10 +1485,12 @@ void sub_0807EF3C(Entity* unk1, ScriptExecutionContext* unk2) { gUnk_02033280.unk_06 = 0; } +// set one bit in unk_08 void sub_0807EF80(Entity* unk1, ScriptExecutionContext* unk2) { unk2->unk_08 |= 1 << unk2->unk_00.raw[1]; } +// set one bit in unk_08 void sub_0807EF90(Entity* unk1, ScriptExecutionContext* unk2) { unk2->unk_08 |= 1 << unk2->unk_00.raw[1]; } diff --git a/src/scripts/ezlo_angry.c b/src/scripts/ezlo_angry.c new file mode 100644 index 00000000..38cb04b0 --- /dev/null +++ b/src/scripts/ezlo_angry.c @@ -0,0 +1,14 @@ +#define START_SCRIPT(name) const unsigned short name[] = { +#define END_SCRIPT() \ + } \ + ; + +/*const unsigned char test[] = { + 0x01, 0x04, 0x67, 0x08, 0x40, 0x00, 0x79, 0x08, 0x07, 0x00, 0x02, 0x04, 0x50, 0x08, 0x20, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x22, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x02, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x03, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x11, 0x00, 0x50, 0x08, 0x1c, 0x00, 0x5c, 0x0c, 0x05, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x22, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x06, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x07, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x21, 0x00, 0x0b, 0x0c, 0xc9, 0xf3, 0x07, 0x08, 0x5c, 0x0c, 0x08, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1c, 0x00, 0x0b, 0x0c, 0x6d, 0xd9, 0x06, 0x08, 0x5c, 0x0c, 0x09, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x15, 0x08, 0x00, 0x00, 0x04, 0x08, 0x28, 0x00, 0x18, 0x04, 0x05, 0x08, 0xf0, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x14, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x20, 0x00, 0x44, 0x04, 0x03, 0x08, 0xd0, 0xff, 0x43, 0x04, 0x54, 0x04, 0x0c, 0x14, 0xb1, 0xf5, 0x07, 0x08, 0x3c, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0xd1, 0x91, 0x07, 0x08, 0x02, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x0b, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0a, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0b, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x79, 0x08, 0x04, 0x00, 0x31, 0x08, 0x3c, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0c, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0d, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x1f, 0x00, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0e, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x10, 0x00, 0x79, 0x08, 0x0a, 0x00, 0x53, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x0f, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x10, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0x09, 0xd9, 0x06, 0x08, 0x6d, 0x08, 0x50, 0x00, 0x50, 0x08, 0x18, 0x00, 0x59, 0x04, 0x0b, 0x0c, 0x51, 0xdf, 0x07, 0x08, 0x44, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x33, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x02, 0x04, 0x01, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x18, 0x04, 0x04, 0x08, 0x0e, 0x00, 0x17, 0x08, 0x30, 0x30, 0x05, 0x08, 0x20, 0x00, 0x03, 0x08, 0xe6, 0xff, 0x43, 0x04, 0x50, 0x08, 0x10, 0x00, 0x02, 0x04, 0x5c, 0x0c, 0x15, 0x11, 0x0c, 0x00, 0x59, 0x04, 0x50, 0x08, 0x18, 0x00, 0x44, 0x04, 0x03, 0x08, 0xcc, 0xff, 0x02, 0x04, 0x43, 0x04, 0x0b, 0x0c, 0xa5, 0xf9, 0x07, 0x08, 0x0b, 0x0c, 0x29, 0xdf, 0x07, 0x08, 0x7e, 0x04, 0x79, 0x08, 0x0b, 0x00, 0x64, 0x04, 0x0b, 0x0c, 0x45, 0xd9, 0x06, 0x08, 0x50, 0x08, 0x10, 0x00, 0x5c, 0x0c, 0x11, 0x11, 0x0c, 0x00, 0x50, 0x08, 0x18, 0x00, 0x67, 0x08, 0x80, 0x00, 0x0b, 0x0c, 0xa1, 0xd8, 0x06, 0x08, 0x75, 0x04, 0x05, 0x08, 0xfc, 0xff, 0x50, 0x08, 0x1f, 0x00, 0x59, 0x04, 0x47, 0x0c, 0x18, 0x2b, 0x01, 0x08, 0x0b, 0x0c, 0xa5, 0xd9, 0x06, 0x08, 0x79, 0x08, 0x08, 0x00, 0x31, 0x08, 0x78, 0x00, 0x7c, 0x08, 0x0e, 0x00, 0x01, 0x04, 0x4b, 0x04, 0x5f, 0x08, 0x12, 0x11, 0x02, 0x04, 0x59, 0x04, 0x28, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x79, 0x08, 0x06, 0x00, 0xff, 0xff +};*/ + +// clang-format off +START_SCRIPT(gUnk_080126FC) +0x0401, 0x0867, 0x0040, 0x0879, 0x0007, 0x0402, 0x0850, 0x0020, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0022, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1102, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0021, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1103, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0004, 0x0831, 0x003c, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0011, 0x0850, 0x001c, 0x0c5c, 0x1105, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0022, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1106, 0x000c, 0x0459, 0x0850, 0x001c, 0x0c0b, 0xd96d, 0x0806, 0x0c5c, 0x1107, 0x000c, 0x0459, 0x0850, 0x0020, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0021, 0x0c0b, 0xf3c9, 0x0807, 0x0c5c, 0x1108, 0x000c, 0x0459, 0x0850, 0x001c, 0x0c0b, 0xd96d, 0x0806, 0x0c5c, 0x1109, 0x000c, 0x0459, 0x0850, 0x0020, 0x0879, 0x000a, 0x0453, 0x0c28, 0x0008, 0x0000, 0x0402, 0x0401, 0x0815, 0x0000, 0x0804, 0x0028, 0x0418, 0x0805, 0xfff0, 0x0402, 0x0443, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1114, 0x000c, 0x0459, 0x0850, 0x0020, 0x0444, 0x0803, 0xffd0, 0x0443, 0x0454, 0x140c, 0xf5b1, 0x0807, 0x003c, 0x0000, 0x0c0b, 0x91d1, 0x0807, 0x0402, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x000b, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x110a, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110b, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0879, 0x0004, 0x0831, 0x003c, 0x0850, 0x0010, 0x0c5c, 0x110c, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110d, 0x000c, 0x0459, 0x0850, 0x001f, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0850, 0x0010, 0x0c5c, 0x110e, 0x000c, 0x0459, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0010, 0x0879, 0x000a, 0x0453, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x110f, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0050, 0x0459, 0x0c0b, 0xdf51, 0x0807, 0x0444, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1110, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd909, 0x0806, 0x086d, 0x0050, 0x0850, 0x0018, 0x0459, 0x0c0b, 0xdf51, 0x0807, 0x0444, 0x0c28, 0x0008, 0x0000, 0x0c33, 0x0004, 0x0000, 0x0402, 0x0401, 0x0c0b, 0xd945, 0x0806, 0x0418, 0x0804, 0x000e, 0x0817, 0x3030, 0x0805, 0x0020, 0x0803, 0xffe6, 0x0443, 0x0850, 0x0010, 0x0402, 0x0c5c, 0x1115, 0x000c, 0x0459, 0x0850, 0x0018, 0x0444, 0x0803, 0xffcc, 0x0402, 0x0443, 0x0c0b, 0xf9a5, 0x0807, 0x0c0b, 0xdf29, 0x0807, 0x047e, 0x0879, 0x000b, 0x0464, 0x0c0b, 0xd945, 0x0806, 0x0850, 0x0010, 0x0c5c, 0x1111, 0x000c, 0x0850, 0x0018, 0x0867, 0x0080, 0x0c0b, 0xd8a1, 0x0806, 0x0475, 0x0805, 0xfffc, 0x0850, 0x001f, 0x0459, 0x0c47, 0x2b18, 0x0801, 0x0c0b, 0xd9a5, 0x0806, 0x0879, 0x0008, 0x0831, 0x0078, 0x087c, 0x000e, 0x0401, 0x044b, 0x085f, 0x1112, 0x0402, 0x0459, 0x0c28, 0x0008, 0x0000, 0x0879, 0x0006, 0xffff +END_SCRIPT() + // clang-format on \ No newline at end of file diff --git a/src/scripts/npc4e_fusion.c b/src/scripts/npc4e_fusion.c index ad010b1c..ad07d84e 100644 --- a/src/scripts/npc4e_fusion.c +++ b/src/scripts/npc4e_fusion.c @@ -1,33 +1,35 @@ // macro helpers -#define WORD_TO_SHORTS(word, b) word, b +#define WORD_TO_SHORTS(word) (unsigned short)word & 0x00ff,(unsigned short)word >> 16, // script commands #define START_EXECUTING_SCRIPTS() 0x0401, #define STOP_EXECUTING_SCRIPTS() 0x0402, #define CHECK_KINSTONE_FUSED(id) 0x081d, id, #define JUMP_IF_TRUE(offset) 0x0804, offset, -#define sub_0807E6AC(word, b) 0x0c33, WORD_TO_SHORTS(word, b), +#define sub_0807E6AC(word) 0x0c33, WORD_TO_SHORTS(word) #define sub_0807EF80(param) 0x0879, param, #define sub_0807E680(param) 0x0831, param, #define sub_0807EBC0(param) 0x0867, param, #define sub_0807ECF4(param) 0x0871, param, #define sub_0807E680(param) 0x0831, param, #define sub_0807EF80(param) 0x0879, param, -#define sub_0807E5F8(a, b) 0x0c28, a, b, +#define sub_0807E5F8(word) 0x0c28, WORD_TO_SHORTS(word) + + const unsigned short gUnk_08016030[] = { // clang-format off START_EXECUTING_SCRIPTS() CHECK_KINSTONE_FUSED(9) JUMP_IF_TRUE(0x2a) STOP_EXECUTING_SCRIPTS() - sub_0807E6AC(0x0001,0x0000) + sub_0807E6AC(0x00000001) sub_0807EF80(0x0010) sub_0807E680(0x003c) sub_0807EBC0(0x0020) sub_0807ECF4(0x0080) sub_0807E680(0x001e) sub_0807EF80(0x0010) - sub_0807E5F8(0x0008, 0x0000) + sub_0807E5F8(0x0000008) // clang-format on 0xffff, 0x0c6a,