diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-22 21:24:16 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-22 21:24:16 -0400 |
| commit | 8249a58a2cedc0b3ec9f5033a4745c13e49a86ae (patch) | |
| tree | 645556b36224baf1bfa1b37cfd70b09b8c04c09a /asm | |
| parent | 4dfc6699fedf01167987061e7cd63cc28245519a (diff) | |
Split trainers and port species and move names
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_specials.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s index eba95e9cf..653923fda 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -4953,7 +4953,7 @@ _080CCBEA: cmp r7, 0 bne _080CCC34 ldr r0, _080CCC24 @ =gStringVar2 - ldr r1, _080CCC28 @ =gUnknown_82481BE + ldr r1, _080CCC28 @ =gMoveNames + 0x112A FRENZY PLANT bl StringCopy ldr r1, _080CCC2C @ =gSpecialVar_0x8005 movs r0, 0xF @@ -4964,14 +4964,14 @@ _080CCBEA: _080CCC1C: .4byte gUnknown_83F6203 _080CCC20: .4byte gPlayerParty _080CCC24: .4byte gStringVar2 -_080CCC28: .4byte gUnknown_82481BE +_080CCC28: .4byte gMoveNames + 0x112A _080CCC2C: .4byte gSpecialVar_0x8005 _080CCC30: .4byte 0x000002de _080CCC34: cmp r7, 0x1 bne _080CCC5C ldr r0, _080CCC4C @ =gStringVar2 - ldr r1, _080CCC50 @ =gUnknown_824802B + ldr r1, _080CCC50 @ =gMoveNames + 0xF97 BLAST BURN bl StringCopy ldr r1, _080CCC54 @ =gSpecialVar_0x8005 movs r0, 0x10 @@ -4980,12 +4980,12 @@ _080CCC34: b _080CCC6E .align 2, 0 _080CCC4C: .4byte gStringVar2 -_080CCC50: .4byte gUnknown_824802B +_080CCC50: .4byte gMoveNames + 0xF97 _080CCC54: .4byte gSpecialVar_0x8005 _080CCC58: .4byte 0x000002df _080CCC5C: ldr r0, _080CCC80 @ =gStringVar2 - ldr r1, _080CCC84 @ =gUnknown_8248038 + ldr r1, _080CCC84 @ =gMoveNames + 0xFA4 HYDRO CANNON bl StringCopy ldr r1, _080CCC88 @ =gSpecialVar_0x8005 movs r0, 0x11 @@ -5003,7 +5003,7 @@ _080CCC7A: b _080CCCE4 .align 2, 0 _080CCC80: .4byte gStringVar2 -_080CCC84: .4byte gUnknown_8248038 +_080CCC84: .4byte gMoveNames + 0xFA4 _080CCC88: .4byte gSpecialVar_0x8005 _080CCC8C: movs r0, 0x64 |