From 841a20ca2d152bde74fb71194f55e9f41cffb78d Mon Sep 17 00:00:00 2001 From: theo3 Date: Wed, 17 Jun 2020 21:25:52 -0700 Subject: [PATCH] main npc funcs named --- asm/anju.s | 8 +- asm/beedle.s | 8 +- asm/brocco.s | 8 +- asm/carlov.s | 4 +- asm/carpenter.s | 12 +- asm/castleMaid.s | 8 +- asm/castorWildsStatue.s | 8 +- asm/cat.s | 4 +- asm/cucco.s | 8 +- asm/cuccoChick.s | 8 +- asm/dampe.s | 8 +- asm/din.s | 8 +- asm/dog.s | 12 +- asm/drLeft.s | 4 +- asm/ezloCap.s | 12 +- asm/farmers.s | 12 +- asm/farore.s | 8 +- asm/festari.s | 4 +- asm/forestMinish.s | 12 +- asm/fusionMenuNPC.s | 8 +- asm/gentari.s | 12 +- asm/ghostBrothers.s | 8 +- asm/gina.s | 8 +- asm/gorman.s | 8 +- asm/goronMerchant.s | 4 +- asm/gregal.s | 8 +- asm/guardWithSpear.s | 8 +- asm/hurdyGurdyMan.s | 12 +- asm/kid.s | 12 +- asm/kingDaltus.s | 8 +- asm/kingGustaf.s | 4 +- asm/librari.s | 12 +- asm/librarians.s | 4 +- asm/mama.s | 12 +- asm/marcy.s | 4 +- asm/mayorHagen.s | 8 +- asm/melari.s | 12 +- asm/minishEzlo.s | 8 +- asm/ministerPotho.s | 8 +- asm/moblinLady.s | 4 +- asm/mountainMinish.s | 12 +- asm/mutoh.s | 12 +- asm/nayru.s | 8 +- asm/npc23.s | 4 +- asm/npc26.s | 4 +- asm/npc4E.s | 4 +- asm/npc5.s | 4 +- asm/npc58.s | 8 +- asm/npc9.s | 4 +- asm/percy.s | 8 +- asm/phonograph.s | 4 +- asm/picolyteBottles.s | 4 +- asm/pina.s | 8 +- asm/pita.s | 4 +- asm/postman.s | 8 +- asm/sittingPerson.s | 12 +- asm/smallTownMinish.s | 4 +- asm/smith.s | 12 +- asm/stockwell.s | 4 +- asm/sturgeon.s | 12 +- asm/syrup.s | 4 +- asm/teachers.s | 12 +- asm/tingleSiblings.s | 8 +- asm/townMinish.s | 8 +- asm/townsperson.s | 12 +- asm/vaati.s | 4 +- asm/vaatiReborn.s | 4 +- asm/wheaton.s | 4 +- asm/windTribespeople.s | 12 +- asm/zeldaFollower.s | 4 +- include/npc.h | 324 ++++++++++++++++++++-------------------- src/bigGoron.c | 2 +- src/bladeBrothers.c | 4 +- src/cat.c | 2 +- src/clothesRack.c | 2 +- src/cow.c | 4 +- src/emma.c | 2 +- src/epona.c | 4 +- src/goron.c | 4 +- src/mailbox.c | 2 +- src/malon.c | 4 +- src/milkCart.c | 2 +- src/npc.c | 189 ++++++++++++++++------- src/rem.c | 2 +- src/stamp.c | 2 +- src/talon.c | 6 +- src/townMinish.c | 2 +- src/zelda.c | 2 +- 88 files changed, 587 insertions(+), 512 deletions(-) diff --git a/asm/anju.s b/asm/anju.s index 8acda3fe..060d179d 100644 --- a/asm/anju.s +++ b/asm/anju.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806C2C4 -sub_0806C2C4: @ 0x0806C2C4 + thumb_func_start Anju +Anju: @ 0x0806C2C4 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -94,8 +94,8 @@ sub_0806C354: @ 0x0806C354 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806C36C -sub_0806C36C: @ 0x0806C36C + thumb_func_start Anju_Fusion +Anju_Fusion: @ 0x0806C36C push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/beedle.s b/asm/beedle.s index 1015821a..4bee6aac 100644 --- a/asm/beedle.s +++ b/asm/beedle.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_080632A8 -sub_080632A8: @ 0x080632A8 + thumb_func_start Beedle +Beedle: @ 0x080632A8 push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -174,8 +174,8 @@ sub_080633C8: @ 0x080633C8 _080633DE: pop {r4, pc} - thumb_func_start sub_080633E0 -sub_080633E0: @ 0x080633E0 + thumb_func_start Beedle_Head +Beedle_Head: @ 0x080633E0 push {r4, lr} adds r4, r0, #0 adds r0, #0x5a diff --git a/asm/brocco.s b/asm/brocco.s index af1840f2..788c4ef3 100644 --- a/asm/brocco.s +++ b/asm/brocco.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08063524 -sub_08063524: @ 0x08063524 + thumb_func_start Brocco +Brocco: @ 0x08063524 push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -257,8 +257,8 @@ sub_080636F4: @ 0x080636F4 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806370C -sub_0806370C: @ 0x0806370C + thumb_func_start Brocco_Fusion +Brocco_Fusion: @ 0x0806370C push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/carlov.s b/asm/carlov.s index 42bd49c0..d076b873 100644 --- a/asm/carlov.s +++ b/asm/carlov.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806BD54 -sub_0806BD54: @ 0x0806BD54 + thumb_func_start Carlov +Carlov: @ 0x0806BD54 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/carpenter.s b/asm/carpenter.s index bb2a5228..4afb3a6e 100644 --- a/asm/carpenter.s +++ b/asm/carpenter.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08067158 -sub_08067158: @ 0x08067158 + thumb_func_start Carpenter +Carpenter: @ 0x08067158 push {r4, r5, lr} adds r4, r0, #0 adds r0, #0x84 @@ -106,8 +106,8 @@ _08067224: pop {r4, r5, pc} .align 2, 0 - thumb_func_start sub_08067228 -sub_08067228: @ 0x08067228 + thumb_func_start Carpenter_Head +Carpenter_Head: @ 0x08067228 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xa] @@ -235,8 +235,8 @@ sub_08067314: @ 0x08067314 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806732C -sub_0806732C: @ 0x0806732C + thumb_func_start Carpenter_Fusion +Carpenter_Fusion: @ 0x0806732C push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/castleMaid.s b/asm/castleMaid.s index 6a779128..63dbb35e 100644 --- a/asm/castleMaid.s +++ b/asm/castleMaid.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08064508 -sub_08064508: @ 0x08064508 + thumb_func_start Maid +Maid: @ 0x08064508 push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -24,8 +24,8 @@ _0806451E: _08064522: pop {pc} - thumb_func_start sub_08064524 -sub_08064524: @ 0x08064524 + thumb_func_start Maid_Head +Maid_Head: @ 0x08064524 push {r4, r5, lr} adds r4, r0, #0 adds r0, #0x5a diff --git a/asm/castorWildsStatue.s b/asm/castorWildsStatue.s index 588814d4..db6c85ab 100644 --- a/asm/castorWildsStatue.s +++ b/asm/castorWildsStatue.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08067380 -sub_08067380: @ 0x08067380 + thumb_func_start CastorWildsStatue +CastorWildsStatue: @ 0x08067380 push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] @@ -511,8 +511,8 @@ _08067748: .align 2, 0 _0806774C: .4byte gUnk_02033280 - thumb_func_start sub_08067750 -sub_08067750: @ 0x08067750 + thumb_func_start CastorWildsStatue_Fusion +CastorWildsStatue_Fusion: @ 0x08067750 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/cat.s b/asm/cat.s index 7725bd74..6d94d261 100644 --- a/asm/cat.s +++ b/asm/cat.s @@ -829,8 +829,8 @@ sub_08067DDC: @ 0x08067DDC .align 2, 0 _08067DF8: .4byte gUnk_08110EF0 - thumb_func_start sub_08067DFC -sub_08067DFC: @ 0x08067DFC + thumb_func_start Cat_Fusion +Cat_Fusion: @ 0x08067DFC push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/cucco.s b/asm/cucco.s index 7760fea2..768555e7 100644 --- a/asm/cucco.s +++ b/asm/cucco.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806E4A0 -sub_0806E4A0: @ 0x0806E4A0 + thumb_func_start Cucco +Cucco: @ 0x0806E4A0 push {lr} ldr r2, _0806E4B4 @ =gUnk_081145B4 ldrb r1, [r0, #0xc] @@ -299,8 +299,8 @@ _0806E6D4: .4byte gUnk_02002A40 _0806E6D8: .4byte 0x000001C1 _0806E6DC: .4byte gUnk_081145D0 - thumb_func_start sub_0806E6E0 -sub_0806E6E0: @ 0x0806E6E0 + thumb_func_start Cucco_Fusion +Cucco_Fusion: @ 0x0806E6E0 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/cuccoChick.s b/asm/cuccoChick.s index 725f4d3e..8d9f090a 100644 --- a/asm/cuccoChick.s +++ b/asm/cuccoChick.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806E710 -sub_0806E710: @ 0x0806E710 + thumb_func_start CuccoChick +CuccoChick: @ 0x0806E710 push {r4, lr} adds r4, r0, #0 ldr r1, _0806E72C @ =gUnk_081145D4 @@ -211,8 +211,8 @@ sub_0806E884: @ 0x0806E884 .align 2, 0 _0806E890: .4byte 0x00000DB6 - thumb_func_start sub_0806E894 -sub_0806E894: @ 0x0806E894 + thumb_func_start CuccoChick_Fusion +CuccoChick_Fusion: @ 0x0806E894 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/dampe.s b/asm/dampe.s index d9b74529..697d35f8 100644 --- a/asm/dampe.s +++ b/asm/dampe.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806BDAC -sub_0806BDAC: @ 0x0806BDAC + thumb_func_start Dampe +Dampe: @ 0x0806BDAC push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -91,8 +91,8 @@ sub_0806BE3C: @ 0x0806BE3C bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806BE54 -sub_0806BE54: @ 0x0806BE54 + thumb_func_start Dampe_Fusion +Dampe_Fusion: @ 0x0806BE54 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/din.s b/asm/din.s index f0c6de2f..547800e5 100644 --- a/asm/din.s +++ b/asm/din.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08064790 -sub_08064790: @ 0x08064790 + thumb_func_start Din +Din: @ 0x08064790 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -111,8 +111,8 @@ _0806484E: _08064858: .4byte gUnk_02002A40 _0806485C: .4byte 0x00000141 - thumb_func_start sub_08064860 -sub_08064860: @ 0x08064860 + thumb_func_start Din_Fusion +Din_Fusion: @ 0x08064860 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/dog.s b/asm/dog.s index ea27ad5c..70e8d31c 100644 --- a/asm/dog.s +++ b/asm/dog.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08069B1C -sub_08069B1C: @ 0x08069B1C + thumb_func_start Dog +Dog: @ 0x08069B1C push {r4, lr} adds r4, r0, #0 ldr r1, _08069B40 @ =gUnk_08111D88 @@ -539,8 +539,8 @@ _08069F28: _08069F2A: pop {r4, pc} - thumb_func_start sub_08069F2C -sub_08069F2C: @ 0x08069F2C + thumb_func_start Dog_Head +Dog_Head: @ 0x08069F2C push {r4, lr} adds r4, r0, #0 adds r0, #0x5a @@ -851,8 +851,8 @@ _0806A17A: _0806A18C: .4byte gLinkState _0806A190: .4byte gUnk_08111FD8 - thumb_func_start sub_0806A194 -sub_0806A194: @ 0x0806A194 + thumb_func_start Dog_Fusion +Dog_Fusion: @ 0x0806A194 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/drLeft.s b/asm/drLeft.s index 20507cf1..4f31fdf8 100644 --- a/asm/drLeft.s +++ b/asm/drLeft.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806BF80 -sub_0806BF80: @ 0x0806BF80 + thumb_func_start DrLeft +DrLeft: @ 0x0806BF80 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xa] diff --git a/asm/ezloCap.s b/asm/ezloCap.s index 94465339..e36c453b 100644 --- a/asm/ezloCap.s +++ b/asm/ezloCap.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806D86C -sub_0806D86C: @ 0x0806D86C + thumb_func_start EzloCap +EzloCap: @ 0x0806D86C push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -194,8 +194,8 @@ _0806D9C6: pop {pc} .align 2, 0 - thumb_func_start sub_0806D9D0 -sub_0806D9D0: @ 0x0806D9D0 + thumb_func_start NPC4E +NPC4E: @ 0x0806D9D0 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] @@ -594,8 +594,8 @@ sub_0806DCC0: @ 0x0806DCC0 .align 2, 0 _0806DCD0: .4byte gUnk_030010A0 - thumb_func_start sub_0806DCD4 -sub_0806DCD4: @ 0x0806DCD4 + thumb_func_start NPC4E_Fusion +NPC4E_Fusion: @ 0x0806DCD4 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/farmers.s b/asm/farmers.s index 31e8ad7a..21657724 100644 --- a/asm/farmers.s +++ b/asm/farmers.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806BBE4 -sub_0806BBE4: @ 0x0806BBE4 + thumb_func_start Farmers +Farmers: @ 0x0806BBE4 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -74,8 +74,8 @@ sub_0806BC58: @ 0x0806BC58 pop {pc} .align 2, 0 - thumb_func_start sub_0806BC64 -sub_0806BC64: @ 0x0806BC64 + thumb_func_start Farmers_Head +Farmers_Head: @ 0x0806BC64 push {r4, lr} adds r4, r0, #0 adds r0, #0x5a @@ -160,8 +160,8 @@ sub_0806BCE8: @ 0x0806BCE8 .align 2, 0 _0806BCF8: .4byte gUnk_08113158 - thumb_func_start sub_0806BCFC -sub_0806BCFC: @ 0x0806BCFC + thumb_func_start Farmers_Fusion +Farmers_Fusion: @ 0x0806BCFC push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/farore.s b/asm/farore.s index c1a63c80..002a469e 100644 --- a/asm/farore.s +++ b/asm/farore.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08064990 -sub_08064990: @ 0x08064990 + thumb_func_start Farore +Farore: @ 0x08064990 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -111,8 +111,8 @@ _08064A4E: _08064A58: .4byte gUnk_02002A40 _08064A5C: .4byte 0x00000141 - thumb_func_start sub_08064A60 -sub_08064A60: @ 0x08064A60 + thumb_func_start Farore_Fusion +Farore_Fusion: @ 0x08064A60 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/festari.s b/asm/festari.s index c2fb5a41..f0f5e8ca 100644 --- a/asm/festari.s +++ b/asm/festari.s @@ -219,8 +219,8 @@ _0805FF94: pop {r4, r5, r6, pc} .align 2, 0 - thumb_func_start sub_0805FFA0 -sub_0805FFA0: @ 0x0805FFA0 + thumb_func_start Festari_Fusion +Festari_Fusion: @ 0x0805FFA0 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/forestMinish.s b/asm/forestMinish.s index 6a4bef48..fbd6ecd4 100644 --- a/asm/forestMinish.s +++ b/asm/forestMinish.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0805FFD8 -sub_0805FFD8: @ 0x0805FFD8 + thumb_func_start ForestMinish +ForestMinish: @ 0x0805FFD8 push {r4, r5, lr} adds r4, r0, #0 ldrb r5, [r4, #0xc] @@ -110,8 +110,8 @@ sub_08060090: @ 0x08060090 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_080600A8 -sub_080600A8: @ 0x080600A8 + thumb_func_start ForestMinish_Head +ForestMinish_Head: @ 0x080600A8 push {r4, lr} adds r4, r0, #0 adds r0, #0x5a @@ -523,8 +523,8 @@ _080603B0: _080603B2: pop {r4, pc} - thumb_func_start sub_080603B4 -sub_080603B4: @ 0x080603B4 + thumb_func_start ForestMinish_Fusion +ForestMinish_Fusion: @ 0x080603B4 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/fusionMenuNPC.s b/asm/fusionMenuNPC.s index 1aea1095..ec3d2e34 100644 --- a/asm/fusionMenuNPC.s +++ b/asm/fusionMenuNPC.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806E8CC -sub_0806E8CC: @ 0x0806E8CC + thumb_func_start FusionMenuNPC +FusionMenuNPC: @ 0x0806E8CC push {lr} adds r3, r0, #0 ldr r2, _0806E8EC @ =gNPCFunctions @@ -31,8 +31,8 @@ _0806E8F4: pop {pc} .align 2, 0 - thumb_func_start sub_0806E8F8 -sub_0806E8F8: @ 0x0806E8F8 + thumb_func_start FusionMenuNPC_Head +FusionMenuNPC_Head: @ 0x0806E8F8 push {lr} adds r3, r0, #0 ldr r2, _0806E918 @ =gNPCFunctions diff --git a/asm/gentari.s b/asm/gentari.s index 35811ad6..dc9930bc 100644 --- a/asm/gentari.s +++ b/asm/gentari.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0805FD24 -sub_0805FD24: @ 0x0805FD24 + thumb_func_start Gentari +Gentari: @ 0x0805FD24 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -84,8 +84,8 @@ _0805FDBC: pop {r4, pc} .align 2, 0 - thumb_func_start sub_0805FDC0 -sub_0805FDC0: @ 0x0805FDC0 + thumb_func_start Gentari_Fusion +Gentari_Fusion: @ 0x0805FDC0 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -114,8 +114,8 @@ _0805FDF4: pop {r4, pc} .align 2, 0 - thumb_func_start sub_0805FDF8 -sub_0805FDF8: @ 0x0805FDF8 + thumb_func_start Festari +Festari: @ 0x0805FDF8 push {lr} ldr r2, _0805FE0C @ =gUnk_08109BBC ldrb r1, [r0, #0xc] diff --git a/asm/ghostBrothers.s b/asm/ghostBrothers.s index 2df0f99b..0cf03f99 100644 --- a/asm/ghostBrothers.s +++ b/asm/ghostBrothers.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08065BA4 -sub_08065BA4: @ 0x08065BA4 + thumb_func_start GhostBrothers +GhostBrothers: @ 0x08065BA4 push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] @@ -525,8 +525,8 @@ _08065F74: _08065F88: .4byte gUnk_02002A40 _08065F8C: .4byte gUnk_08110280 - thumb_func_start sub_08065F90 -sub_08065F90: @ 0x08065F90 + thumb_func_start GhostBrothers_Fusion +GhostBrothers_Fusion: @ 0x08065F90 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/gina.s b/asm/gina.s index 5b211309..4d2c851f 100644 --- a/asm/gina.s +++ b/asm/gina.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806C13C -sub_0806C13C: @ 0x0806C13C + thumb_func_start Gina +Gina: @ 0x0806C13C push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -82,8 +82,8 @@ _0806C1BE: _0806C1D2: pop {r4, pc} - thumb_func_start sub_0806C1D4 -sub_0806C1D4: @ 0x0806C1D4 + thumb_func_start Gina_Fusion +Gina_Fusion: @ 0x0806C1D4 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/gorman.s b/asm/gorman.s index 8899e257..bddcc1a4 100644 --- a/asm/gorman.s +++ b/asm/gorman.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08069784 -sub_08069784: @ 0x08069784 + thumb_func_start Gorman +Gorman: @ 0x08069784 push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -453,8 +453,8 @@ _08069AE4: str r0, [r2, #0x14] pop {pc} - thumb_func_start sub_08069AE8 -sub_08069AE8: @ 0x08069AE8 + thumb_func_start Gorman_Head +Gorman_Head: @ 0x08069AE8 push {r4, lr} adds r4, r0, #0 adds r0, #0x5a diff --git a/asm/goronMerchant.s b/asm/goronMerchant.s index 3d6ccf15..ed3220cd 100644 --- a/asm/goronMerchant.s +++ b/asm/goronMerchant.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08069544 -sub_08069544: @ 0x08069544 + thumb_func_start GoronMerchant +GoronMerchant: @ 0x08069544 push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] diff --git a/asm/gregal.s b/asm/gregal.s index 8b564620..3b42738a 100644 --- a/asm/gregal.s +++ b/asm/gregal.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806CADC -sub_0806CADC: @ 0x0806CADC + thumb_func_start Gregal +Gregal: @ 0x0806CADC push {lr} ldr r2, _0806CAF0 @ =gUnk_08113D8C ldrb r1, [r0, #0xa] @@ -355,8 +355,8 @@ sub_0806CD58: @ 0x0806CD58 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806CD70 -sub_0806CD70: @ 0x0806CD70 + thumb_func_start Gregal_Fusion +Gregal_Fusion: @ 0x0806CD70 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/guardWithSpear.s b/asm/guardWithSpear.s index d8039fd2..9ae4512b 100644 --- a/asm/guardWithSpear.s +++ b/asm/guardWithSpear.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08063CF8 -sub_08063CF8: @ 0x08063CF8 + thumb_func_start Guard +Guard: @ 0x08063CF8 push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -358,8 +358,8 @@ _08063FA6: .align 2, 0 _08063FA8: .4byte gTextBox - thumb_func_start sub_08063FAC -sub_08063FAC: @ 0x08063FAC + thumb_func_start Guard_Head +Guard_Head: @ 0x08063FAC push {r4, r5, r6, lr} adds r6, r0, #0 adds r0, #0x5a diff --git a/asm/hurdyGurdyMan.s b/asm/hurdyGurdyMan.s index 86b68c29..e26a02d5 100644 --- a/asm/hurdyGurdyMan.s +++ b/asm/hurdyGurdyMan.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806E308 -sub_0806E308: @ 0x0806E308 + thumb_func_start HurdyGurdyMan +HurdyGurdyMan: @ 0x0806E308 push {r4, r5, lr} adds r4, r0, #0 ldrb r5, [r4, #0xc] @@ -112,8 +112,8 @@ _0806E3E0: pop {r4, r5, pc} .align 2, 0 - thumb_func_start sub_0806E3E4 -sub_0806E3E4: @ 0x0806E3E4 + thumb_func_start HurdyGurdyMan_Head +HurdyGurdyMan_Head: @ 0x0806E3E4 push {r4, lr} adds r4, r0, #0 adds r0, #0x5a @@ -171,8 +171,8 @@ sub_0806E440: @ 0x0806E440 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806E458 -sub_0806E458: @ 0x0806E458 + thumb_func_start HurdyGurdyMan_Fusion +HurdyGurdyMan_Fusion: @ 0x0806E458 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/kid.s b/asm/kid.s index 76f20da2..afbab1d8 100644 --- a/asm/kid.s +++ b/asm/kid.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_080620C8 -sub_080620C8: @ 0x080620C8 + thumb_func_start Kid +Kid: @ 0x080620C8 push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -973,8 +973,8 @@ _08062828: .4byte 0x0000064B _0806282C: .4byte 0x0000064C _08062830: .4byte 0x0000064D - thumb_func_start sub_08062834 -sub_08062834: @ 0x08062834 + thumb_func_start Kid_Head +Kid_Head: @ 0x08062834 push {r4, r5, r6, r7, lr} adds r5, r0, #0 ldrb r4, [r5, #0xa] @@ -1249,8 +1249,8 @@ sub_08062A48: @ 0x08062A48 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_08062A60 -sub_08062A60: @ 0x08062A60 + thumb_func_start Kid_Fusion +Kid_Fusion: @ 0x08062A60 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/kingDaltus.s b/asm/kingDaltus.s index e835db10..313b64e9 100644 --- a/asm/kingDaltus.s +++ b/asm/kingDaltus.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_080665E4 -sub_080665E4: @ 0x080665E4 + thumb_func_start KingDaltus +KingDaltus: @ 0x080665E4 push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] @@ -227,8 +227,8 @@ _0806676A: .align 2, 0 _0806677C: .4byte gUnk_081104F8 - thumb_func_start sub_08066780 -sub_08066780: @ 0x08066780 + thumb_func_start KingDaltus_Fusion +KingDaltus_Fusion: @ 0x08066780 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/kingGustaf.s b/asm/kingGustaf.s index 32da5f56..7fdab0ba 100644 --- a/asm/kingGustaf.s +++ b/asm/kingGustaf.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806C0B0 -sub_0806C0B0: @ 0x0806C0B0 + thumb_func_start KingGustaf +KingGustaf: @ 0x0806C0B0 push {r4, r5, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/librari.s b/asm/librari.s index fc696bb8..34912cda 100644 --- a/asm/librari.s +++ b/asm/librari.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806B1CC -sub_0806B1CC: @ 0x0806B1CC + thumb_func_start Librari +Librari: @ 0x0806B1CC push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -181,8 +181,8 @@ _0806B316: .align 2, 0 _0806B328: .4byte gUnk_08112D50 - thumb_func_start sub_0806B32C -sub_0806B32C: @ 0x0806B32C + thumb_func_start Librari_Fusion +Librari_Fusion: @ 0x0806B32C push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] @@ -208,8 +208,8 @@ _0806B358: pop {pc} .align 2, 0 - thumb_func_start sub_0806B35C -sub_0806B35C: @ 0x0806B35C + thumb_func_start Percy_Head +Percy_Head: @ 0x0806B35C push {r4, lr} adds r4, r0, #0 adds r0, #0x5b diff --git a/asm/librarians.s b/asm/librarians.s index ea13b711..b3fec150 100644 --- a/asm/librarians.s +++ b/asm/librarians.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806B9F0 -sub_0806B9F0: @ 0x0806B9F0 + thumb_func_start Librarians +Librarians: @ 0x0806B9F0 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/mama.s b/asm/mama.s index 9534021f..39bdc008 100644 --- a/asm/mama.s +++ b/asm/mama.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806C39C -sub_0806C39C: @ 0x0806C39C + thumb_func_start Mama +Mama: @ 0x0806C39C push {r4, r5, lr} adds r4, r0, #0 ldrb r5, [r4, #0xc] @@ -117,8 +117,8 @@ _0806C474: _0806C476: pop {r4, pc} - thumb_func_start sub_0806C478 -sub_0806C478: @ 0x0806C478 + thumb_func_start Mama_Head +Mama_Head: @ 0x0806C478 push {r4, lr} adds r4, r0, #0 adds r0, #0x5a @@ -196,8 +196,8 @@ sub_0806C4F8: @ 0x0806C4F8 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806C510 -sub_0806C510: @ 0x0806C510 + thumb_func_start Mama_Fusion +Mama_Fusion: @ 0x0806C510 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/marcy.s b/asm/marcy.s index 7e36a9ae..b8420d47 100644 --- a/asm/marcy.s +++ b/asm/marcy.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08062CF0 -sub_08062CF0: @ 0x08062CF0 + thumb_func_start Marcy +Marcy: @ 0x08062CF0 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/mayorHagen.s b/asm/mayorHagen.s index 3bbcb620..8ad776f4 100644 --- a/asm/mayorHagen.s +++ b/asm/mayorHagen.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806CDA8 -sub_0806CDA8: @ 0x0806CDA8 + thumb_func_start MayorHagen +MayorHagen: @ 0x0806CDA8 push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #0xc] @@ -164,8 +164,8 @@ _0806CED6: .align 2, 0 _0806CEE4: .4byte gUnk_08113F48 - thumb_func_start sub_0806CEE8 -sub_0806CEE8: @ 0x0806CEE8 + thumb_func_start MayorHagen_Fusion +MayorHagen_Fusion: @ 0x0806CEE8 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/melari.s b/asm/melari.s index e10ec0e4..c91cc943 100644 --- a/asm/melari.s +++ b/asm/melari.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_080686D4 -sub_080686D4: @ 0x080686D4 + thumb_func_start Melari +Melari: @ 0x080686D4 push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] @@ -233,8 +233,8 @@ sub_08068884: @ 0x08068884 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806889C -sub_0806889C: @ 0x0806889C + thumb_func_start Melari_Head +Melari_Head: @ 0x0806889C push {r4, r5, lr} adds r5, r0, #0 adds r0, #0x5a @@ -346,8 +346,8 @@ sub_08068964: @ 0x08068964 pop {pc} .align 2, 0 - thumb_func_start sub_0806897C -sub_0806897C: @ 0x0806897C + thumb_func_start Melari_Fusion +Melari_Fusion: @ 0x0806897C push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/minishEzlo.s b/asm/minishEzlo.s index 02ae6ce4..ada2f439 100644 --- a/asm/minishEzlo.s +++ b/asm/minishEzlo.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08062F70 -sub_08062F70: @ 0x08062F70 + thumb_func_start MinishEzlo +MinishEzlo: @ 0x08062F70 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -67,8 +67,8 @@ _08062FE4: _08062FE8: .4byte gUnk_0810C48C _08062FEC: .4byte 0x000001CF - thumb_func_start sub_08062FF0 -sub_08062FF0: @ 0x08062FF0 + thumb_func_start MinishEzlo_Head +MinishEzlo_Head: @ 0x08062FF0 push {r4, r5, r6, r7, lr} adds r4, r0, #0 adds r0, #0x5b diff --git a/asm/ministerPotho.s b/asm/ministerPotho.s index f5219a52..2c8a5fb7 100644 --- a/asm/ministerPotho.s +++ b/asm/ministerPotho.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_080667B0 -sub_080667B0: @ 0x080667B0 + thumb_func_start MinisterPotho +MinisterPotho: @ 0x080667B0 push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] @@ -223,8 +223,8 @@ _08066932: .align 2, 0 _08066944: .4byte gUnk_08110650 - thumb_func_start sub_08066948 -sub_08066948: @ 0x08066948 + thumb_func_start MinisterPotho_Fusion +MinisterPotho_Fusion: @ 0x08066948 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/moblinLady.s b/asm/moblinLady.s index 9da1b56a..87f68f93 100644 --- a/asm/moblinLady.s +++ b/asm/moblinLady.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806B9D0 -sub_0806B9D0: @ 0x0806B9D0 + thumb_func_start MoblinLady +MoblinLady: @ 0x0806B9D0 push {lr} adds r1, r0, #0 ldrb r0, [r1, #0xc] diff --git a/asm/mountainMinish.s b/asm/mountainMinish.s index 728ae0f3..bb6d5737 100644 --- a/asm/mountainMinish.s +++ b/asm/mountainMinish.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08067E2C -sub_08067E2C: @ 0x08067E2C + thumb_func_start MountainMinish +MountainMinish: @ 0x08067E2C push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] @@ -484,8 +484,8 @@ sub_080681D8: @ 0x080681D8 bx lr .align 2, 0 - thumb_func_start sub_080681E0 -sub_080681E0: @ 0x080681E0 + thumb_func_start MountainMinish_Head +MountainMinish_Head: @ 0x080681E0 push {r4, r5, lr} adds r5, r0, #0 adds r0, #0x5a @@ -552,8 +552,8 @@ _08068268: bl sub_0807000C pop {r4, r5, pc} - thumb_func_start sub_08068270 -sub_08068270: @ 0x08068270 + thumb_func_start MountainMinish_Fusion +MountainMinish_Fusion: @ 0x08068270 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/mutoh.s b/asm/mutoh.s index 3b1c9de5..f2218b39 100644 --- a/asm/mutoh.s +++ b/asm/mutoh.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08066FD8 -sub_08066FD8: @ 0x08066FD8 + thumb_func_start Mutoh +Mutoh: @ 0x08066FD8 push {r4, lr} adds r4, r0, #0 adds r0, #0x84 @@ -90,8 +90,8 @@ _0806707C: pop {r4, pc} .align 2, 0 - thumb_func_start sub_08067080 -sub_08067080: @ 0x08067080 + thumb_func_start Mutoh_Head +Mutoh_Head: @ 0x08067080 push {r4, lr} adds r4, r0, #0 adds r0, #0x5a @@ -167,8 +167,8 @@ sub_08067100: @ 0x08067100 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_08067118 -sub_08067118: @ 0x08067118 + thumb_func_start Mutoh_Fusion +Mutoh_Fusion: @ 0x08067118 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/nayru.s b/asm/nayru.s index 210d391b..5f89882b 100644 --- a/asm/nayru.s +++ b/asm/nayru.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08064890 -sub_08064890: @ 0x08064890 + thumb_func_start Nayru +Nayru: @ 0x08064890 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] @@ -111,8 +111,8 @@ _0806494E: _08064958: .4byte gUnk_02002A40 _0806495C: .4byte 0x00000141 - thumb_func_start sub_08064960 -sub_08064960: @ 0x08064960 + thumb_func_start Nayru_Fusion +Nayru_Fusion: @ 0x08064960 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/npc23.s b/asm/npc23.s index 5e28cd05..5ab5c055 100644 --- a/asm/npc23.s +++ b/asm/npc23.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_080662D8 -sub_080662D8: @ 0x080662D8 + thumb_func_start NPC23 +NPC23: @ 0x080662D8 push {r4, lr} adds r4, r0, #0 ldr r1, _080662F4 @ =gUnk_081104C8 diff --git a/asm/npc26.s b/asm/npc26.s index 61dc0f20..76b61e45 100644 --- a/asm/npc26.s +++ b/asm/npc26.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08066978 -sub_08066978: @ 0x08066978 + thumb_func_start NPC26 +NPC26: @ 0x08066978 push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] diff --git a/asm/npc4E.s b/asm/npc4E.s index 4fce9ba7..9e484ea8 100644 --- a/asm/npc4E.s +++ b/asm/npc4E.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806DD44 -sub_0806DD44: @ 0x0806DD44 + thumb_func_start NPC4F +NPC4F: @ 0x0806DD44 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/npc5.s b/asm/npc5.s index b1bdbd59..5b37e2ae 100644 --- a/asm/npc5.s +++ b/asm/npc5.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_080609E8 -sub_080609E8: @ 0x080609E8 + thumb_func_start NPC5 +NPC5: @ 0x080609E8 push {lr} ldr r2, _080609FC @ =gUnk_0810AC1C ldrb r1, [r0, #0xa] diff --git a/asm/npc58.s b/asm/npc58.s index 87deac68..ce43e94e 100644 --- a/asm/npc58.s +++ b/asm/npc58.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806EAF4 -sub_0806EAF4: @ 0x0806EAF4 + thumb_func_start NPC58 +NPC58: @ 0x0806EAF4 push {r4, r5, r6, r7, lr} adds r6, r0, #0 ldrb r0, [r6, #0xc] @@ -95,8 +95,8 @@ _0806EBA8: pop {r4, r5, r6, r7, pc} .align 2, 0 - thumb_func_start sub_0806EBAC -sub_0806EBAC: @ 0x0806EBAC + thumb_func_start NPC58_Head +NPC58_Head: @ 0x0806EBAC push {r4, lr} adds r4, r0, #0 movs r0, #0xff diff --git a/asm/npc9.s b/asm/npc9.s index 2f393be9..062fd5f1 100644 --- a/asm/npc9.s +++ b/asm/npc9.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08062AD8 -sub_08062AD8: @ 0x08062AD8 + thumb_func_start NPC9 +NPC9: @ 0x08062AD8 push {lr} ldr r2, _08062AEC @ =gUnk_0810C290 ldrb r1, [r0, #0xc] diff --git a/asm/percy.s b/asm/percy.s index 77e89d1f..1f6ceaf3 100644 --- a/asm/percy.s +++ b/asm/percy.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806B3AC -sub_0806B3AC: @ 0x0806B3AC + thumb_func_start Percy +Percy: @ 0x0806B3AC push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -326,8 +326,8 @@ sub_0806B60C: @ 0x0806B60C bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806B624 -sub_0806B624: @ 0x0806B624 + thumb_func_start Percy_Fusion +Percy_Fusion: @ 0x0806B624 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/phonograph.s b/asm/phonograph.s index 8e1fbcb3..7c1b6c45 100644 --- a/asm/phonograph.s +++ b/asm/phonograph.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806E91C -sub_0806E91C: @ 0x0806E91C + thumb_func_start Phonograph +Phonograph: @ 0x0806E91C push {r4, r5, lr} adds r5, r0, #0 ldrb r0, [r5, #0xc] diff --git a/asm/picolyteBottles.s b/asm/picolyteBottles.s index dacc72a0..ba37bb92 100644 --- a/asm/picolyteBottles.s +++ b/asm/picolyteBottles.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806DED0 -sub_0806DED0: @ 0x0806DED0 + thumb_func_start PicolyteBottle +PicolyteBottle: @ 0x0806DED0 push {r4, lr} adds r4, r0, #0 ldr r1, _0806DEF8 @ =gUnk_081142BC diff --git a/asm/pina.s b/asm/pina.s index 70492f23..86e9f2cb 100644 --- a/asm/pina.s +++ b/asm/pina.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08063A60 -sub_08063A60: @ 0x08063A60 + thumb_func_start Pina +Pina: @ 0x08063A60 push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -329,8 +329,8 @@ sub_08063CAC: @ 0x08063CAC bl sub_08078784 pop {r4, pc} - thumb_func_start sub_08063CC4 -sub_08063CC4: @ 0x08063CC4 + thumb_func_start Pina_Fusion +Pina_Fusion: @ 0x08063CC4 push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/pita.s b/asm/pita.s index 69817e33..2bdf320e 100644 --- a/asm/pita.s +++ b/asm/pita.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08062E60 -sub_08062E60: @ 0x08062E60 + thumb_func_start Pita +Pita: @ 0x08062E60 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/postman.s b/asm/postman.s index 2355d96a..75486be7 100644 --- a/asm/postman.s +++ b/asm/postman.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_080603FC -sub_080603FC: @ 0x080603FC + thumb_func_start Postman +Postman: @ 0x080603FC push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -720,8 +720,8 @@ _08060970: _08060974: .4byte gLinkEntity _08060978: .4byte gUnk_0810AA70 - thumb_func_start sub_0806097C -sub_0806097C: @ 0x0806097C + thumb_func_start Postman_Fusion +Postman_Fusion: @ 0x0806097C push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/sittingPerson.s b/asm/sittingPerson.s index 37d3ebce..bf9c5c88 100644 --- a/asm/sittingPerson.s +++ b/asm/sittingPerson.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08063740 -sub_08063740: @ 0x08063740 + thumb_func_start SittingPerson +SittingPerson: @ 0x08063740 push {lr} ldr r2, _08063754 @ =gUnk_0810CBD8 ldrb r1, [r0, #0xc] @@ -295,8 +295,8 @@ _08063958: _0806396C: .4byte gUnk_02002A40 _08063970: .4byte gUnk_0810CC08 - thumb_func_start sub_08063974 -sub_08063974: @ 0x08063974 + thumb_func_start SittingPerson_Head +SittingPerson_Head: @ 0x08063974 push {r4, r5, lr} adds r4, r0, #0 ldrb r5, [r4, #0xa] @@ -351,8 +351,8 @@ sub_080639D0: @ 0x080639D0 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_080639E8 -sub_080639E8: @ 0x080639E8 + thumb_func_start SittingPerson_Fusion +SittingPerson_Fusion: @ 0x080639E8 push {r4, r5, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/smallTownMinish.s b/asm/smallTownMinish.s index 28c66af2..9b2484b7 100644 --- a/asm/smallTownMinish.s +++ b/asm/smallTownMinish.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806E278 -sub_0806E278: @ 0x0806E278 + thumb_func_start SmallTownMinish +SmallTownMinish: @ 0x0806E278 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/smith.s b/asm/smith.s index 06e9bd05..2c67950e 100644 --- a/asm/smith.s +++ b/asm/smith.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08065FC0 -sub_08065FC0: @ 0x08065FC0 + thumb_func_start Smith +Smith: @ 0x08065FC0 push {r4, r5, r6, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] @@ -120,8 +120,8 @@ _080660A0: .align 2, 0 _080660A4: .4byte gUnk_08110380 - thumb_func_start sub_080660A8 -sub_080660A8: @ 0x080660A8 + thumb_func_start Smith_Head +Smith_Head: @ 0x080660A8 push {r4, r5, lr} adds r5, r0, #0 adds r0, #0x5a @@ -390,8 +390,8 @@ sub_08066288: @ 0x08066288 pop {pc} .align 2, 0 - thumb_func_start sub_08066298 -sub_08066298: @ 0x08066298 + thumb_func_start Smith_Fusion +Smith_Fusion: @ 0x08066298 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/stockwell.s b/asm/stockwell.s index fc57ab3c..c34935af 100644 --- a/asm/stockwell.s +++ b/asm/stockwell.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08065054 -sub_08065054: @ 0x08065054 + thumb_func_start Stockwell +Stockwell: @ 0x08065054 push {r4, lr} adds r4, r0, #0 ldr r1, _0806507C @ =gUnk_0810FDA4 diff --git a/asm/sturgeon.s b/asm/sturgeon.s index 778fd0ec..0ea91f7e 100644 --- a/asm/sturgeon.s +++ b/asm/sturgeon.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08064A90 -sub_08064A90: @ 0x08064A90 + thumb_func_start Sturgeon +Sturgeon: @ 0x08064A90 push {r4, r5, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] @@ -245,8 +245,8 @@ _08064C68: pop {r4, pc} .align 2, 0 - thumb_func_start sub_08064C6C -sub_08064C6C: @ 0x08064C6C + thumb_func_start Sturgeon_Head +Sturgeon_Head: @ 0x08064C6C push {r4, lr} adds r4, r0, #0 adds r0, #0x5a @@ -340,8 +340,8 @@ sub_08064D10: @ 0x08064D10 bx lr .align 2, 0 - thumb_func_start sub_08064D18 -sub_08064D18: @ 0x08064D18 + thumb_func_start Sturgeon_Fusion +Sturgeon_Fusion: @ 0x08064D18 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/syrup.s b/asm/syrup.s index 9f1ca446..e7d300e6 100644 --- a/asm/syrup.s +++ b/asm/syrup.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_0806A2B4 -sub_0806A2B4: @ 0x0806A2B4 + thumb_func_start Syrup_Head +Syrup_Head: @ 0x0806A2B4 push {r4, r5, r6, lr} mov r6, sb mov r5, r8 diff --git a/asm/teachers.s b/asm/teachers.s index e9760575..0ab5d8c1 100644 --- a/asm/teachers.s +++ b/asm/teachers.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806C5A8 -sub_0806C5A8: @ 0x0806C5A8 + thumb_func_start Teachers +Teachers: @ 0x0806C5A8 push {r4, r5, lr} adds r5, r0, #0 ldrb r4, [r5, #0xc] @@ -119,8 +119,8 @@ sub_0806C674: @ 0x0806C674 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806C68C -sub_0806C68C: @ 0x0806C68C + thumb_func_start Teachers_Head +Teachers_Head: @ 0x0806C68C push {r4, r5, r6, lr} adds r4, r0, #0 adds r0, #0x5a @@ -202,8 +202,8 @@ _0806C71C: _0806C730: .4byte gUnk_02002A40 _0806C734: .4byte gUnk_08113930 - thumb_func_start sub_0806C738 -sub_0806C738: @ 0x0806C738 + thumb_func_start Teachers_Fusion +Teachers_Fusion: @ 0x0806C738 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/tingleSiblings.s b/asm/tingleSiblings.s index 1a59bac7..08e3d38d 100644 --- a/asm/tingleSiblings.s +++ b/asm/tingleSiblings.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08064D58 -sub_08064D58: @ 0x08064D58 + thumb_func_start TingleSiblings +TingleSiblings: @ 0x08064D58 push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -377,8 +377,8 @@ _08065016: mov r8, r3 pop {r4, r5, r6, r7, pc} - thumb_func_start sub_0806501C -sub_0806501C: @ 0x0806501C + thumb_func_start TingleSiblings_Fusion +TingleSiblings_Fusion: @ 0x0806501C push {lr} adds r2, r0, #0 ldrb r0, [r2, #0xc] diff --git a/asm/townMinish.s b/asm/townMinish.s index 5fbc8ae9..93178327 100644 --- a/asm/townMinish.s +++ b/asm/townMinish.s @@ -241,8 +241,8 @@ sub_0806ADFC: @ 0x0806ADFC pop {pc} .align 2, 0 - thumb_func_start sub_0806AE0C -sub_0806AE0C: @ 0x0806AE0C + thumb_func_start TownMinish_Head +TownMinish_Head: @ 0x0806AE0C push {r4, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] @@ -702,8 +702,8 @@ _0806B16A: _0806B17C: .4byte gUnk_02002A40 _0806B180: .4byte gUnk_08112C60 - thumb_func_start sub_0806B184 -sub_0806B184: @ 0x0806B184 + thumb_func_start TownMinish_Fusion +TownMinish_Fusion: @ 0x0806B184 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/townsperson.s b/asm/townsperson.s index fa0c7af9..73352ded 100644 --- a/asm/townsperson.s +++ b/asm/townsperson.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08061B8C -sub_08061B8C: @ 0x08061B8C + thumb_func_start Townsperson +Townsperson: @ 0x08061B8C push {lr} adds r2, r0, #0 ldrb r1, [r2, #0x10] @@ -118,8 +118,8 @@ _08061C58: .align 2, 0 _08061C5C: .4byte 0x00000A01 - thumb_func_start sub_08061C60 -sub_08061C60: @ 0x08061C60 + thumb_func_start Townsperson_Head +Townsperson_Head: @ 0x08061C60 push {r4, r5, lr} adds r4, r0, #0 adds r0, #0x58 @@ -674,8 +674,8 @@ _08062084: pop {pc} .align 2, 0 - thumb_func_start sub_08062088 -sub_08062088: @ 0x08062088 + thumb_func_start Townsperson_Fusion +Townsperson_Fusion: @ 0x08062088 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/vaati.s b/asm/vaati.s index e31c70dc..3a8f92d7 100644 --- a/asm/vaati.s +++ b/asm/vaati.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_08066A5C -sub_08066A5C: @ 0x08066A5C + thumb_func_start Vaati +Vaati: @ 0x08066A5C push {r4, lr} adds r4, r0, #0 ldr r1, _08066A90 @ =gUnk_08110734 diff --git a/asm/vaatiReborn.s b/asm/vaatiReborn.s index f15b2d0f..fda8f7ae 100644 --- a/asm/vaatiReborn.s +++ b/asm/vaatiReborn.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806B664 -sub_0806B664: @ 0x0806B664 + thumb_func_start VaatiReborn +VaatiReborn: @ 0x0806B664 push {lr} ldr r2, _0806B678 @ =gUnk_08112F78 ldrb r1, [r0, #0xc] diff --git a/asm/wheaton.s b/asm/wheaton.s index 70310e3a..b19406ba 100644 --- a/asm/wheaton.s +++ b/asm/wheaton.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_08062E20 -sub_08062E20: @ 0x08062E20 + thumb_func_start Wheaton +Wheaton: @ 0x08062E20 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/windTribespeople.s b/asm/windTribespeople.s index e6d1b78a..80e29c1f 100644 --- a/asm/windTribespeople.s +++ b/asm/windTribespeople.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_0806C780 -sub_0806C780: @ 0x0806C780 + thumb_func_start WindTribespeople +WindTribespeople: @ 0x0806C780 push {lr} ldr r2, _0806C794 @ =gUnk_08113A7C ldrb r1, [r0, #0xc] @@ -146,8 +146,8 @@ sub_0806C870: @ 0x0806C870 bl sub_08078784 pop {r4, pc} - thumb_func_start sub_0806C888 -sub_0806C888: @ 0x0806C888 + thumb_func_start WindTribespeople_Head +WindTribespeople_Head: @ 0x0806C888 push {r4, r5, r6, r7, lr} adds r4, r0, #0 adds r0, #0x5a @@ -421,8 +421,8 @@ _0806CA8A: _0806CA8C: .4byte gUnk_08113B38 _0806CA90: .4byte gUnk_02033280 - thumb_func_start sub_0806CA94 -sub_0806CA94: @ 0x0806CA94 + thumb_func_start WindTribespeople_Fusion +WindTribespeople_Fusion: @ 0x0806CA94 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/asm/zeldaFollower.s b/asm/zeldaFollower.s index 813c5e96..a85b9394 100644 --- a/asm/zeldaFollower.s +++ b/asm/zeldaFollower.s @@ -7,8 +7,8 @@ .text - thumb_func_start sub_080682B0 -sub_080682B0: @ 0x080682B0 + thumb_func_start ZeldaFollower +ZeldaFollower: @ 0x080682B0 push {r4, lr} adds r4, r0, #0 ldrb r0, [r4, #0xc] diff --git a/include/npc.h b/include/npc.h index 615f5eca..32b575c9 100644 --- a/include/npc.h +++ b/include/npc.h @@ -10,169 +10,169 @@ typedef struct { u8 unk; } SpriteLoadData; -extern void sub_0805FD24(Entity*); -extern void sub_0805FDC0(Entity*); -extern void sub_0805FDF8(Entity*); -extern void sub_0805FFA0(Entity*); -extern void sub_0805FFD8(Entity*); -extern void sub_080600A8(Entity*); -extern void sub_080603B4(Entity*); -extern void sub_080603FC(Entity*); -extern void sub_0806097C(Entity*); -extern void sub_080609E8(Entity*); -extern void sub_08061B8C(Entity*); -extern void sub_08061C60(Entity*); -extern void sub_08062088(Entity*); -extern void sub_080620C8(Entity*); -extern void sub_08062834(Entity*); -extern void sub_08062A60(Entity*); -extern void sub_08063CF8(Entity*); -extern void sub_08063FAC(Entity*); -extern void sub_08062AD8(Entity*); -extern void sub_08062B98(Entity*); -extern void sub_08064508(Entity*); -extern void sub_08064524(Entity*); -extern void sub_08062CF0(Entity*); -extern void sub_08062E20(Entity*); -extern void sub_08062E60(Entity*); -extern void sub_08062F70(Entity*); -extern void sub_08062FF0(Entity*); -extern void sub_080631E8(Entity*); -extern void sub_080632A8(Entity*); -extern void sub_080633E0(Entity*); -extern void sub_08063524(Entity*); -extern void sub_0806370C(Entity*); -extern void sub_08063740(Entity*); -extern void sub_08063974(Entity*); -extern void sub_080639E8(Entity*); -extern void sub_08063A60(Entity*); -extern void sub_08063CC4(Entity*); -extern void sub_08063CF8(Entity*); -extern void sub_08063FAC(Entity*); -extern void sub_08064508(Entity*); -extern void sub_08064524(Entity*); -extern void sub_08064790(Entity*); -extern void sub_08064860(Entity*); -extern void sub_08064890(Entity*); -extern void sub_08064960(Entity*); -extern void sub_08064990(Entity*); -extern void sub_08064A60(Entity*); -extern void sub_08064A90(Entity*); -extern void sub_08064C6C(Entity*); -extern void sub_08064D18(Entity*); -extern void sub_08064D58(Entity*); -extern void sub_0806501C(Entity*); -extern void sub_08065054(Entity*); -extern void sub_08065534(Entity*); -extern void sub_080657A8(Entity*); -extern void sub_080657DC(Entity*); -extern void sub_0806581C(Entity*); -extern void sub_08065960(Entity*); -extern void sub_08065990(Entity*); -extern void sub_08065B1C(Entity*); -extern void sub_08065B4C(Entity*); -extern void sub_08065BA4(Entity*); -extern void sub_08065F90(Entity*); -extern void sub_08065FC0(Entity*); -extern void sub_080660A8(Entity*); -extern void sub_08066298(Entity*); -extern void sub_080662D8(Entity*); -extern void sub_080665E4(Entity*); -extern void sub_08066780(Entity*); -extern void sub_080667B0(Entity*); -extern void sub_08066948(Entity*); -extern void sub_08066978(Entity*); -extern void sub_08066A5C(Entity*); -extern void sub_08066CB4(Entity*); -extern void sub_08066FD8(Entity*); -extern void sub_08067080(Entity*); -extern void sub_08067118(Entity*); -extern void sub_08067158(Entity*); -extern void sub_08067228(Entity*); -extern void sub_0806732C(Entity*); -extern void sub_08067380(Entity*); -extern void sub_08067750(Entity*); -extern void sub_080677B4(Entity*); -extern void sub_08067DFC(Entity*); -extern void sub_08067E2C(Entity*); -extern void sub_080681E0(Entity*); -extern void sub_08068270(Entity*); -extern void sub_080682B0(Entity*); -extern void sub_080686D4(Entity*); -extern void sub_0806889C(Entity*); -extern void sub_0806897C(Entity*); -extern void sub_080689C0(Entity*); -extern void sub_08068F4C(Entity*); -extern void sub_08068F98(Entity*); -extern void sub_080692A0(Entity*); -extern void sub_080692D0(Entity*); -extern void sub_08069514(Entity*); -extern void sub_08069544(Entity*); -extern void sub_08069784(Entity*); -extern void sub_08069AE8(Entity*); -extern void sub_08069B1C(Entity*); -extern void sub_08069F2C(Entity*); -extern void sub_0806A194(Entity*); +extern void Gentari(Entity*); +extern void Gentari_Fusion(Entity*); +extern void Festari(Entity*); +extern void Festari_Fusion(Entity*); +extern void ForestMinish(Entity*); +extern void ForestMinish_Head(Entity*); +extern void ForestMinish_Fusion(Entity*); +extern void Postman(Entity*); +extern void Postman_Fusion(Entity*); +extern void NPC5(Entity*); +extern void Townsperson(Entity*); +extern void Townsperson_Head(Entity*); +extern void Townsperson_Fusion(Entity*); +extern void Kid(Entity*); +extern void Kid_Head(Entity*); +extern void Kid_Fusion(Entity*); +extern void Guard(Entity*); +extern void Guard_Head(Entity*); +extern void NPC9(Entity*); +extern void Stamp(Entity*); +extern void Maid(Entity*); +extern void Maid_Head(Entity*); +extern void Marcy(Entity*); +extern void Wheaton(Entity*); +extern void Pita(Entity*); +extern void MinishEzlo(Entity*); +extern void MinishEzlo_Head(Entity*); +extern void Mailbox(Entity*); +extern void Beedle(Entity*); +extern void Beedle_Head(Entity*); +extern void Brocco(Entity*); +extern void Brocco_Fusion(Entity*); +extern void SittingPerson(Entity*); +extern void SittingPerson_Head(Entity*); +extern void SittingPerson_Fusion(Entity*); +extern void Pina(Entity*); +extern void Pina_Fusion(Entity*); +extern void Guard(Entity*); +extern void Guard_Head(Entity*); +extern void Maid(Entity*); +extern void Maid_Head(Entity*); +extern void Din(Entity*); +extern void Din_Fusion(Entity*); +extern void Nayru(Entity*); +extern void Nayru_Fusion(Entity*); +extern void Farore(Entity*); +extern void Farore_Fusion(Entity*); +extern void Sturgeon(Entity*); +extern void Sturgeon_Head(Entity*); +extern void Sturgeon_Fusion(Entity*); +extern void TingleSiblings(Entity*); +extern void TingleSiblings_Fusion(Entity*); +extern void Stockwell(Entity*); +extern void Talon(Entity*); +extern void Talon_Head(Entity*); +extern void Talon_Fusion(Entity*); +extern void Malon(Entity*); +extern void Malon_Fusion(Entity*); +extern void Epona(Entity*); +extern void Epona_Fusion(Entity*); +extern void MilkCart(Entity*); +extern void GhostBrothers(Entity*); +extern void GhostBrothers_Fusion(Entity*); +extern void Smith(Entity*); +extern void Smith_Head(Entity*); +extern void Smith_Fusion(Entity*); +extern void NPC23(Entity*); +extern void KingDaltus(Entity*); +extern void KingDaltus_Fusion(Entity*); +extern void MinisterPotho(Entity*); +extern void MinisterPotho_Fusion(Entity*); +extern void NPC26(Entity*); +extern void Vaati(Entity*); +extern void Zelda(Entity*); +extern void Mutoh(Entity*); +extern void Mutoh_Head(Entity*); +extern void Mutoh_Fusion(Entity*); +extern void Carpenter(Entity*); +extern void Carpenter_Head(Entity*); +extern void Carpenter_Fusion(Entity*); +extern void CastorWildsStatue(Entity*); +extern void CastorWildsStatue_Fusion(Entity*); +extern void Cat(Entity*); +extern void Cat_Fusion(Entity*); +extern void MountainMinish(Entity*); +extern void MountainMinish_Head(Entity*); +extern void MountainMinish_Fusion(Entity*); +extern void ZeldaFollower(Entity*); +extern void Melari(Entity*); +extern void Melari_Head(Entity*); +extern void Melari_Fusion(Entity*); +extern void BladeBrothers(Entity*); +extern void BladeBrothers_Fusion(Entity*); +extern void Cow(Entity*); +extern void Cow_Fusion(Entity*); +extern void Goron(Entity*); +extern void Goron_Fusion(Entity*); +extern void GoronMerchant(Entity*); +extern void Gorman(Entity*); +extern void Gorman_Head(Entity*); +extern void Dog(Entity*); +extern void Dog_Head(Entity*); +extern void Dog_Fusion(Entity*); extern void Syrup(Entity*); -extern void sub_0806A2B4(Entity*); -extern void sub_0806A358(Entity*); -extern void sub_0806ABC8(Entity*); -extern void sub_0806AE0C(Entity*); -extern void sub_0806B184(Entity*); -extern void sub_0806B1CC(Entity*); -extern void sub_0806B32C(Entity*); -extern void sub_0806B3AC(Entity*); -extern void sub_0806B35C(Entity*); -extern void sub_0806B624(Entity*); -extern void sub_0806B664(Entity*); -extern void sub_0806B9D0(Entity*); -extern void sub_0806B9F0(Entity*); -extern void sub_0806BBE4(Entity*); -extern void sub_0806BC64(Entity*); -extern void sub_0806BCFC(Entity*); -extern void sub_0806BD54(Entity*); -extern void sub_0806BDAC(Entity*); -extern void sub_0806BE54(Entity*); -extern void sub_0806BF80(Entity*); -extern void sub_0806C0B0(Entity*); -extern void sub_0806C13C(Entity*); -extern void sub_0806C1D4(Entity*); +extern void Syrup_Head(Entity*); +extern void Rem(Entity*); +extern void TownMinish(Entity*); +extern void TownMinish_Head(Entity*); +extern void TownMinish_Fusion(Entity*); +extern void Librari(Entity*); +extern void Librari_Fusion(Entity*); +extern void Percy(Entity*); +extern void Percy_Head(Entity*); +extern void Percy_Fusion(Entity*); +extern void VaatiReborn(Entity*); +extern void MoblinLady(Entity*); +extern void Librarians(Entity*); +extern void Farmers(Entity*); +extern void Farmers_Head(Entity*); +extern void Farmers_Fusion(Entity*); +extern void Carlov(Entity*); +extern void Dampe(Entity*); +extern void Dampe_Fusion(Entity*); +extern void DrLeft(Entity*); +extern void KingGustaf(Entity*); +extern void Gina(Entity*); +extern void Gina_Fusion(Entity*); extern void Simon(Entity*); -extern void sub_0806C2C4(Entity*); -extern void sub_0806C36C(Entity*); -extern void sub_0806C39C(Entity*); -extern void sub_0806C478(Entity*); -extern void sub_0806C510(Entity*); -extern void sub_0806C550(Entity*); -extern void sub_0806C5A8(Entity*); -extern void sub_0806C68C(Entity*); -extern void sub_0806C738(Entity*); -extern void sub_0806C780(Entity*); -extern void sub_0806C888(Entity*); -extern void sub_0806CA94(Entity*); -extern void sub_0806CADC(Entity*); -extern void sub_0806CD70(Entity*); -extern void sub_0806CDA8(Entity*); -extern void sub_0806CEE8(Entity*); -extern void sub_0806CF18(Entity*); -extern void sub_0806D86C(Entity*); -extern void sub_0806D9D0(Entity*); -extern void sub_0806DCD4(Entity*); -extern void sub_0806DD44(Entity*); -extern void sub_0806DD78(Entity*); -extern void sub_0806DED0(Entity*); -extern void sub_0806E278(Entity*); -extern void sub_0806E308(Entity*); -extern void sub_0806E3E4(Entity*); -extern void sub_0806E458(Entity*); -extern void sub_0806E4A0(Entity*); -extern void sub_0806E6E0(Entity*); -extern void sub_0806E710(Entity*); -extern void sub_0806E894(Entity*); -extern void sub_0806E8CC(Entity*); -extern void sub_0806E8F8(Entity*); -extern void sub_0806E91C(Entity*); -extern void sub_0806EAF4(Entity*); -extern void sub_0806EBAC(Entity*); +extern void Anju(Entity*); +extern void Anju_Fusion(Entity*); +extern void Mama(Entity*); +extern void Mama_Head(Entity*); +extern void Mama_Fusion(Entity*); +extern void Emma(Entity*); +extern void Teachers(Entity*); +extern void Teachers_Head(Entity*); +extern void Teachers_Fusion(Entity*); +extern void WindTribespeople(Entity*); +extern void WindTribespeople_Head(Entity*); +extern void WindTribespeople_Fusion(Entity*); +extern void Gregal(Entity*); +extern void Gregal_Fusion(Entity*); +extern void MayorHagen(Entity*); +extern void MayorHagen_Fusion(Entity*); +extern void BigGoron(Entity*); +extern void EzloCap(Entity*); +extern void NPC4E(Entity*); +extern void NPC4E_Fusion(Entity*); +extern void NPC4F(Entity*); +extern void ClothesRack(Entity*); +extern void PicolyteBottle(Entity*); +extern void SmallTownMinish(Entity*); +extern void HurdyGurdyMan(Entity*); +extern void HurdyGurdyMan_Head(Entity*); +extern void HurdyGurdyMan_Fusion(Entity*); +extern void Cucco(Entity*); +extern void Cucco_Fusion(Entity*); +extern void CuccoChick(Entity*); +extern void CuccoChick_Fusion(Entity*); +extern void FusionMenuNPC(Entity*); +extern void FusionMenuNPC_Head(Entity*); +extern void Phonograph(Entity*); +extern void NPC58(Entity*); +extern void NPC58_Head(Entity*); #endif \ No newline at end of file diff --git a/src/bigGoron.c b/src/bigGoron.c index bc4da6bd..34a8c4b6 100644 --- a/src/bigGoron.c +++ b/src/bigGoron.c @@ -16,7 +16,7 @@ extern void PlaySFX(u32); extern void sub_0806D02C(Entity*); extern Entity* sub_0805EB2C(u32, u32, u32, u32, u32); -void sub_0806CF18(Entity* this) { +void BigGoron(Entity* this) { gUnk_081140D4[this->entityType.parameter1](this); } diff --git a/src/bladeBrothers.c b/src/bladeBrothers.c index 6ae0fede..762f93b9 100644 --- a/src/bladeBrothers.c +++ b/src/bladeBrothers.c @@ -42,7 +42,7 @@ extern u16 gUnk_0811172A[]; extern u32 gUnk_0300402B; extern EntityData gUnk_080F3494; -void sub_080689C0(Entity* this) { +void BladeBrothers(Entity* this) { if ((this->flags & 2) != 0) { gUnk_081115D0[this->action](this); @@ -397,7 +397,7 @@ void sub_08068F3C(Entity* this) { } } -void sub_08068F4C(Entity* this) { +void BladeBrothers_Fusion(Entity* this) { if (this->action == 0) { this->action += 1; diff --git a/src/cat.c b/src/cat.c index 34ed8433..8b7aa63d 100644 --- a/src/cat.c +++ b/src/cat.c @@ -7,7 +7,7 @@ extern void sub_08067C44(); extern void (*gCat[9])(Entity*); // Main -void sub_080677B4(Entity* ent) { +void Cat(Entity* ent) { gCat[ent->action](ent); sub_08067C44(ent); if (((ent->flags & 128) == 0) && ((ent->entityType).parameter1 != 5)) { diff --git a/src/clothesRack.c b/src/clothesRack.c index f789fd24..9dd18b37 100644 --- a/src/clothesRack.c +++ b/src/clothesRack.c @@ -3,6 +3,6 @@ extern void (*gUnk_0811423C[])(Entity*); -void sub_0806DD78(Entity* this) { +void ClothesRack(Entity* this) { gUnk_0811423C[this->action](this); } diff --git a/src/cow.c b/src/cow.c index c78f69e0..5833adf0 100644 --- a/src/cow.c +++ b/src/cow.c @@ -23,7 +23,7 @@ extern u32 Random(); extern u32 UpdateFuseInteraction(Entity*); extern LinkState gLinkState; -void sub_08068F98(Entity* ent) { +void Cow(Entity* ent) { gUnk_08111914[ent->action](ent); sub_0806ED78(ent); sub_0806920C(ent); @@ -228,7 +228,7 @@ void sub_0806924C(Entity* ent) { } } -void sub_080692A0(Entity* ent) { +void Cow_Fusion(Entity* ent) { if (ent->action == 0) { ent->action++; ent->spriteSettings.b.ss0 = 1; diff --git a/src/emma.c b/src/emma.c index 2776b7e9..c43b961c 100644 --- a/src/emma.c +++ b/src/emma.c @@ -10,7 +10,7 @@ extern void sub_0807DD50(Entity*); extern void sub_0807DD94(Entity*, u32); extern void DoExitTransition(u32*); -void sub_0806C550(Entity* param_1) +void Emma(Entity* param_1) { if (param_1->action == 0) { diff --git a/src/epona.c b/src/epona.c index dd3a57b1..ef7cc4f1 100644 --- a/src/epona.c +++ b/src/epona.c @@ -10,7 +10,7 @@ void sub_08065AA4(Entity*); extern void (*gUnk_0811006C[])(Entity*); extern u32 gUnk_08110080[]; -void sub_08065990(Entity* this) { +void Epona(Entity* this) { gUnk_0811006C[this->action](this); sub_08065A64(this); sub_0806ED78(this); @@ -88,7 +88,7 @@ void sub_08065AA4(Entity* this) { } } -void sub_08065B1C(Entity* this) { +void Epona_Fusion(Entity* this) { if (this->action == 0) { this->action += 1; this->spriteSettings.b.ss0 = 1; diff --git a/src/goron.c b/src/goron.c index 9b3d3f72..b1181c40 100644 --- a/src/goron.c +++ b/src/goron.c @@ -7,7 +7,7 @@ extern void (*gUnk_08111A80[])(Entity*); extern void (*gUnk_08111A8C[])(Entity*); extern u8 gUnk_02033280[]; -void sub_080692D0(Entity* this) { +void Goron(Entity* this) { if (this->flags & 2) { gUnk_08111A8C[this->action](this); } else { @@ -124,7 +124,7 @@ void sub_080694EC(Entity* this) { this->field_0x80 = anim; } -void sub_08069514(Entity* this) { +void Goron_Fusion(Entity* this) { if (this->action == 0) { this->action++; this->spriteSettings.b.ss0 = 1; diff --git a/src/mailbox.c b/src/mailbox.c index 0a200d30..24380832 100644 --- a/src/mailbox.c +++ b/src/mailbox.c @@ -10,7 +10,7 @@ extern void CreateFx(); extern void (*gMailboxBehaviors[4])(Entity*); -void sub_080631E8(Entity* this) { +void Mailbox(Entity* this) { gMailboxBehaviors[this->action](this); if (this->action != 0) { diff --git a/src/malon.c b/src/malon.c index 5727211d..3f9c4517 100644 --- a/src/malon.c +++ b/src/malon.c @@ -7,7 +7,7 @@ extern Entity gLinkEntity; extern void (*gUnk_0810FF5C[])(Entity* this); extern void (*gUnk_0810FF64[])(Entity* this); -void sub_0806581C(Entity* this) { +void Malon(Entity* this) { if (this->flags & 0x2) { gUnk_0810FF64[this->action](this); } else { @@ -69,7 +69,7 @@ void sub_08065914(Entity* this) { } } -void sub_08065960(Entity* this) { +void Malon_Fusion(Entity* this) { if (this->action == 0) { this->action++; this->spriteSettings.b.ss0 = 1; diff --git a/src/milkCart.c b/src/milkCart.c index 6f9cf30c..defc1a20 100644 --- a/src/milkCart.c +++ b/src/milkCart.c @@ -8,7 +8,7 @@ extern void UpdateAnimationSingleFrame(); extern void (*gMilkCartBehaviors[2])(Entity*); -void sub_08065B4C(Entity* ent) { +void MilkCart(Entity* ent) { gMilkCartBehaviors[ent->action](ent); sub_0806ED78(ent); } diff --git a/src/npc.c b/src/npc.c index 7716247b..49e6453f 100644 --- a/src/npc.c +++ b/src/npc.c @@ -3,61 +3,136 @@ #include "entity.h" #include "npc.h" -//TODO: group into arrays of 3: [npc, npc_HEAD, npc_FUSION] -void (*const gNPCFunctions[])(Entity* ent) = { - DeleteEntity, NULL, NULL, sub_0805FD24, NULL, sub_0805FDC0, sub_0805FDF8, NULL, - sub_0805FFA0, sub_0805FFD8, sub_080600A8, sub_080603B4, sub_080603FC, NULL, sub_0806097C, sub_080609E8, - NULL, NULL, sub_08061B8C, sub_08061C60, sub_08062088, sub_080620C8, sub_08062834, sub_08062A60, - sub_08063CF8, sub_08063FAC, NULL, sub_08062AD8, NULL, NULL, sub_08062B98, NULL, - NULL, sub_08064508, sub_08064524, NULL, sub_08062CF0, NULL, NULL, sub_08062E20, - NULL, NULL, sub_08062E60, NULL, NULL, sub_08062F70, sub_08062FF0, NULL, - sub_080631E8, NULL, NULL, sub_080632A8, sub_080633E0, NULL, sub_08063524, NULL, - sub_0806370C, sub_08063740, sub_08063974, sub_080639E8, sub_08063A60, NULL, sub_08063CC4, sub_08063CF8, - sub_08063FAC, NULL, sub_08064508, sub_08064524, NULL, sub_08064790, NULL, sub_08064860, - sub_08064890, NULL, sub_08064960, sub_08064990, NULL, sub_08064A60, sub_08064A90, sub_08064C6C, - sub_08064D18, sub_08064D58, NULL, sub_0806501C, sub_08065054, NULL, NULL, sub_08065534, - sub_080657A8, sub_080657DC, sub_0806581C, NULL, sub_08065960, sub_08065990, NULL, sub_08065B1C, - sub_08065B4C, NULL, NULL, sub_08065BA4, NULL, sub_08065F90, sub_08065FC0, sub_080660A8, - sub_08066298, sub_080662D8, NULL, NULL, sub_080665E4, NULL, sub_08066780, sub_080667B0, - NULL, sub_08066948, sub_08066978, NULL, NULL, sub_08066A5C, NULL, NULL, - sub_08066CB4, NULL, NULL, sub_08066FD8, sub_08067080, sub_08067118, sub_08067158, sub_08067228, - sub_0806732C, sub_08067380, NULL, sub_08067750, sub_080677B4, NULL, sub_08067DFC, sub_08067E2C, - sub_080681E0, sub_08068270, sub_080682B0, NULL, NULL, sub_080686D4, sub_0806889C, sub_0806897C, - sub_080689C0, NULL, sub_08068F4C, sub_08068F98, NULL, sub_080692A0, sub_080692D0, NULL, - sub_08069514, sub_08069544, NULL, NULL, sub_08069784, sub_08069AE8, NULL, sub_08069B1C, - sub_08069F2C, sub_0806A194, Syrup, sub_0806A2B4, NULL, sub_0806A358, NULL, NULL, - sub_0806ABC8, sub_0806AE0C, sub_0806B184, sub_0806B1CC, NULL, sub_0806B32C, sub_0806B3AC, sub_0806B35C, - sub_0806B624, sub_0806B664, NULL, NULL, sub_0806B9D0, NULL, NULL, sub_0806B9F0, - NULL, NULL, sub_0806BBE4, sub_0806BC64, sub_0806BCFC, sub_0806BD54, NULL, NULL, - sub_0806BDAC, NULL, sub_0806BE54, sub_0806BF80, NULL, NULL, sub_0806C0B0, NULL, - NULL, sub_0806C13C, NULL, sub_0806C1D4, Simon, NULL, NULL, sub_0806C2C4, - NULL, sub_0806C36C, sub_0806C39C, sub_0806C478, sub_0806C510, sub_0806C550, NULL, NULL, - sub_0806C5A8, sub_0806C68C, sub_0806C738, sub_0806C780, sub_0806C888, sub_0806CA94, sub_0806CADC, NULL, - sub_0806CD70, sub_0806CDA8, NULL, sub_0806CEE8, sub_0806CF18, NULL, NULL, sub_0806D86C, - NULL, NULL, sub_0806D9D0, NULL, sub_0806DCD4, sub_0806DD44, NULL, NULL, - sub_0806DD78, NULL, NULL, sub_0806DED0, NULL, NULL, sub_0806E278, NULL, - NULL, sub_0806E308, sub_0806E3E4, sub_0806E458, sub_0806E4A0, NULL, sub_0806E6E0, sub_0806E710, - NULL, sub_0806E894, sub_0806E8CC, sub_0806E8F8, NULL, sub_0806E91C, NULL, NULL, - sub_0806EAF4, sub_0806EBAC, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, - NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, - NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, - DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, - NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, - NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, - DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, - NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, - NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, - DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, - NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, - NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, - DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, - NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, - NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, +//clang-format off +void (*const gNPCFunctions[][3])(Entity* ent) = { + { DeleteEntity, NULL, NULL }, + { Gentari, NULL, Gentari_Fusion }, + { Festari, NULL, Festari_Fusion }, + { ForestMinish, ForestMinish_Head, ForestMinish_Fusion }, + { Postman, NULL, Postman_Fusion }, + { NPC5, NULL, NULL }, + { Townsperson, Townsperson_Head, Townsperson_Fusion }, + { Kid, Kid_Head, Kid_Fusion }, + { Guard, Guard_Head, NULL }, + { NPC9, NULL, NULL }, + { Stamp, NULL, NULL }, + { Maid, Maid_Head, NULL }, + { Marcy, NULL, NULL }, + { Wheaton, NULL, NULL }, + { Pita, NULL, NULL }, + { MinishEzlo, MinishEzlo_Head, NULL }, + { Mailbox, NULL, NULL }, + { Beedle, Beedle_Head, NULL }, + { Brocco, NULL, Brocco_Fusion }, + { SittingPerson, SittingPerson_Head, SittingPerson_Fusion }, + { Pina, NULL, Pina_Fusion }, + { Guard, Guard_Head, NULL }, + { Maid, Maid_Head, NULL }, + { Din, NULL, Din_Fusion }, + { Nayru, NULL, Nayru_Fusion }, + { Farore, NULL, Farore_Fusion }, + { Sturgeon, Sturgeon_Head, Sturgeon_Fusion }, + { TingleSiblings, NULL, TingleSiblings_Fusion }, + { Stockwell, NULL, NULL }, + { Talon, Talon_Head, Talon_Fusion }, + { Malon, NULL, Malon_Fusion }, + { Epona, NULL, Epona_Fusion }, + { MilkCart, NULL, NULL }, + { GhostBrothers, NULL, GhostBrothers_Fusion }, + { Smith, Smith_Head, Smith_Fusion }, + { NPC23, NULL, NULL }, + { KingDaltus, NULL, KingDaltus_Fusion }, + { MinisterPotho, NULL, MinisterPotho_Fusion }, + { NPC26, NULL, NULL }, + { Vaati, NULL, NULL }, + { Zelda, NULL, NULL }, + { Mutoh, Mutoh_Head, Mutoh_Fusion }, + { Carpenter, Carpenter_Head, Carpenter_Fusion }, + { CastorWildsStatue, NULL, CastorWildsStatue_Fusion }, + { Cat, NULL, Cat_Fusion }, + { MountainMinish, MountainMinish_Head, MountainMinish_Fusion }, + { ZeldaFollower, NULL, NULL }, + { Melari, Melari_Head, Melari_Fusion }, + { BladeBrothers, NULL, BladeBrothers_Fusion }, + { Cow, NULL, Cow_Fusion }, + { Goron, NULL, Goron_Fusion }, + { GoronMerchant, NULL, NULL }, + { Gorman, Gorman_Head, NULL }, + { Dog, Dog_Head, Dog_Fusion }, + { Syrup, Syrup_Head, NULL }, + { Rem, NULL, NULL }, + { TownMinish, TownMinish_Head, TownMinish_Fusion }, + { Librari, NULL, Librari_Fusion }, + { Percy, Percy_Head, Percy_Fusion }, + { VaatiReborn, NULL, NULL }, + { MoblinLady, NULL, NULL }, + { Librarians, NULL, NULL }, + { Farmers, Farmers_Head, Farmers_Fusion }, + { Carlov, NULL, NULL }, + { Dampe, NULL, Dampe_Fusion }, + { DrLeft, NULL, NULL }, + { KingGustaf, NULL, NULL }, + { Gina, NULL, Gina_Fusion }, + { Simon, NULL, NULL }, + { Anju, NULL, Anju_Fusion }, + { Mama, Mama_Head, Mama_Fusion }, + { Emma, NULL, NULL }, + { Teachers, Teachers_Head, Teachers_Fusion }, + { WindTribespeople, WindTribespeople_Head, WindTribespeople_Fusion }, + { Gregal, NULL, Gregal_Fusion }, + { MayorHagen, NULL, MayorHagen_Fusion }, + { BigGoron, NULL, NULL }, + { EzloCap, NULL, NULL }, + { NPC4E, NULL, NPC4E_Fusion }, + { NPC4F, NULL, NULL }, + { ClothesRack, NULL, NULL }, + { PicolyteBottle, NULL, NULL }, + { SmallTownMinish, NULL, NULL }, + { HurdyGurdyMan, HurdyGurdyMan_Head, HurdyGurdyMan_Fusion }, + { Cucco, NULL, Cucco_Fusion }, + { CuccoChick, NULL, CuccoChick_Fusion }, + { FusionMenuNPC, FusionMenuNPC_Head, NULL }, + { Phonograph, NULL, NULL }, + { NPC58, NPC58_Head, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL }, + { DeleteEntity, NULL, NULL } }; - -const u8 npc_unk[] = { - 0x04, - 0x05, - 0x06, - 0x06 -}; \ No newline at end of file +//clang-format on +const u8 npc_unk[] = { 0x04, 0x05, 0x06, 0x06 }; \ No newline at end of file diff --git a/src/rem.c b/src/rem.c index 3357a1b4..38bdcca1 100644 --- a/src/rem.c +++ b/src/rem.c @@ -16,7 +16,7 @@ extern void (*gUnk_08112278[])(Entity*); extern void gUnk_08012F0C; -void sub_0806A358(Entity* this) { +void Rem(Entity* this) { gUnk_08112260[this->entityType.parameter1](this); } diff --git a/src/stamp.c b/src/stamp.c index 90d5a6e6..51769652 100644 --- a/src/stamp.c +++ b/src/stamp.c @@ -44,7 +44,7 @@ extern void (*gStampBehaviors2[2])(Entity*); extern TextBox gTextBox; extern u32 gUnk_0810C2E4; -void sub_08062B98(Entity* ent) { +void Stamp(Entity* ent) { if ((ent->flags & 2) != 0) { gStampBehaviors2[ent->action](ent); } else { diff --git a/src/talon.c b/src/talon.c index a19270ed..d20f6b15 100644 --- a/src/talon.c +++ b/src/talon.c @@ -14,7 +14,7 @@ extern u8 gUnk_0810FED8[]; void sub_0806574C(Entity* this); -void sub_08065534(Entity* this) { +void Talon(Entity* this) { if (this->flags & 2) { gUnk_0810FEC4[this->action](this); } else { @@ -143,14 +143,14 @@ void sub_08065780(Entity* this, u16* param_2) { param_2[8] = gUnk_0810FED8[rand >> 8 & 7]; } -void sub_080657A8(Entity* this) { +void Talon_Head(Entity* this) { sub_0806FF60(this, 0, ((this->frames.all & 7) + 0xB)); sub_0806FF60(this, 1, this->animationList); sub_0806FF88(this, 1, 0); sub_0807000C(this); } -void sub_080657DC(Entity* this) { +void Talon_Fusion(Entity* this) { if (this->action == 0) { if (LoadExtraSpriteData(this, &gUnk_0810FEB0) != 0) { this->action++; diff --git a/src/townMinish.c b/src/townMinish.c index 14f0ce8e..49cf549b 100644 --- a/src/townMinish.c +++ b/src/townMinish.c @@ -12,7 +12,7 @@ extern void sub_0806ACC4(Entity *); extern u32 LoadExtraSpriteData(Entity *, SpriteLoadData *); extern SpriteLoadData gUnk_08112674[]; -void sub_0806ABC8(Entity *this) +void TownMinish(Entity *this) { if ((this->flags & 2) == 0) { (*gUnk_081126E8[this->action])(this); diff --git a/src/zelda.c b/src/zelda.c index d96de629..1af502cf 100644 --- a/src/zelda.c +++ b/src/zelda.c @@ -31,7 +31,7 @@ extern void (*gUnk_08110BD8[])(Entity* ent); extern u8 gUnk_02033280[]; extern u16 gUnk_08110BE0[]; -void sub_08066CB4(Entity* ent) { +void Zelda(Entity* ent) { gUnk_08110BD8[ent->action](ent); }