diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 23:45:39 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 23:45:39 -0400 |
| commit | 60cd04b02300c288a01a2f78a44cb39cbe6861d1 (patch) | |
| tree | ef5bb2bd660a2020864c909fb5dda73f027a9e7c /engine/map_objects.asm | |
| parent | e674869018ffe8f9be2351b2b569eb7300910e6a (diff) | |
Trainer data structure and field move functions
Trainer data in map scripts is now a macro-defined structure.
Field move functions in main.asm are now nearly completely annotated, with local references.
Trailing white space deleted.
Diffstat (limited to 'engine/map_objects.asm')
| -rw-r--r-- | engine/map_objects.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm index dab1e2d38..c7ac32fcc 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2446,19 +2446,19 @@ Function503d: ; 503d ; 5041 Function5041: ; 5041 - call Function5055 + call CopyMovementPointer .loop xor a ld [wc2ea], a - call Function505e - call Function506b + call GetMovementByte + call DoMovementFunction ld a, [wc2ea] and a jr nz, .loop ret ; 5055 -Function5055: ; 5055 +CopyMovementPointer: ; 5055 ld a, l ld [wc2eb], a ld a, h @@ -2466,7 +2466,7 @@ Function5055: ; 5055 ret ; 505e -Function505e: ; 505e +GetMovementByte: ; 505e ld hl, wc2eb ld a, [hli] ld h, [hl] @@ -2480,7 +2480,7 @@ Function5065: ; 5065 ret ; 506b -Function506b: ; 506b +DoMovementFunction: ; 506b push af call Function54b8 pop af |