diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-06-09 22:54:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 22:54:21 -0500 |
| commit | 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 (patch) | |
| tree | 5440970e02a7890791b234aa233e91e5c1d65b40 /asm/exclusive_pokemon.s | |
| parent | eaa141c612dd1689936a21bd57018a55ff686b69 (diff) | |
Dungeon pokemon/Floor ID JSON Part 1 (#39)
* move Thunderwave and Tiny Woods pokemon to json
* rule tweaking to actually build tool before parsing JSON
* delete .inc pokemon for tiny Woods and Thunderwave
* silence git complaining about br_ips and ips_patch
* use defines for species and pass the header file for species
* convert sinister woods
* convert MtThunderPeak
* convert silent chasm
* add trial floor_id w/ tiny woods
* change make rule name to fix compile
* MtSteel converted and bugfix
* convert few floor headers and great canyon pokemon
* code cleanup
* unify unkData into UnkTextStruct2
* more code cleanup and some text decomp
* doc more funcs and decomp/split some stuff
* document more save stuff
* more save work and move some data
* pika sniped UpdateNatureTotal
* decomp a litle and convert a few more dungeons
* better scanning for json files
* mt freeze and peak
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 593b931..d0d2a1f 100644 --- a/asm/exclusive_pokemon.s +++ b/asm/exclusive_pokemon.s @@ -402,8 +402,8 @@ _08098240: .4byte gUnknown_203B498 _08098244: .4byte gExclusivePokemon thumb_func_end UnlockExclusivePokemon - thumb_func_start sub_8098248 -sub_8098248: + thumb_func_start WriteExclusivePokemon +WriteExclusivePokemon: push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -496,10 +496,10 @@ _080982E4: .align 2, 0 _08098300: .4byte gUnknown_203B498 _08098304: .4byte 0x000001a7 - thumb_func_end sub_8098248 + thumb_func_end WriteExclusivePokemon - thumb_func_start sub_8098308 -sub_8098308: + thumb_func_start ReadExclusivePokemon +ReadExclusivePokemon: push {r4-r7,lr} mov r7, r8 push {r7} @@ -600,7 +600,7 @@ _0809839C: .align 2, 0 _080983D0: .4byte gUnknown_203B498 _080983D4: .4byte 0x000001a7 - thumb_func_end sub_8098308 + thumb_func_end ReadExclusivePokemon .align 2,0 |