diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | home/pokemon.asm | 6 | ||||
| -rw-r--r-- | home/text.asm | 8 | ||||
| -rwxr-xr-x | wram.asm | 2 |
4 files changed, 12 insertions, 10 deletions
@@ -100,9 +100,9 @@ pokered_pad = 0x00 pokeblue_pad = 0x00 pokeblue_debug_pad = 0xff -pokered_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON RED" -pokeblue_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE" -pokeblue_debug_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE" +pokered_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x1B -r 03 -t "POKEMON RED" +pokeblue_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x1B -r 03 -t "POKEMON BLUE" +pokeblue_debug_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x1B -r 03 -t "POKEMON BLUE" %.gbc: $$(%_obj) layout.link $(RGBLINK) -p $($*_pad) -d -m $*.map -n $*.sym -l layout.link -o $@ $(filter %.o,$^) diff --git a/home/pokemon.asm b/home/pokemon.asm index 5406c0ad..2a54d390 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -316,11 +316,11 @@ PrintStatusCondition:: pop de jr nz, PrintStatusConditionNotFainted ; if the pokemon's HP is 0, print "FNT" - ld a, "F" + ld a, "D" ld [hli], a - ld a, "N" + ld a, "E" ld [hli], a - ld [hl], "T" + ld [hl], "B" and a ret diff --git a/home/text.asm b/home/text.asm index ad0c4fd8..fc672178 100644 --- a/home/text.asm +++ b/home/text.asm @@ -172,14 +172,14 @@ PlaceCommandCharacter:: inc de jp PlaceNextChar -TMCharText:: db "TM@" -TrainerCharText:: db "TRAINER@" PCCharText:: db "PC@" RocketCharText:: db "ROCKET@" -PlacePOKeText:: db "POKé@" SixDotsCharText:: db "……@" -EnemyText:: db "Enemy @" PlacePKMNText:: db "<PK><MN>@" +TMCharText:: db "MT@" +TrainerCharText:: db "ENTREN.@" +PlacePOKeText:: db "POKé@" +EnemyText:: db "Enem.@" ContText:: push de @@ -1255,6 +1255,8 @@ wAIItem:: wUsedItemOnWhichPokemon:: ds 1 + ds 5 ; extra for wAnimSoundID to land on $cf0c + wAnimSoundID:: ; sound ID during battle animations ds 1 |