diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 19:32:30 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 19:32:30 -0400 |
| commit | bc116a0db0857ef49ba4a65bf98b9b8339315c01 (patch) | |
| tree | d753b2bcbe162b9aa416a3fbf3007884bfbe5aa4 /engine/events | |
| parent | 356836b1cc479381d5494dbaee40c6a6345c0b43 (diff) | |
Harmonize engine/{battle, battle_anims, events, games} with pokecrystal
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/field_moves.asm | 10 | ||||
| -rw-r--r-- | engine/events/halloffame.asm | 8 | ||||
| -rw-r--r-- | engine/events/overworld.asm | 4 | ||||
| -rw-r--r-- | engine/events/specials.asm | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 3423f840..2b0dbc39 100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -87,7 +87,7 @@ HideHeadbuttTree: ld h, [hl] ld l, a - ld a, 5 ; grass block + ld a, $05 ; grass block ld [hli], a ld [hld], a ld bc, SCREEN_WIDTH @@ -228,7 +228,7 @@ Cut_SpawnLeaf: ld [hl], FIELDMOVE_GRASS ld hl, SPRITEANIMSTRUCT_0E add hl, bc - ld [hl], 4 + ld [hl], $4 pop af ld hl, SPRITEANIMSTRUCT_0C add hl, bc @@ -418,7 +418,7 @@ FlyFunction_FrameTimer: dec [hl] cp $40 ret c - and 7 + and $7 ret nz ld de, SFX_FLY call PlaySFX @@ -433,7 +433,7 @@ FlyFunction_FrameTimer: ld hl, wce65 ld a, [hl] inc [hl] - and 7 + and $7 ret nz ld a, [hl] and (6 * 8) >> 1 @@ -441,7 +441,7 @@ FlyFunction_FrameTimer: add 8 * 8 ; gives a number in [$40, $50, $60, $70] ld d, a ld e, 0 - ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land + ld a, SPRITE_ANIM_INDEX_FLY_LEAF call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index f74645b7..2a10d736 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -107,7 +107,7 @@ AnimateHallOfFame: .done call HOF_AnimatePlayerPic - ld a, 4 + ld a, $4 ld [wMusicFade], a call RotateThreePalettesRight ld c, 8 @@ -378,7 +378,7 @@ _HallOfFamePC: hlcoord 11, 2 .finish - ld de, .EmptyString1 + ld de, .EmptyString call PlaceString call WaitBGMap ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS @@ -389,10 +389,10 @@ _HallOfFamePC: and a ret -.EmptyString1: +.EmptyString: db "@" -.EmptyString2: +.UnreferencedEmptyString: db "@" .HOFMaster: diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 4f2ba801..2f9d57f8 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -342,7 +342,7 @@ SurfFunction: .TrySurf: ld de, ENGINE_FOGBADGE call CheckBadge - jr c, .asm_c980 + jr c, .nofogbadge ld hl, wBikeFlags bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl] jr nz, .cannotsurf @@ -359,7 +359,7 @@ SurfFunction: jr c, .cannotsurf ld a, $1 ret -.asm_c980 +.nofogbadge ld a, $80 ret .alreadyfail diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 91ca4208..6626c081 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -291,7 +291,7 @@ StoreSwarmMapIndices:: ld [wSwarmMapGroup], a ld a, e ld [wSwarmMapNumber], a - ; fallthrough + SetSwarmFlag: ld hl, wDailyFlags1 set DAILYFLAGS1_SWARM_F, [hl] @@ -332,7 +332,7 @@ CheckLuckyNumberShowFlag: CountUnown: ld hl, wUnownDex - ld b, $0 + ld b, 0 .loop ld a, [hli] and a @@ -350,7 +350,7 @@ SelectApricornForKurt: and a ret z ld [wCurItem], a - ld a, $1 + ld a, 1 ld [wItemQuantityChangeBuffer], a ld hl, wNumItems call TossItem |