diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-18 17:03:03 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-18 17:03:03 -0400 |
| commit | 188f35fb75f73dc3325635d74b47891a752aa767 (patch) | |
| tree | 7a7bfe40a36b85c83436e376b8f7c23dc58a9d00 /main.asm | |
| parent | 6bd75976f3f9bca5cb425235b98e69fff90f5581 (diff) | |
Finish engine/map_objects.asm
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -49,10 +49,9 @@ PushOAMEnd INCLUDE "engine/map_objects.asm" -Function58c5:: - +MainMenu_: ; 5a4d IF DEF(GOLD) - dr $58c5, $6545 + dr $5a4d, $6545 GameInit:: ; 6545 dr $6545, $6551 ReanchorBGMap_NoOAMUpdate:: ; 6551 @@ -70,7 +69,7 @@ CheckNPCMovementPermissions: ; 6fa0 ENDC IF DEF(SILVER) - dr $58c5, $650b + dr $5a4d, $650b GameInit:: ; 650b dr $650b, $6517 ReanchorBGMap_NoOAMUpdate:: ; 6517 @@ -97,7 +96,9 @@ CopyDECoordsToMapObject: CopyObjectStruct_:: dr $86d7, $8876 CopyTempObjectToObjectStruct: - dr $8876, $8ac9 + dr $8876, $8a7a +QueueFollowerFirstStep: + dr $8a7a, $8ac9 Sine_e:: dr $8ac9, $8b3b GetPredefPointer:: @@ -170,7 +171,9 @@ GetSpritePalette_:: ; 14334 Function14a18:: ; 14a18 dr $14a18, $14a2d Function14a2d:: ; 14a2d - dr $14a2d, $15484 + dr $14a2d, $14a44 +Function14a44: ; 14a44 + dr $14a44, $15484 RunMapSetupScript:: dr $15484, $15612 Function15612:: ; 15612 |