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/specials.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/specials.asm')
-rw-r--r-- | engine/specials.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/specials.asm b/engine/specials.asm index 2aa38b166..7c2a25316 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -14,7 +14,7 @@ Special:: ; c01b ; c029 SpecialsPointers:: ; c029 - add_special WarpToLastSpawn + add_special WarpToSpawnPoint ; Communications add_special Special_SetBitsForLinkTradeRequest @@ -58,7 +58,7 @@ SpecialsPointers:: ; c029 add_special Function90913 add_special Functionc2c0 add_special Functionc2cd - add_special Functionc355 + add_special MapRadio add_special Functionc360 add_special Functionc373 add_special Functionc380 @@ -92,7 +92,7 @@ SpecialsPointers:: ; c029 add_special Special_SelectRandomBugContestContestants add_special Functionc3fc add_special Function26feb - add_special Function27043 + add_special ToggleDecorationsVisibility add_special SpecialGiveShuckle add_special SpecialReturnShuckle add_special Function73f7 @@ -150,7 +150,7 @@ SpecialsPointers:: ; c029 add_special Function101225 add_special Function101231 add_special Function4925b - add_special Function8adef + add_special SpecialOmanyteChamber add_special Function11c1ab add_special Function170687 add_special Function8ae68 @@ -367,10 +367,10 @@ BugContestJudging: ; c34a ret ; c355 -Functionc355: ; c355 +MapRadio: ; c355 ld a, [ScriptVar] ld e, a - callba Function91a53 + callba PlayRadio ret ; c360 |