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/code_808EAB0.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/code_808EAB0.s')
| -rw-r--r-- | asm/code_808EAB0.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/code_808EAB0.s b/asm/code_808EAB0.s index 45acd74..a008794 100644 --- a/asm/code_808EAB0.s +++ b/asm/code_808EAB0.s @@ -70,8 +70,8 @@ _0808ED70: .4byte gRecruitedPokemonRef _0808ED74: .4byte 0x00008f88 thumb_func_end sub_808ED00 - thumb_func_start sub_808ED78 -sub_808ED78: + thumb_func_start SaveRecruitedPokemon +SaveRecruitedPokemon: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -215,10 +215,10 @@ _0808EE64: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_808ED78 + thumb_func_end SaveRecruitedPokemon - thumb_func_start sub_808EE9C -sub_808EE9C: + thumb_func_start ReadRecruitedPokemon +ReadRecruitedPokemon: push {r4-r7,lr} mov r7, r8 push {r7} @@ -346,7 +346,7 @@ _0808EF84: .align 2, 0 _0808EF98: .4byte 0x00008f88 _0808EF9C: .4byte gRecruitedPokemonRef - thumb_func_end sub_808EE9C + thumb_func_end ReadRecruitedPokemon thumb_func_start sub_808EFA0 sub_808EFA0: @@ -2232,7 +2232,7 @@ _0808FF0C: .4byte gUnknown_810DFC8 _0808FF10: .4byte gUnknown_810DEF4 _0808FF14: .4byte gUnknown_810E02C _0808FF18: .4byte gUnknown_810DF98 -_0808FF1C: .4byte gUnknown_810DFCC +_0808FF1C: .4byte gEvolutionStrings thumb_func_end sub_808F844 thumb_func_start sub_808FF20 |