diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-24 22:38:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 22:38:08 -0400 |
| commit | 91f914718a263839daef24d44eda857bfc7cca95 (patch) | |
| tree | e3aca60cfbcd77fdbb400304fc0dedbc613122b2 /engine/overworld | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
| parent | 6e44095c2aadd2f07a716db6dacfc3ce2fa83658 (diff) | |
Merge pull request #530 from Rangi42/master
[RTM] Finish removing address comments, split out mart_constants.asm, and other tweaks
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/map_object_action.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/map_objects.asm | 3 | ||||
| -rw-r--r-- | engine/overworld/wildmons.asm | 12 |
3 files changed, 9 insertions, 8 deletions
diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm index 613e3b099..2c4834a3d 100644 --- a/engine/overworld/map_object_action.asm +++ b/engine/overworld/map_object_action.asm @@ -190,7 +190,7 @@ SetFacingShadow: ld [hl], FACING_SHADOW ret -SetFacingEmote: ; 4582 emote +SetFacingEmote: ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], FACING_EMOTE diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 0846f01b1..d0cfd8741 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -2159,7 +2159,8 @@ Function55e0:: jr nz, .loop ret -Function5602: ; 5602, called at battle start +Function5602: +; called at battle start call Function5645 ; clear sprites ld a, PLAYER call Function5629 ; respawn player diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index eef618156..ae611d4ca 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -86,7 +86,7 @@ FindNest: ld a, [hli] ld c, a inc hl - ld a, 3 + ld a, NUM_WATERMON call .SearchMapForMon jr nc, .next_water ld [de], a @@ -94,7 +94,7 @@ FindNest: .next_water pop hl - ld bc, 3 * 3 + ld bc, WATER_WILDDATA_LENGTH add hl, bc jr .FindWater @@ -264,7 +264,7 @@ ChooseWildEncounter: inc hl inc hl ld a, [wTimeOfDay] - ld bc, $e + ld bc, NUM_GRASSMON * 2 call AddNTimes ld de, GrassMonProbTable @@ -655,7 +655,7 @@ UpdateRoamMons: jr nc, .update_loop ; invalid index, try again inc hl ld c, a - ld b, $0 + ld b, 0 add hl, bc add hl, bc ld a, [wRoamMons_LastMapGroup] @@ -796,7 +796,7 @@ RandomUnseenWildMon: jr z, .randloop1 dec a ld c, a - ld b, $0 + ld b, 0 add hl, bc add hl, bc ; We now have the pointer to one of the last (rarest) three wild Pokemon found in that area. @@ -870,7 +870,7 @@ RandomPhoneWildMon: call Random and %11 ld c, a - ld b, $0 + ld b, 0 add hl, bc add hl, bc inc hl |