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/event_flag.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/event_flag.s')
| -rw-r--r-- | asm/event_flag.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/event_flag.s b/asm/event_flag.s index ed10285..1affa18 100644 --- a/asm/event_flag.s +++ b/asm/event_flag.s @@ -1557,17 +1557,17 @@ _08001F7E: cmp r0, 0 beq _08001FCC movs r0, 0x90 - bl sub_808E734 + bl HasRecruitedMon lsls r0, 24 cmp r0, 0 beq _08001FCC movs r0, 0x91 - bl sub_808E734 + bl HasRecruitedMon lsls r0, 24 cmp r0, 0 beq _08001FCC movs r0, 0x92 - bl sub_808E734 + bl HasRecruitedMon lsls r0, 24 cmp r0, 0 beq _08001FCC @@ -1668,7 +1668,7 @@ _08002086: beq _080020AE movs r0, 0x89 lsls r0, 1 - bl sub_808E734 + bl HasRecruitedMon lsls r0, 24 cmp r0, 0 beq _080020AE @@ -1685,7 +1685,7 @@ _080020AE: cmp r0, 0 beq _080020D4 ldr r0, _080020E4 - bl sub_808E734 + bl HasRecruitedMon lsls r0, 24 cmp r0, 0 beq _080020D4 |