diff options
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/fixed_words.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_40.asm | 8 | ||||
| -rw-r--r-- | misc/mobile_42.asm | 6 | ||||
| -rw-r--r-- | misc/mobile_45.asm | 2 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 2 | ||||
| -rwxr-xr-x | misc/mobile_5c.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_5f.asm | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index 708116689..7bb39427e 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -362,7 +362,7 @@ Function11c283: ; 11c283 bit 7, a jr nz, .exit call .DoJumptableFunction - callba Function8cf69 + callba PlaySpriteAnimations callba ReloadMapPart jr .loop diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 8b6557789..5883a693e 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -2011,7 +2011,7 @@ Function100cb5: ; 100cb5 call Function100dd2 callba Function241ba push bc - callba Function8cf69 + callba PlaySpriteAnimations callba Function10402d call Function100dfd pop bc @@ -2065,7 +2065,7 @@ Function100d22: ; 100d22 call Function100dd2 callba Function241ba push bc - callba Function8cf69 + callba PlaySpriteAnimations callba Function10402d call Function100dfd pop bc @@ -4059,7 +4059,7 @@ Function101a21: ; 101a21 ld a, $1 ld [wc2d7], a callba BattleIntro - callba SendOutFirstMons + callba DoBattle callba ShowLinkBattleParticipantsAfterEnd xor a ld [wc2d7], a @@ -6468,7 +6468,7 @@ Function102b32: ; 102b32 dec a ld [CurPartyMon], a ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a callba EvolvePokemon call Function102d9a call Function102dd3 diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 0e25021bf..c2d7171e0 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -400,7 +400,7 @@ Function1082c6: ; 1082c6 Function1082cc: ; 1082cc .asm_1082cc push bc - callba Function8cf69 + callba PlaySpriteAnimations pop bc call DelayFrame dec c @@ -410,7 +410,7 @@ Function1082cc: ; 1082cc Function1082db: ; 1082db .asm_1082db - callba Function8cf69 + callba PlaySpriteAnimations callba Functiond00b4 callba Function10402d jr nc, .asm_1082db @@ -431,7 +431,7 @@ Function1082fa: ; 1082fa call Function108b78 push hl push bc - callba Function8cf69 + callba PlaySpriteAnimations pop bc pop hl call DelayFrame diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 006a135f1..831f690e6 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -7721,7 +7721,7 @@ Function1176ee: ; 1176ee (45:76ee) bit 7, a jr nz, .asm_117709 call Function117719 - callba Function8cf69 + callba PlaySpriteAnimations callba ReloadMapPart jr Function1176ee .asm_117709 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 1488b40c3..44f1fc12c 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -7679,7 +7679,7 @@ Function11b7e5: ; 11b7e5 callba Function108016 callba Function17d1f1 ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a callba EvolvePokemon diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index ebebb302c..8eedea0fd 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -422,7 +422,7 @@ Function171a11: ; 171a11 (5c:5a11) bit 7, a jr nz, .asm_171a2c call Function171a36 - callba Function8cf69 + callba PlaySpriteAnimations callba ReloadMapPart jr Function171a11 .asm_171a2c diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 19c3748e8..e61689a9e 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -302,7 +302,7 @@ Function17d0f3: ; 17d0f3 callba Function10804d callba Function17d1f1 ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a callba EvolvePokemon |