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/text.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/text.s')
-rw-r--r-- | asm/text.s | 46 |
1 files changed, 0 insertions, 46 deletions
@@ -5,52 +5,6 @@ .text - thumb_func_start nullsub_152 -nullsub_152: - bx lr - thumb_func_end nullsub_152 - - thumb_func_start sub_8006518 -sub_8006518: - push {r4-r7,lr} - ldr r4, _0800653C - adds r2, r0, 0 - movs r3, 0x3 -_08006520: - adds r1, r2, 0 - adds r0, r4, 0 - ldm r0!, {r5-r7} - stm r1!, {r5-r7} - ldm r0!, {r5-r7} - stm r1!, {r5-r7} - adds r4, 0x18 - adds r2, 0x18 - subs r3, 0x1 - cmp r3, 0 - bge _08006520 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0800653C: .4byte gUnknown_202AFC0 - thumb_func_end sub_8006518 - - thumb_func_start nullsub_153 -nullsub_153: - bx lr - thumb_func_end nullsub_153 - - thumb_func_start sub_8006544 -sub_8006544: - ldr r1, _08006550 - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bx lr - .align 2, 0 -_08006550: .4byte gUnknown_80B8814 - thumb_func_end sub_8006544 - thumb_func_start sub_8006554 sub_8006554: push {r4-r7,lr} |