Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Complete felicity bank #141

Merged
merged 7 commits into from
Jul 24, 2023
Merged

Complete felicity bank #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11d98c1
Clean felicity bank
Kermalis Jul 22, 2023
b231af2
Forgor this
Kermalis Jul 22, 2023
d45718c
And this
Kermalis Jul 22, 2023
a5c7e73
Clean gulpin/felicity
Kermalis Jul 22, 2023
5dec0a0
Match `UpdateFelicityBankDialogue()`
Kermalis Jul 23, 2023
117feaf
Move xxx_call_draw_string to text.h
Kermalis Jul 23, 2023
908f09a
Complete felicity bank
Kermalis Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions asm/code_801EE10_mid.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,14 +1419,14 @@ _0802038C:
ldrsh r1, [r2, r5]
adds r2, 0x24
movs r0, 0
bl DisplayGulpinDialogueSprite
bl CreateGulpinShop
b _08020562
_080203A2:
movs r0, 0xC
ldrsh r1, [r2, r0]
adds r2, 0x24
movs r0, 0x1
bl DisplayGulpinDialogueSprite
bl CreateGulpinShop
b _08020562
_080203B0:
ldr r2, [r5]
Expand Down Expand Up @@ -2709,14 +2709,14 @@ sub_8020D90:
ldr r1, _08020DB8
ldr r1, [r1]
strb r0, [r1, 0x14]
bl sub_801E93C
bl DestroyGulpinShop
movs r0, 0x1A
bl sub_801FDA8
b _08020DC6
.align 2, 0
_08020DB8: .4byte gUnknown_203B27C
_08020DBC:
bl sub_801E93C
bl DestroyGulpinShop
movs r0, 0x10
bl sub_801FDA8
_08020DC6:
Expand Down
Loading