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/kangaskhan_storage_1.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/kangaskhan_storage_1.s')
-rw-r--r-- | asm/kangaskhan_storage_1.s | 129 |
1 files changed, 0 insertions, 129 deletions
diff --git a/asm/kangaskhan_storage_1.s b/asm/kangaskhan_storage_1.s index 41378b7..910210c 100644 --- a/asm/kangaskhan_storage_1.s +++ b/asm/kangaskhan_storage_1.s @@ -932,133 +932,4 @@ _08017D1A: bx r0 thumb_func_end sub_8017C7C - thumb_func_start sub_8017D24 -sub_8017D24: - push {r4,lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - bl sub_801CA08 - ldr r4, _08017D64 - ldr r0, [r4] - adds r0, 0x58 - bl sub_8012FD8 - lsls r0, 24 - cmp r0, 0 - bne _08017D54 - ldr r0, [r4] - adds r0, 0x58 - mov r1, sp - bl sub_8013114 - ldr r1, [sp] - cmp r1, 0x1 - beq _08017D54 - ldr r0, [r4] - str r1, [r0, 0x20] -_08017D54: - ldr r0, [sp] - cmp r0, 0x3 - beq _08017D6E - cmp r0, 0x3 - bgt _08017D68 - cmp r0, 0x1 - beq _08017DB0 - b _08017DB6 - .align 2, 0 -_08017D64: .4byte gUnknown_203B208 -_08017D68: - cmp r0, 0x6 - beq _08017DA8 - b _08017DB6 -_08017D6E: - bl sub_8090A34 - cmp r0, 0x13 - ble _08017D82 - bl sub_801CBB8 - movs r0, 0x6 - bl UpdateKangaskhanStorageState - b _08017DB6 -_08017D82: - ldr r0, _08017D9C - ldr r0, [r0] - ldrb r0, [r0, 0xE] - bl sub_8090A60 - lsls r0, 24 - cmp r0, 0 - beq _08017DA0 - movs r0, 0x18 - bl UpdateKangaskhanStorageState - b _08017DB6 - .align 2, 0 -_08017D9C: .4byte gUnknown_203B208 -_08017DA0: - movs r0, 0x1B - bl UpdateKangaskhanStorageState - b _08017DB6 -_08017DA8: - movs r0, 0x1A - bl UpdateKangaskhanStorageState - b _08017DB6 -_08017DB0: - movs r0, 0x17 - bl UpdateKangaskhanStorageState -_08017DB6: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8017D24 - - thumb_func_start sub_8017DC0 -sub_8017DC0: - push {lr} - bl sub_801B410 - cmp r0, 0x1 - bls _08017DD8 - cmp r0, 0x3 - bhi _08017DD8 - bl sub_801B450 - movs r0, 0xE - bl UpdateKangaskhanStorageState -_08017DD8: - pop {r0} - bx r0 - thumb_func_end sub_8017DC0 - - thumb_func_start sub_8017DDC -sub_8017DDC: - push {lr} - bl sub_801B410 - cmp r0, 0x1 - bls _08017DF4 - cmp r0, 0x3 - bhi _08017DF4 - bl sub_801B450 - movs r0, 0x17 - bl UpdateKangaskhanStorageState -_08017DF4: - pop {r0} - bx r0 - thumb_func_end sub_8017DDC - - thumb_func_start sub_8017DF8 -sub_8017DF8: - push {lr} - sub sp, 0x4 - mov r0, sp - bl sub_80144A4 - cmp r0, 0 - bne _08017E10 - ldr r0, _08017E18 - ldr r0, [r0] - ldr r0, [r0, 0x8] - bl UpdateKangaskhanStorageState -_08017E10: - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_08017E18: .4byte gUnknown_203B208 - thumb_func_end sub_8017DF8 - .align 2,0 |