diff options
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/cable_club_npc.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/item.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/missable_objects.asm | 8 | ||||
| -rwxr-xr-x | engine/overworld/pokecenter.asm | 8 | ||||
| -rw-r--r-- | engine/overworld/try_pushing_boulder.asm | 1 |
5 files changed, 11 insertions, 10 deletions
diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm index 4170a936..f60042de 100755 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/overworld/cable_club_npc.asm @@ -1,7 +1,7 @@ CableClubNPC: ; 7035 (1:7035) ld hl, CableClubNPCWelcomeText call PrintText - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr nz, .asm_7048 CheckEvent EVENT_GOT_POKEDEX jp nz, .receivedPokedex diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm index f4f46535..e421a946 100644 --- a/engine/overworld/item.asm +++ b/engine/overworld/item.asm @@ -51,4 +51,4 @@ FoundItemText: ; 4d9a (1:4d9a) NoMoreRoomForItemText: ; 4da0 (1:4da0) TX_FAR _NoMoreRoomForItemText - db "@"
\ No newline at end of file + db "@" diff --git a/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm index 65305d30..1cc15be5 100644 --- a/engine/overworld/missable_objects.asm +++ b/engine/overworld/missable_objects.asm @@ -30,17 +30,17 @@ MarkTownVisitedAndLoadMissableObjects: ; ef93 (3:6f93) ld a, h ld [H_DIVIDEND], a ld a, l - ld [H_DIVIDEND+1], a + ld [H_DIVIDEND + 1], a xor a - ld [H_DIVIDEND+2], a - ld [H_DIVIDEND+3], a + ld [H_DIVIDEND + 2], a + ld [H_DIVIDEND + 3], a ld a, $3 ld [H_DIVISOR], a ld b, $2 call Divide ; divide difference by 3, resulting in the global offset (number of missable items before ours) ld a, [wCurMap] ld b, a - ld a, [H_DIVIDEND+3] + ld a, [H_DIVIDEND + 3] ld c, a ; store global offset in c ld de, wMissableObjectList pop hl diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 3024ff7b..b9307517 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -2,7 +2,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) ld a, [wCurMap] cp PEWTER_POKECENTER jr nz, .regularCenter - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr z, .regularCenter ld hl, LooksContentText ; if pikachu is sleeping, don't heal call PrintText @@ -27,7 +27,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call SetLastBlackoutMap callab IsStarterPikachuInOurParty jr nc, .notHealingPlayerPikachu - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr nz, .notHealingPlayerPikachu call LoadCurrentMapView call Delay3 @@ -38,7 +38,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call PrintText ld c, 64 call DelayFrames - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr nz, .playerPikachuNotOnScreen call Func_152d callab IsStarterPikachuInOurParty @@ -58,7 +58,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) ld [wLastMusicSoundID], a ld [wNewSoundID], a call PlaySound - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr nz, .doNotReturnPikachu callab IsStarterPikachuInOurParty call c, Func_6eaa diff --git a/engine/overworld/try_pushing_boulder.asm b/engine/overworld/try_pushing_boulder.asm index d978a083..89e83ff9 100644 --- a/engine/overworld/try_pushing_boulder.asm +++ b/engine/overworld/try_pushing_boulder.asm @@ -2,6 +2,7 @@ TryPushingBoulder: ; f0a1 (3:70a1) ld a, [wd728] bit 0, a ; using Strength? ret z +Func_f0a7: ; f0a7 (3:70a7) ; where LoadMissableObjects predef points to now ld a, [wFlags_0xcd60] bit 1, a ; has boulder dust animation from previous push played yet? |