diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-06-25 02:37:36 +0200 |
|---|---|---|
| committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-06-25 02:37:36 +0200 |
| commit | eb45bd624273150d028a89b93be3a4403d1b82d4 (patch) | |
| tree | 4a244917609a26794805d9d67e732fd64788780f | |
| parent | 409fcb6e9d7265812a866ee5ed4d515dfc3f7c83 (diff) | |
wip trade
| -rw-r--r-- | asm/trade.s | 12 | ||||
| -rw-r--r-- | src/trade.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/asm/trade.s b/asm/trade.s index 4ed8edea7..c8ffe1c95 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -6,6 +6,10 @@ .text +.ifdef ENGLISH + .set sub_804A96C_alt, sub_804A96C +.endif + thumb_func_start sub_8047CD8 sub_8047CD8: @ 8047CD8 push {lr} @@ -4348,7 +4352,7 @@ _08049F8E: movs r5, 0 str r5, [sp, 0x8] movs r2, 0 - bl sub_804A96C + bl sub_804A96C_alt ldr r0, [sp, 0x6C] cmp r0, 0 beq _0804A08C @@ -4407,7 +4411,7 @@ _0804A0E4: movs r5, 0 str r5, [sp, 0x8] movs r2, 0 - bl sub_804A96C + bl sub_804A96C_alt ldr r0, _0804A22C @ =gUnknown_03004824 ldr r3, [r0] ldr r1, [sp, 0x6C] @@ -5347,7 +5351,7 @@ sub_804A840: @ 804A840 str r5, [sp, 0x8] movs r1, 0 movs r2, 0 - bl sub_804A96C + bl sub_804A96C_alt movs r0, 0 bl sub_804A6DC movs r0, 0 @@ -5387,7 +5391,7 @@ _0804A8A8: str r1, [sp, 0x8] movs r1, 0xF movs r2, 0 - bl sub_804A96C + bl sub_804A96C_alt movs r0, 0x1 bl sub_804A6DC movs r0, 0x1 diff --git a/src/trade.c b/src/trade.c index 533a5b5cf..cb190d194 100644 --- a/src/trade.c +++ b/src/trade.c @@ -56,7 +56,7 @@ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 widt } #if GERMAN -void sub_804AD20(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) { +void sub_804A96C_alt(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) { sub_804A96C(arg0, left, top, tilemap, width, height, sp8); arg0->var10 = 1; |