diff options
| author | Swastik Baranwal <swstkbaranwal@gmail.com> | 2019-06-23 18:47:35 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 18:47:35 +0530 |
| commit | 99703c6ab831d34e6859d8a8f53ba8e73dc4d3d9 (patch) | |
| tree | 3a712d3039d152616af58a45a13d82c40a87e58f /asm/pokemon_3.s | |
| parent | 6d190f861e3559eec922cd760778c0cba6e08397 (diff) | |
| parent | 9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff) | |
Merge pull request #5 from pret/master
Take files
Diffstat (limited to 'asm/pokemon_3.s')
| -rw-r--r-- | asm/pokemon_3.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index 0d4ee1bcb..416c996bb 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -785,8 +785,8 @@ _08044AE8: .4byte gUnknown_825E05C _08044AEC: .4byte gUnknown_82349BC thumb_func_end sub_8044A40 - thumb_func_start sub_8044AF0 -sub_8044AF0: @ 8044AF0 + thumb_func_start SetUpMonSpriteManagerMaybe +SetUpMonSpriteManagerMaybe: @ 8044AF0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -1124,7 +1124,7 @@ _08044D70: bx r1 .align 2, 0 _08044D7C: .4byte gUnknown_20244F4 - thumb_func_end sub_8044AF0 + thumb_func_end SetUpMonSpriteManagerMaybe thumb_func_start sub_8044D80 sub_8044D80: @ 8044D80 |