diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-07-29 01:40:23 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-07-29 01:40:23 -0400 |
| commit | c9cb67141bd13db51b8f6cb79f158cbca21660d0 (patch) | |
| tree | 79c1e49f87af73e355d6bdf1ead6dfba7f24edfb /engine | |
| parent | 84983947011d79f1988388cf08dee55cdc82cc99 (diff) | |
Make reviewed fixes; standardize on " + "
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 6 | ||||
| -rw-r--r-- | engine/battle/trainer_huds.asm | 8 | ||||
| -rw-r--r-- | engine/movie/credits.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/events.asm | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index edb8023c2..2d5e85cef 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -5989,7 +5989,7 @@ LoadEnemyMon: ; Used for Ho-Oh, Lugia and Snorlax encounters ld a, [wBattleType] cp BATTLETYPE_FORCEITEM - ld a, [wBaseItems] + ld a, [wBaseItem1] jr z, .UpdateItem ; Failing that, it's all up to chance @@ -6007,9 +6007,9 @@ LoadEnemyMon: ; From there, an 8% chance for Item2 call BattleRandom cp 8 percent ; 8% of 25% = 2% Item2 - ld a, [wBaseItems] + ld a, [wBaseItem1] jr nc, .UpdateItem - ld a, [wBaseItems+1] + ld a, [wBaseItem2] .UpdateItem: ld [wEnemyMonItem], a diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index 488f55462..7a971e21f 100644 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -157,21 +157,21 @@ DrawEnemyHUDBorder: .tiles_end PlaceHUDBorderTiles: - ld a, [wTrainerHUDTiles+0] + ld a, [wTrainerHUDTiles + 0] ld [hl], a ld bc, SCREEN_WIDTH add hl, bc - ld a, [wTrainerHUDTiles+1] + ld a, [wTrainerHUDTiles + 1] ld [hl], a ld b, 8 .loop add hl, de - ld a, [wTrainerHUDTiles+3] + ld a, [wTrainerHUDTiles + 3] ld [hl], a dec b jr nz, .loop add hl, de - ld a, [wTrainerHUDTiles+2] + ld a, [wTrainerHUDTiles + 2] ld [hl], a ret diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 97828ab58..76154a1aa 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -377,7 +377,7 @@ ParseCredits: push de ld a, [wCreditsPos] ld e, a - ld a, [wCreditsPos+1] + ld a, [wCreditsPos + 1] ld d, a ld hl, CreditsScript add hl, de @@ -386,7 +386,7 @@ ParseCredits: ld a, e ld [wCreditsPos], a ld a, d - ld [wCreditsPos+1], a + ld [wCreditsPos + 1], a ld a, [hl] pop de pop hl diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index e961e092b..063265e4d 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -983,7 +983,7 @@ PlayerEventScriptPointers: dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT dba HatchEggScript ; PLAYEREVENT_HATCH dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING - dba Invalid_0x96c2d ; 10 + dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS) Invalid_0x96c2d: end |