diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/map_objects.asm | 6 | ||||
| -rw-r--r-- | engine/phone_scripts.asm | 35 | ||||
| -rw-r--r-- | engine/scripting.asm | 6 |
3 files changed, 6 insertions, 41 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 8c8fcb3c5..7addafd23 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -29,7 +29,7 @@ SpriteMovementData:: ; 4273 db SPRITEMOVEFN_STANDING, DOWN, $01, $0c, $00, $00 ; 17 db SPRITEMOVEFN_STANDING, DOWN, $01, $2e, $10, $00 ; 18 db SPRITEMOVEFN_STRENGTH, DOWN, $01, $2e, $00, $40 ; 19 - db SPRITEMOVEFN_12, DOWN, $01, $02, $00, $00 ; 1a + db SPRITEMOVEFN_FOLLOWNOTEXACT, DOWN, $01, $02, $00, $00 ; 1a db SPRITEMOVEFN_13, DOWN, $00, $8e, $01, $00 ; 1b db SPRITEMOVEFN_14, DOWN, $08, $8e, $02, $00 ; 1c db SPRITEMOVEFN_17, DOWN, $00, $82, $00, $00 ; 1d @@ -963,7 +963,7 @@ Function47dd: ; 47dd dw .Follow ; 0f dw .Script ; 10 dw .Strength ; 11 - dw .Movement12 ; 12 + dw .FollowNotExact ; 12 dw .Movement13 ; 13 dw .Movement14 ; 14 dw .MovementBigStanding ; 15 @@ -1145,7 +1145,7 @@ Function47dd: ; 47dd ret ; 48ff -.Movement12: ; 48ff +.FollowNotExact: ; 48ff ld hl, OBJECT_MAP_X add hl, bc ld d, [hl] diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 5d8afd028..33541e224 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -3154,38 +3154,3 @@ String_be657: db "Dad@" String_be65b: db "Sister@" String_be662: db "Brother@" - -TalkToTrainerScript:: ; 0xbe66a - faceplayer - trainerstatus $2 - iftrue AlreadyBeatenTrainerScript - loadtrainerdata - playrammusic - jump StartBattleWithMapTrainerScript -; 0xbe675 - -SeenByTrainerScript:: ; 0xbe675 - loadtrainerdata - playrammusic - showemote EMOTE_SHOCK, LAST_TALKED, 30 - callasm Function831e - applymovement2 MovementBuffer - writepersonxy LAST_TALKED - faceperson PLAYER, LAST_TALKED - jump StartBattleWithMapTrainerScript -; 0xbe68a - -StartBattleWithMapTrainerScript: ; 0xbe68a - loadfont - trainertext $0 - closetext - loadmovesprites - loadtrainerdata - startbattle - returnafterbattle - trainerstatus 1 - loadvar wd04d, -1 - -AlreadyBeatenTrainerScript: - scripttalkafter -; 0xbe699 diff --git a/engine/scripting.asm b/engine/scripting.asm index 360360f79..296f69ecd 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1360,7 +1360,7 @@ Script_writepersonxy: ; 0x9735b ld a, [hLastTalked] .ok ld b, a - callba Function80a1 + callba WritePersonXY ret ; 0x9736f @@ -1376,7 +1376,7 @@ Script_follownotexact: ; 0x9736f call GetScriptByte call GetScriptPerson ld c, a - callba Function839e + callba FollowNotExact ret ; 0x97384 @@ -1546,7 +1546,7 @@ Script_catchtutorial: ; 0x97447 call GetScriptByte ld [BattleType], a call BufferScreen - callba Function4e554 + callba CatchTutorial jp Script_reloadmap ; 0x97459 |