diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-04-30 19:39:16 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-05-02 23:44:16 +0200 |
| commit | e702bffca953a97da1579ae68482e8afef32257b (patch) | |
| tree | 161347280c568c0d826b408d774ac70e4a06a021 /data | |
| parent | 5ad4559642c4e192fff84fd01a8b6a4ac3d39c57 (diff) | |
Decompile goronMerchant
Diffstat (limited to 'data')
| -rw-r--r-- | data/const/npc/bladeBrothers.s | 2 | ||||
| -rw-r--r-- | data/const/npc/goronMerchant.s | 18 | ||||
| -rw-r--r-- | data/data_080FC8A4.s | 2 | ||||
| -rw-r--r-- | data/scripts/script_08010264.inc | 2 |
4 files changed, 3 insertions, 21 deletions
diff --git a/data/const/npc/bladeBrothers.s b/data/const/npc/bladeBrothers.s index eba691a7..a2265099 100644 --- a/data/const/npc/bladeBrothers.s +++ b/data/const/npc/bladeBrothers.s @@ -12,7 +12,7 @@ gUnk_081115C0:: @ 081115C0 gUnk_081115D0:: @ 081115D0 .4byte sub_08068AFC - .4byte FUN_08068b2c + .4byte sub_08068b2c .4byte sub_08068B70 gUnk_081115DC:: @ 081115DC diff --git a/data/const/npc/goronMerchant.s b/data/const/npc/goronMerchant.s deleted file mode 100644 index b2c8b139..00000000 --- a/data/const/npc/goronMerchant.s +++ /dev/null @@ -1,18 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08111B88:: @ 08111B88 - .4byte sub_08069584 - .4byte sub_080695AC - .4byte sub_080695E8 - .4byte sub_0806961C - -gUnk_08111B98:: @ 08111B98 - .4byte sub_0806963C - .4byte sub_08069654 - -gUnk_08111BA0:: @ 08111BA0 - .incbin "baserom.gba", 0x111BA0, 0x000001E diff --git a/data/data_080FC8A4.s b/data/data_080FC8A4.s index 41fbfa1c..4ae5d7cd 100644 --- a/data/data_080FC8A4.s +++ b/data/data_080FC8A4.s @@ -48,7 +48,7 @@ gUnk_080FC9B0:: @ 080FC9B0 .4byte sub_0805141C gUnk_080FC9BC:: @ 080FC9BC - .4byte FUN_080515c8 + .4byte sub_080515c8 .4byte sub_080515D4 .4byte sub_080516E0 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index 08c027a3..7e020262 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -487,7 +487,7 @@ script_08010860: _0807EA94 _0807E3E8 JumpIfNot script_080108B2 - Call sub_08069718 + Call GoronMerchant_TryToBuyKinstone JumpIfNot script_080108B2 WaitPlayerAction8 _0807EA94 |