diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-12 15:42:25 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-12 15:42:25 -0700 |
| commit | 64a39c38e34135028d7d73b4d77cf0542bf14e83 (patch) | |
| tree | 46677533784f17dbc0f3670467bd3555ac72d72b /data | |
| parent | 9db354596485ebabb05a6c026db0a2e41b07cb6d (diff) | |
decompile pokemon functions
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 2 | ||||
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/specials.s | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/data/data2.s b/data/data2.s index a5258494f..734d6c793 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1948,7 +1948,7 @@ gSpriteTemplate_8208288:: @ 8208288 spr_template 0xFFFF, 0, gOamData_81F96F0, NULL, gSpriteImageTable_81E7A50, gSpriteAffineAnimTable_81E7B70, sub_80105A0 spr_template 0xFFFF, 0, gOamData_81F96E8, NULL, gSpriteImageTable_81E7A70, gSpriteAffineAnimTable_81E7BEC, oac_poke_opponent -gUnknown_082082E8:: @ 82082E8 +gSecretBaseTrainerClasses:: @ 82082E8 .byte TRAINER_CLASS_YOUNGSTER, TRAINER_CLASS_BUG_CATCHER, TRAINER_CLASS_RICH_BOY, TRAINER_CLASS_CAMPER, TRAINER_CLASS_COOL_TRAINER_M .byte TRAINER_CLASS_LASS, TRAINER_CLASS_SCHOOL_KID_F, TRAINER_CLASS_LADY, TRAINER_CLASS_PICNICKER, TRAINER_CLASS_COOL_TRAINER_F diff --git a/data/event_scripts.s b/data/event_scripts.s index 966e32ad2..96b25e695 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -7,6 +7,7 @@ @ 814AE30 .include "data/script_cmd_table.s" + .align 2 gUnknown_0814B14C:: .4byte 0x202e8c4 .4byte 0x202e8c6 @@ -29,6 +30,7 @@ gUnknown_0814B14C:: .include "data/specials.s" + .align 2 gStdScripts:: .4byte Std_ObtainItem .4byte Std_FindItem diff --git a/data/specials.s b/data/specials.s index 1161f32d1..318534084 100644 --- a/data/specials.s +++ b/data/specials.s @@ -1,3 +1,4 @@ + .align 2 gSpecials:: .4byte sp000_heal_pokemon .4byte sub_8068FEC |