diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-31 10:23:19 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-31 10:23:19 -0400 |
| commit | bfd9f617c96af851ad4100b752ea967ef8989edc (patch) | |
| tree | 078f667a596ee500839f21081c2371ade0ec7950 /engine/events/hidden_objects | |
| parent | 70eac3a1f7a27d5b71b968708f423dbbff6b146c (diff) | |
Use constants to delineate map types, and factor out more data
Diffstat (limited to 'engine/events/hidden_objects')
| -rw-r--r-- | engine/events/hidden_objects/bench_guys.asm | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/engine/events/hidden_objects/bench_guys.asm b/engine/events/hidden_objects/bench_guys.asm index 2a38e0d1..b41434ad 100644 --- a/engine/events/hidden_objects/bench_guys.asm +++ b/engine/events/hidden_objects/bench_guys.asm @@ -17,30 +17,11 @@ PrintBenchGuyText: ld b, a ld a, [wSpritePlayerStateData1FacingDirection] cp b - jr nz, .loop ; player isn't facing left at the bench guy + jr nz, .loop ; player isn't facing the bench guy ld a, [hl] jp PrintPredefTextID -bench_guy_text: MACRO - db \1, \2 - db_tx_pre \3 -ENDM - -BenchGuyTextPointers: - ; map id, player facing direction, predef text - bench_guy_text VIRIDIAN_POKECENTER, SPRITE_FACING_LEFT, ViridianCityPokecenterBenchGuyText - bench_guy_text PEWTER_POKECENTER, SPRITE_FACING_LEFT, PewterCityPokecenterBenchGuyText - bench_guy_text CERULEAN_POKECENTER, SPRITE_FACING_LEFT, CeruleanCityPokecenterBenchGuyText - bench_guy_text LAVENDER_POKECENTER, SPRITE_FACING_LEFT, LavenderCityPokecenterBenchGuyText - bench_guy_text VERMILION_POKECENTER, SPRITE_FACING_LEFT, VermilionCityPokecenterBenchGuyText - bench_guy_text CELADON_POKECENTER, SPRITE_FACING_LEFT, CeladonCityPokecenterBenchGuyText - bench_guy_text CELADON_HOTEL, SPRITE_FACING_LEFT, CeladonCityHotelText - bench_guy_text FUCHSIA_POKECENTER, SPRITE_FACING_LEFT, FuchsiaCityPokecenterBenchGuyText - bench_guy_text CINNABAR_POKECENTER, SPRITE_FACING_LEFT, CinnabarIslandPokecenterBenchGuyText - bench_guy_text SAFFRON_POKECENTER, SPRITE_FACING_LEFT, SaffronCityPokecenterBenchGuyText - bench_guy_text MT_MOON_POKECENTER, SPRITE_FACING_LEFT, MtMoonPokecenterBenchGuyText - bench_guy_text ROCK_TUNNEL_POKECENTER, SPRITE_FACING_LEFT, RockTunnelPokecenterBenchGuyText - db -1 ; end +INCLUDE "data/events/bench_guys.asm" ViridianCityPokecenterBenchGuyText:: text_far _ViridianCityPokecenterGuyText |