diff options
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/map_objects.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/wildmons.asm | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 8d6f4082f..1573a27b5 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -163,12 +163,12 @@ Function4440: ; 4440 add hl, bc bit INVISIBLE, [hl] jr nz, SetFacingStanding -asm_4448 +asm_4448: ld de, ObjectActionPairPointers + 2 ; use second column jr _HandleObjectAction ; 444d -_HandleObjectAction +_HandleObjectAction: ; call [4 * wObjectStructs[ObjInd, OBJECT_ACTION] + de] ld hl, OBJECT_ACTION add hl, bc diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index 494e8d2a4..20375ba6c 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -417,7 +417,7 @@ _WaterWildmonLookup: ; 2a21d ld bc, WATER_WILDDATA_LENGTH jr _NormalWildmonOK -_JohtoWildmonCheck +_JohtoWildmonCheck: call IsInJohto and a ret z @@ -425,7 +425,7 @@ _JohtoWildmonCheck ld l, e ret -_SwarmWildmonCheck +_SwarmWildmonCheck: call CopyCurrMapDE push hl ld hl, wSwarmFlags @@ -460,11 +460,11 @@ _SwarmWildmonCheck scf ret -_NoSwarmWildmon +_NoSwarmWildmon: and a ret -_NormalWildmonOK +_NormalWildmonOK: call CopyCurrMapDE jr LookUpWildmonsForMapDE ; 2a27f |