diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-07-09 17:35:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 19:35:12 -0500 |
| commit | 386299d1f401cb939e6fe3ea16d0ca57731b2648 (patch) | |
| tree | bb0644a8ad61f43d483dfbc2932011bcfa2388ab /asm | |
| parent | f55ac4c552291687f5a3972b2ad9bdb187676229 (diff) | |
Makefile and Install.md Revamp (#41)
* Makefile: move over to gcc for preproc and ditch cpp
* INSTALL: rewrite INSTALL
* README: add CI badge
* Makefile: make tools build before anything else
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/friend_list_menu.s | 8 | ||||
| -rw-r--r-- | asm/kangaskhan_storage_2.s | 45 | ||||
| -rw-r--r-- | asm/kecleon_items.s | 8 |
3 files changed, 8 insertions, 53 deletions
diff --git a/asm/friend_list_menu.s b/asm/friend_list_menu.s index a8603b8..46903a6 100644 --- a/asm/friend_list_menu.s +++ b/asm/friend_list_menu.s @@ -2272,7 +2272,7 @@ _0802005C: .4byte gUnknown_203B27C _08020060: .4byte gGulpinDialogue _08020064: movs r0, 0x3 - bl sub_8016C40 + bl DrawTeamMoneyBox b _08020562 _0802006C: ldr r2, [r5] @@ -6233,12 +6233,12 @@ _08021FE2: bl sub_8021354 _08021FE8: movs r0, 0x1 - bl sub_8016C40 + bl DrawTeamMoneyBox b _080222B6 _08021FF0: bl sub_8021494 movs r0, 0x1 - bl sub_8016C40 + bl DrawTeamMoneyBox bl sub_8022380 ldr r0, _08022020 ldr r2, [r0] @@ -6976,7 +6976,7 @@ _080225B0: b _080225C2 _080225BC: movs r0, 0x1 - bl sub_8016C40 + bl DrawTeamMoneyBox _080225C2: pop {r4} pop {r0} diff --git a/asm/kangaskhan_storage_2.s b/asm/kangaskhan_storage_2.s index 24a5a3c..efdac5f 100644 --- a/asm/kangaskhan_storage_2.s +++ b/asm/kangaskhan_storage_2.s @@ -5,51 +5,6 @@ .text - thumb_func_start sub_8018280 -sub_8018280: - push {r4,lr} - sub sp, 0x4 - ldr r4, _080182DC - ldr r0, [r4] - adds r0, 0xD4 - ldr r0, [r0] - bl sub_8008C54 - ldr r0, [r4] - adds r0, 0xD4 - ldr r0, [r0] - bl sub_80073B8 - ldr r2, _080182E0 - ldr r0, [r4] - adds r0, 0xD4 - ldr r3, [r0] - movs r0, 0 - str r0, [sp] - movs r0, 0x4 - movs r1, 0 - bl xxx_call_draw_string - ldr r0, [r4] - adds r0, 0xC0 - bl sub_8013C68 - ldr r0, [r4] - adds r0, 0xD4 - ldr r0, [r0] - bl sub_80073E0 - bl sub_801CCD8 - movs r0, 0 - bl sub_801AD34 - ldr r0, [r4] - adds r0, 0x70 - movs r1, 0 - bl sub_8012EA4 - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080182DC: .4byte gUnknown_203B20C -_080182E0: .4byte gUnknown_80DB830 - thumb_func_end sub_8018280 - thumb_func_start sub_80182E4 sub_80182E4: push {r4-r7,lr} diff --git a/asm/kecleon_items.s b/asm/kecleon_items.s index 72a16f2..1902345 100644 --- a/asm/kecleon_items.s +++ b/asm/kecleon_items.s @@ -426,7 +426,7 @@ _0801922A: movs r0, 0 bl sub_801AD34 movs r0, 0x1 - bl sub_8016C40 + bl DrawTeamMoneyBox bl sub_80195C0 ldr r0, _08019250 ldr r2, [r0] @@ -579,12 +579,12 @@ _08019372: bl sub_801A8D0 _08019378: movs r0, 0x1 - bl sub_8016C40 + bl DrawTeamMoneyBox b _080194E8 _08019380: bl sub_801A9E0 movs r0, 0x1 - bl sub_8016C40 + bl DrawTeamMoneyBox bl sub_8019660 ldr r0, _080193B0 ldr r2, [r0] @@ -1520,7 +1520,7 @@ _08019AF4: movs r0, 0 bl sub_801AD34 movs r0, 0x1 - bl sub_8016C40 + bl DrawTeamMoneyBox _08019B00: pop {r4,r5} pop {r0} |