diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-04-05 22:05:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-05 22:05:09 -0500 |
| commit | d316d1e359c7672277a9cf644acd4e40170f5968 (patch) | |
| tree | 82bc44e67d6219e53fac89caff5db22c5a394b1e /asm/exclusive_pokemon.s | |
| parent | 22fec43f1812cb863ad699b357bd593222ae140c (diff) | |
Preproc all the data (#35)
* actually put C files in preproc and use it for formatted type names. Cleaned up makefile like pokeemerald
* finish adding all colors and text macros to charmap
* preproc all the data and use text macros
* move all of wonder_mail_1 to src
* unify wonder_mail and wonder_mail_mid
* small code cleanup
* name two more exclusive pokemon funcs
* decomp a few more wonder mail funcs
* clean up MemoryFill call
* doc more of wonder mail in main menu
Diffstat (limited to 'asm/exclusive_pokemon.s')
| -rw-r--r-- | asm/exclusive_pokemon.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/exclusive_pokemon.s b/asm/exclusive_pokemon.s index f52efbc..593b931 100644 --- a/asm/exclusive_pokemon.s +++ b/asm/exclusive_pokemon.s @@ -338,8 +338,8 @@ _080981D4: _080981D8: .4byte gUnknown_203B498 thumb_func_end sub_80981A0 - thumb_func_start sub_80981DC -sub_80981DC: + thumb_func_start IsExclusivePokemonUnlocked +IsExclusivePokemonUnlocked: push {r4,r5,lr} lsls r0, 16 asrs r3, r0, 16 @@ -369,10 +369,10 @@ _0809820E: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80981DC + thumb_func_end IsExclusivePokemonUnlocked - thumb_func_start sub_8098214 -sub_8098214: + thumb_func_start UnlockExclusivePokemon +UnlockExclusivePokemon: push {r4-r6,lr} lsls r0, 16 asrs r3, r0, 16 @@ -400,7 +400,7 @@ _08098232: .align 2, 0 _08098240: .4byte gUnknown_203B498 _08098244: .4byte gExclusivePokemon - thumb_func_end sub_8098214 + thumb_func_end UnlockExclusivePokemon thumb_func_start sub_8098248 sub_8098248: |