Skip to content

Commit

Permalink
Add a lot of Yellow text changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
iimarckus committed Oct 10, 2014
1 parent 906bd59 commit 6e14461
Show file tree
Hide file tree
Showing 49 changed files with 945 additions and 11 deletions.
13 changes: 13 additions & 0 deletions data/trades.asm
@@ -1,5 +1,17 @@
TradeMons: ; 71b7b (1c:5b7b)
; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
IF _YELLOW
db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@"
db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@"
db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@"
db KANGASKHAN,MUK, 0,"STICKY@@@@@"
db MEW, MEW, 2,"BART@@@@@@@"
db TANGELA, PARASECT, 0,"SPIKE@@@@@@"
db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@"
db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@"
db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@"
db CUBONE, MACHOKE, 2,"RICKY@@@@@@"
ELSE
db NIDORINO, NIDORINA, 0,"TERRY@@@@@@"
db ABRA, MR_MIME, 0,"MARCEL@@@@@"
db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@"
Expand All @@ -10,3 +22,4 @@ TradeMons: ; 71b7b (1c:5b7b)
db RAICHU, ELECTRODE, 1,"DORIS@@@@@@"
db VENONAT, TANGELA, 2,"CRINKLES@@@"
db NIDORAN_M, NIDORAN_F, 2,"SPOT@@@@@@@"
ENDC
4 changes: 4 additions & 0 deletions engine/battle/core.asm
Expand Up @@ -2954,7 +2954,11 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
jp Delay3

DisabledText: ; 3d555 (f:5555)
IF _YELLOW
db "Disabled!@"
ELSE
db "disabled!@"
ENDC

TypeText: ; 3d55f (f:555f)
db "TYPE@"
Expand Down
3 changes: 3 additions & 0 deletions engine/menu/bills_pc.asm
Expand Up @@ -345,6 +345,9 @@ BillsPCMenuText: ; 216e1 (8:56e1)
next "DEPOSIT ", $4a
next "RELEASE ", $4a
next "CHANGE BOX"
IF _YELLOW
next "PRINT BOX"
ENDC
next "SEE YA!"
db "@"

Expand Down
3 changes: 3 additions & 0 deletions engine/menu/pokedex.asm
Expand Up @@ -366,6 +366,9 @@ PokedexMenuItemsText: ; 402af (10:42af)
db "DATA"
next "CRY"
next "AREA"
IF _YELLOW
next "PRNT"
ENDC
next "QUIT@"

; tests if a pokemon's bit is set in the seen or owned pokemon bit fields
Expand Down
3 changes: 3 additions & 0 deletions preprocessor.py
Expand Up @@ -176,6 +176,9 @@

"№": 0x74,

"′": 0x71,
"″": 0x73,

" ": 0x7F,
"A": 0x80,
"B": 0x81,
Expand Down
170 changes: 170 additions & 0 deletions text.asm
Expand Up @@ -166,6 +166,13 @@ _OaksAideNoRoomText:: ; 802ec (20:42ec)
text "."
done

IF DEF(_YELLOW)
_NurseChanseyText::
text "CHANSEY: Chaaan"
line "sey!
done
ENDC
INCLUDE "text/maps/viridian_forest.asm"
INCLUDE "text/maps/mt_moon_1f.asm"
INCLUDE "text/maps/mt_moon_b1f.asm"
Expand Down Expand Up @@ -573,6 +580,12 @@ _CinnabarGymQuizIntroText:: ; 887b7 (22:47b7)
line "Here we go!"
prompt
IF DEF(_YELLOW)
text "#MON Quiz!"
line "Test your skill!"
done
ENDC
_CinnabarQuizQuestionsText1:: ; 8886d (22:486d)
text "CATERPIE evolves"
line "into BUTTERFREE?"
Expand Down Expand Up @@ -834,6 +847,16 @@ _KabutopsFossilText:: ; 88fd5 (22:4fd5)
cont "rare #MON."
done
IF DEF(_YELLOW)
_FanClubPicture1Text::
text "My cute RAPIDASH."
done
_FanClubPicture2Text::
text "My beloved FEAROW."
done
ENDC
_LinkCableHelpText1:: ; 89001 (22:5001)
text "TRAINER TIPS"
Expand Down Expand Up @@ -1172,6 +1195,12 @@ _GotAwayText:: ; 8981f (22:581f)
text "Got away safely!"
prompt
IF DEF(_YELLOW)
_RunAwayText::
text "Hurry, get away!"
prompt
ENDC
_ItemsCantBeUsedHereText:: ; 89831 (22:5831)
text "Items can't be"
line "used here."
Expand Down Expand Up @@ -1565,6 +1594,13 @@ _WhichFloorText:: ; 89dad (22:5dad)
line "you want? "
done
IF DEF(_YELLOW)
_SleepingPikachuText1::
text "There isn't any"
line "response..."
prompt
ENDC
_PartyMenuNormalText:: ; 89dc8 (22:5dc8)
text "Choose a #MON."
done
Expand All @@ -1580,7 +1616,11 @@ _PartyMenuBattleText:: ; 89df1 (22:5df1)
done
_PartyMenuUseTMText:: ; 89e08 (22:5e08)
IF DEF(_YELLOW)
text "Teach to which"
ELSE
text "Use TM on which"
ENDC
line "#MON?"
done
Expand Down Expand Up @@ -1752,6 +1792,13 @@ _AccessedHoFPCText:: ; 8a0f4 (22:60f4)
line "OF FAME List."
prompt
IF DEF(_YELLOW)
_SleepingPikachuText2::
text "There isn't any"
line "response..."
prompt
ENDC
_SwitchOnText:: ; 0x8a131
text "Switch on!"
prompt
Expand Down Expand Up @@ -1805,6 +1852,14 @@ _CantTakeMonText:: ; 0x8a1f6
line "first."
prompt
IF DEF(_YELLOW)
_PikachuUnhappyText::
TX_RAM $cd6d
text "looks"
line "unhappy about it!"
prompt
ENDC
_ReleaseWhichMonText:: ; 0x8a228
text "Release which"
line "#MON?"
Expand Down Expand Up @@ -1926,6 +1981,111 @@ _WillBeTradedText:: ; 8a677 (22:6677)
cont "be traded."
done
IF DEF(_YELLOW)
_Colosseum3MonsText::
text "You need 3 #MON"
line "to fight!"
prompt
_ColosseumMewText::
text "Sorry, MEW can't"
line "attend!"
prompt
_ColosseumDifferentMonsText::
text "Your #MON must"
line "all be different!"
prompt
_ColosseumMaxL55Text::
text "No #MON can"
line "exceed L55!"
prompt
_ColosseumMinL50Text::
text "All #MON must"
line "be at least L50!"
prompt
_ColosseumTotalL155Text::
text "Your total levels"
line "exceed 155!"
prompt
_ColosseumMaxL30Text::
text "No #MON can"
line "exceed L30!"
prompt
_ColosseumMinL25Text::
text "All #MON must"
line "be at least L25!"
prompt
_ColosseumTotalL80Text::
text "Your total levels"
line "exceed 80!"
prompt
_ColosseumMaxL20Text::
text "No #MON can"
line "exceed L20!"
prompt
_ColosseumMinL15Text::
text "All #MON must"
line "be at least L15!"
prompt
_ColosseumTotalL50Text::
text "Your total levels"
line "exceed 50!"
prompt
_ColosseumHeightText::
TX_RAM $CD6D
text " is over"
line "68″ tall!"
prompt
_ColosseumWeightText::
TX_RAM $CD6D
text " weighs"
line "over 44 pounds!"
prompt
_ColosseumEvolvedText::
TX_RAM $CD6D
text " is an"
line "evolved #MON!"
prompt
_ColosseumIneligibleText::
text "Your opponent is"
line "ineligible."
prompt
_ColosseumWhereToText::
text "Where would you"
line "like to go?"
prompt
_ColosseumPleaseWaitText::
text "OK, please wait"
line "just a moment."
prompt
_ColosseumCanceledText::
text "The link was"
line "canceled."
prompt
_ColosseumVersionText::
text "The game versions"
line "don't match."
prompt
ENDC
_Char00Text:: ; 8a696 (22:6696)
TX_NUM $FF8C,1,2
text " ERROR."
Expand All @@ -1934,6 +2094,13 @@ _Char00Text:: ; 8a696 (22:6696)
_Char55Text:: ; 8a6a3 (22:66a3)
text $4B,"@@"
IF DEF(_YELLOW)
_NoPokemonText::
text "There are no"
line "#MON here!"
prompt
ENDC
INCLUDE "text/maps/digletts_cave_route_2_entrance.asm"
INCLUDE "text/maps/viridian_forest_exit.asm"
INCLUDE "text/maps/route_2_house.asm"
Expand Down Expand Up @@ -1968,6 +2135,9 @@ INCLUDE "text/maps/route_16_gate_upstairs.asm"
INCLUDE "text/maps/route_16_house.asm"
INCLUDE "text/maps/route_18_gate.asm"
INCLUDE "text/maps/route_18_gate_upstairs.asm"
IF DEF(_YELLOW)
INCLUDE "text/maps/surf_house.asm"
ENDC
INCLUDE "text/maps/pokemon_league_gate.asm"
INCLUDE "text/maps/victory_road_2f.asm"
INCLUDE "text/maps/bills_house.asm"
Expand Down
4 changes: 4 additions & 0 deletions text/maps/agatha.asm
Expand Up @@ -23,7 +23,11 @@ _AgathaBeforeBattleText:: ; 8686b (21:686b)
done

_AgathaEndBattleText:: ; 86970 (21:6970)
IF DEF(_YELLOW)
text "Woo-hoo!
ELSE
text "Oh ho!"
ENDC
line "You're something"
cont "special, child!"
prompt
Expand Down
7 changes: 7 additions & 0 deletions text/maps/bills_house.asm
@@ -1,3 +1,10 @@
IF DEF(_YELLOW)
_BillsHouseDontLeaveText::
text "Whoa, don't go"
line "anywhere, wait!"
done
ENDC

_BillsHouseText_1e865:: ; 8d267 (23:5267)
text "Hiya! I'm a"
line "#MON..."
Expand Down
8 changes: 8 additions & 0 deletions text/maps/blues_house.asm
Expand Up @@ -29,11 +29,19 @@ _DaisyUseMapText::
done

_BluesHouseText2::
IF DEF(_YELLOW)
text "Spending time"
line "with your #MON"
cont "makes them more"
cont "friendly to you."
done
ELSE
text "#MON are living"
line "things! If they"
cont "get tired, give"
cont "them a rest!"
done
ENDC

_BluesHouseText3::
text "It's a big map!"
Expand Down
4 changes: 4 additions & 0 deletions text/maps/daycare_2.asm
Expand Up @@ -3,7 +3,11 @@ _DayCareMText_56437:: ; 8c000 (23:4000)
line "@@"

_DayCareMText_5643b:: ; 8c013 (23:4013)
IF DEF(_YELLOW)
text "Come again."
ELSE
text "come again."
ENDC
done

_DayCareMText_56440:: ; 8c020 (23:4020)
Expand Down
4 changes: 4 additions & 0 deletions text/maps/hall_of_fame.asm
@@ -1,6 +1,10 @@
_HallofFameRoomText1:: ; 85fb5 (21:5fb5)
text "OAK: Er-hem!"
IF DEF(_YELLOW)
line "Congratulations,"
ELSE
line "Congratulations"
ENDC
cont $52, "!"

para "This floor is the"
Expand Down
4 changes: 4 additions & 0 deletions text/maps/lance.asm
@@ -1,6 +1,10 @@
_LanceBeforeBattleText:: ; 85d3c (21:5d3c)
text "Ah! I heard about"
IF DEF(_YELLOW)
line "you, ", $52, "!"
ELSE
line "you ", $52, "!"
ENDC

para "I lead the ELITE"
line "FOUR! You can"
Expand Down

0 comments on commit 6e14461

Please sign in to comment.