fix-various-little-things

A compilation of suggestions from the discord that don't deserve
separate commits and are not questionable at all™.
This commit is contained in:
mid-kid
2018-05-05 09:19:04 +02:00
parent a63d9dfd4f
commit c82deab86f
18 changed files with 41 additions and 42 deletions

View File

@@ -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

View File

@@ -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