diff options
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | constants/gfx_constants.asm | 10 | ||||
| -rw-r--r-- | constants/text_constants.asm | 6 | ||||
| -rwxr-xr-x | data/credits/credits_order.asm | 2 | ||||
| -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 | ||||
| -rw-r--r-- | gfx/sgb/blue_border.tilemap | bin | 1792 -> 1792 bytes | |||
| -rw-r--r-- | gfx/sgb/red_border.tilemap | bin | 1792 -> 1792 bytes | |||
| -rwxr-xr-x | macros/scripts/text.asm | 2 | ||||
| -rw-r--r-- | text/AgathasRoom.asm | 2 | ||||
| -rw-r--r-- | text/CeladonMartRoof.asm | 4 | ||||
| -rw-r--r-- | text/NameRatersHouse.asm | 4 |
15 files changed, 44 insertions, 27 deletions
@@ -1,12 +1,12 @@ -# Pokémon Red and Blue [![Build Status][travis-badge]][travis] +# Pokémon Edición Roja y Azul [![Build Status][travis-badge]][travis] -This is a disassembly of Pokémon Red and Blue. +This is a disassembly of Pokémon Edición Roja y Azul. It builds the following ROMs: -- Pokemon Red (UE) [S][!].gb `sha1: ea9bcae617fdf159b045185467ae58b2e4a48b9a` -- Pokemon Blue (UE) [S][!].gb `sha1: d7037c83e1ae5b39bde3c30787637ba1d4c48ce2` -- BLUEMONS.GB (debug build) `sha1: 5b1456177671b79b263c614ea0e7cc9ac542e9c4` +* Pokemon - Edicion Roja (Spain) (SGB Enhanced).gb `sha1: fc17c5b904d551b1b908054ccd1c493f755f832a` +* Pokemon - Edicion Azul (Spain) (SGB Enhanced).gb `sha1: 7715e7b133e8634df48918b9138374110212a108` +* BLUEMONS.GB (debug build) `sha1: ` To set up the repository, see [**INSTALL.md**](INSTALL.md). diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index dd9de6b6..f37d5e67 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -37,3 +37,13 @@ REDRAW_ROW EQU 2 const TILEMAP_GENGAR_INTRO_3 const TILEMAP_GAME_BOY const TILEMAP_LINK_CABLE + +; DisplayTitleScreen +IF DEF(_RED) + const_def 8 + const VERSION_TILES ; 8 +ENDC +IF DEF(_BLUE) + const_def 10 + const VERSION_TILES ; 10 +ENDC
\ No newline at end of file diff --git a/constants/text_constants.asm b/constants/text_constants.asm index aa8374e5..5137efa8 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -2,8 +2,10 @@ NAME_LENGTH EQU 11 ITEM_NAME_LENGTH EQU 13 ; PrintNumber - const_def 5 - const BIT_MONEY_SIGN ; 5 + const_def + const BIT_MONEY_SIGN ; 0 + + const_def 6 const BIT_LEFT_ALIGN ; 6 const BIT_LEADING_ZEROES ; 7 diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm index c6c4bbde..19f4fe6c 100755 --- a/data/credits/credits_order.asm +++ b/data/credits/credits_order.asm @@ -31,7 +31,7 @@ CreditsOrder: db CRED_EU_COORD, CRED_EDASAWA, CRED_UESUGI, CRED_YOSHIMURA, CRED_TEXT db CRED_SPA_TEXT, CRED_ALCAMI, CRED_GREPPI, CRED_TEXT_FADE db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, CRED_TEXT_FADE - db CRED_SPECIAL, CRED_HARADA, CRED_NAKAMICHI, CRED_TEXT_FADE + db CRED_SPECIAL, CRED_HARADA, CRED_NAKAMICHI, CRED_TEXT db CRED_NOE_TEST, CRED_ZEH_FEY, CRED_NOA_TEST, CRED_HUD_BUE, CRED_TEXT_FADE db CRED_PRODUCER, CRED_IZUSHI, CRED_TEXT_FADE db CRED_EXECUTIVE, CRED_YAMAUCHI, CRED_TEXT_FADE_MON 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>@" diff --git a/gfx/sgb/blue_border.tilemap b/gfx/sgb/blue_border.tilemap Binary files differindex 14085bc9..a77b49e9 100644 --- a/gfx/sgb/blue_border.tilemap +++ b/gfx/sgb/blue_border.tilemap diff --git a/gfx/sgb/red_border.tilemap b/gfx/sgb/red_border.tilemap Binary files differindex 607bbcb2..01cad3f9 100644 --- a/gfx/sgb/red_border.tilemap +++ b/gfx/sgb/red_border.tilemap diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index a947ca2f..9f724e4c 100755 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -7,7 +7,7 @@ done EQUS "db \"<DONE>\"" ; End a text box. prompt EQUS "db \"<PROMPT>\"" ; Prompt the player to end a text box (initiating some other event). page EQUS "db \"<PAGE>\"," ; Start a new Pokédex page. -dex EQUS "db \"<DEXEND>\", \"@\"" ; End a Pokédex entry. +dex EQUS "db \"@\", \"@\"" ; End a Pokédex entry. ; TextCommandJumpTable indexes (see home/text.asm) diff --git a/text/AgathasRoom.asm b/text/AgathasRoom.asm index 929936b8..355de7ae 100644 --- a/text/AgathasRoom.asm +++ b/text/AgathasRoom.asm @@ -38,7 +38,7 @@ _AgathaAfterBattleText:: cont "tanto!" para "¡No tengo nada" - line "más que decir!" + line "más que decir! " cont "¡Vete ya niño!" done diff --git a/text/CeladonMartRoof.asm b/text/CeladonMartRoof.asm index aaed146c..c5c6527d 100644 --- a/text/CeladonMartRoof.asm +++ b/text/CeladonMartRoof.asm @@ -27,8 +27,8 @@ _CeladonMartRoofText_484fe:: para "¡@" text_ram wcf4b text_start - text "contiene el" - line "RAYO HIELO!" + line "contiene el" + cont "RAYO HIELO!" para "¡Éste puede helar" line "al enemigo, a" diff --git a/text/NameRatersHouse.asm b/text/NameRatersHouse.asm index 86adeb69..b406f480 100644 --- a/text/NameRatersHouse.asm +++ b/text/NameRatersHouse.asm @@ -57,4 +57,6 @@ _NameRaterText_1dad1:: para "¡Cuida bien de" line "@" - text_ram wcd6d
\ No newline at end of file + text_ram wcd6d + text "!" + done
\ No newline at end of file |