diff options
| author | klektron <klektron@users.noreply.github.com> | 2021-01-03 15:36:24 +0100 |
|---|---|---|
| committer | klektron <klektron@users.noreply.github.com> | 2021-01-03 15:36:24 +0100 |
| commit | dc294a0de559fcaa1e3b9043d7ef3cd3fa96a735 (patch) | |
| tree | 2cf9c452ff5c2c147cde2c8124ed67fac180083a /engine | |
| parent | 419eac2a656d5dd034e46c5f93ce808e583050de (diff) | |
and it's finally done :D
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/hidden_objects/school_blackboard.asm | 14 | ||||
| -rwxr-xr-x | engine/menus/league_pc.asm | 2 | ||||
| -rwxr-xr-x | engine/movie/hall_of_fame.asm | 2 | ||||
| -rwxr-xr-x | engine/movie/title.asm | 9 | ||||
| -rwxr-xr-x | engine/movie/trade2.asm | 4 |
5 files changed, 17 insertions, 14 deletions
diff --git a/engine/events/hidden_objects/school_blackboard.asm b/engine/events/hidden_objects/school_blackboard.asm index e00b7cbf..1848afdf 100644 --- a/engine/events/hidden_objects/school_blackboard.asm +++ b/engine/events/hidden_objects/school_blackboard.asm @@ -111,7 +111,7 @@ ViridianSchoolBlackboard:: ld hl, wd730 set 6, [hl] hlcoord 0, 0 - lb bc, 6, 10 + lb bc, 6, 11 call TextBoxBorder hlcoord 1, 2 ld de, StatusAilmentText1 @@ -185,16 +185,14 @@ ViridianSchoolBlackboardText2: text_end StatusAilmentText1: - db " SLP" - next " PSN" + db " DOR" + next " ENV" next " PAR@" StatusAilmentText2: - db " BRN" - next " FRZ" - next " QUIT@" - - db "@" ; unused + db " QUE" + next " CON" + next " SALIR@" ViridianBlackboardStatusPointers: dw ViridianBlackboardSleepText diff --git a/engine/menus/league_pc.asm b/engine/menus/league_pc.asm index f2107c49..999090ff 100755 --- a/engine/menus/league_pc.asm +++ b/engine/menus/league_pc.asm @@ -113,7 +113,7 @@ LeaguePCShowMon: farjp HoFDisplayMonInfo HallOfFameNoText: - db "HALL OF FAME No @" + db "HALL DE FAMA Nº @" AccessedHoFPCText: text_far _AccessedHoFPCText diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index 8230215c..07082cb5 100755 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -237,7 +237,7 @@ HoFDisplayPlayerStats: call PlaceString hlcoord 4, 10 ld de, wPlayerMoney - ld c, $a3 + ld c, $83 call PrintBCDNumber ld [hl], "¥" ld hl, DexSeenOwnedText diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 37811b81..d24c58f9 100755 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -56,7 +56,7 @@ DisplayTitleScreen: ld a, BANK(PokemonLogoGraphics) call FarCopyData2 ; second chunk ld hl, Version_GFX - ld de, vChars2 tile $60 + (8 tiles - (Version_GFXEnd - Version_GFX) * 2) / 2 + ld de, vChars2 tile $60 + (VERSION_TILES tiles - (Version_GFXEnd - Version_GFX) * 2) / 2 ld bc, Version_GFXEnd - Version_GFX ld a, BANK(Version_GFX) call FarCopyDataDouble @@ -398,7 +398,12 @@ PrintGameVersionOnTitleScreen: ; these point to special tiles specifically loaded for that purpose and are not usual text VersionOnTitleScreenText: - db $60,$61,$62,$63,$64,$65,$66,$67,"@" ; "Edición Roja" or "Edición Azul" +IF DEF(_RED) + db $60,$61,$62,$63,$64,$65,$66,$67,"@" ; "Edición Roja" +ENDC +IF DEF(_BLUE) + db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Edición Azul" +ENDC NintenText: db "NINTEN@" SonyText: db "SONY@" diff --git a/engine/movie/trade2.asm b/engine/movie/trade2.asm index f0d91846..38ae741c 100755 --- a/engine/movie/trade2.asm +++ b/engine/movie/trade2.asm @@ -45,5 +45,5 @@ Trade_PrintEnemyMonInfoText: Trade_MonInfoText: db "──№<DOT>" next "" - next "OT/" - next "<ID>№<DOT>@" + next "EO/" + next "№<ID><DOT>@" |