diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-08-12 17:26:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 17:26:01 -0700 |
| commit | d9883945954a30e4b753ecbd5d807f4b6cd2a38a (patch) | |
| tree | 093c45ab4de91a75d546f58a6672dfc72136677c /asm/code_80A26CC.s | |
| parent | e005410884803f1ec8f5942bd0c8d2da5c2e29c8 (diff) | |
More data dumping and some code cleaning (#46)
* more data dumping and some code cleaning
* split out cutscene scripts
* initial start at script conversion
* more script work
* use correct type
* clearer up struct field names
* split known scripts into seperate files
* no need to preproc pure ascii strings in debug
* more cutscene work
* split out personality test scripts
* solidify text macros and doc some dungeon fields
* more scripting work
Diffstat (limited to 'asm/code_80A26CC.s')
| -rw-r--r-- | asm/code_80A26CC.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/code_80A26CC.s b/asm/code_80A26CC.s index 26c886e..48d8179 100644 --- a/asm/code_80A26CC.s +++ b/asm/code_80A26CC.s @@ -4526,7 +4526,7 @@ sub_80A4A7C: bl sub_809D600 movs r0, 0 bl sub_80A5E8C - bl sub_80A4AEC + bl GroundMap_Reset add sp, 0x4 pop {r4} pop {r0} @@ -4540,7 +4540,7 @@ _080A4AC0: .4byte gUnknown_811736C thumb_func_start sub_80A4AC4 sub_80A4AC4: push {r4,lr} - bl sub_80A4AEC + bl GroundMap_Reset bl sub_80A5EBC ldr r4, _080A4AE8 ldr r0, [r4] @@ -4556,8 +4556,8 @@ sub_80A4AC4: _080A4AE8: .4byte gUnknown_3001B6C thumb_func_end sub_80A4AC4 - thumb_func_start sub_80A4AEC -sub_80A4AEC: + thumb_func_start GroundMap_Reset +GroundMap_Reset: push {r4,lr} movs r0, 0 movs r1, 0x37 @@ -4588,7 +4588,7 @@ _080A4B1E: _080A4B2C: .4byte gUnknown_3001B6C _080A4B30: .4byte gUnknown_8117538 _080A4B34: .4byte gUnknown_3001B70 - thumb_func_end sub_80A4AEC + thumb_func_end GroundMap_Reset thumb_func_start sub_80A4B38 sub_80A4B38: |