diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-04-19 21:55:40 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-19 23:55:40 -0500 |
commit | f65dee5a143bd543c74c010d7252eb76893ee243 (patch) | |
tree | d343e826c63f8b501d37873c3c7bc1f010819deb /asm/code_808DAB4.s | |
parent | d316d1e359c7672277a9cf644acd4e40170f5968 (diff) |
Wonder mail and some boss dialogues (#36)
* more wonder mail and main menu work
* Lots of things.. doc'ing, decomping, and other things
* continue decomping boss scenes
* up to Suicune
* up to Mewtwo dialogue
* up to Raquaza
* fix spelling error on Rayquaza and decomp a few more
* up to groudon
* divide > shift
Diffstat (limited to 'asm/code_808DAB4.s')
-rw-r--r-- | asm/code_808DAB4.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/code_808DAB4.s b/asm/code_808DAB4.s index 9684943..93e7bf3 100644 --- a/asm/code_808DAB4.s +++ b/asm/code_808DAB4.s @@ -1201,8 +1201,8 @@ _0808E72C: bx r0 thumb_func_end sub_808E6F4 - thumb_func_start sub_808E734 -sub_808E734: + thumb_func_start HasRecruitedMon +HasRecruitedMon: push {r4-r6,lr} lsls r0, 16 asrs r4, r0, 16 @@ -1236,7 +1236,7 @@ _0808E76A: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_808E734 + thumb_func_end HasRecruitedMon thumb_func_start sub_808E770 sub_808E770: |