Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
This commit is contained in:
Rangi
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maps/BattleTower1F.asm
View File

@@ -525,7 +525,7 @@ Text_AskRegisterRecord_Mobile:
Text_PlayerGotFive: ; 0x9eb7e
text "<PLAYER> got five"
line "@"
text_from_ram StringBuffer4
text_from_ram wStringBuffer4
text "!@"
sound_item
text_waitbutton
@@ -635,7 +635,7 @@ Text_YourPkmnWillBeHealedToFullHealth: ; 0x9ee92
Text_NextUpOpponentNo: ; 0x9eebc
text "Next up, opponent"
line "no.@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text ". Ready?"
done
@@ -734,7 +734,7 @@ Text_APkmnLevelExceeds: ; 0x9f1e5
text "One or more of"
line "your #MON's"
cont "levels exceeds @"
deciram ScriptVar, 1, 3
deciram wScriptVar, 1, 3
text "."
done
@@ -746,7 +746,7 @@ Text_MayNotEnterABattleRoomUnderL70: ; 0x9f217
para "This BATTLE ROOM"
line "is for L@"
deciram ScriptVar, 1, 3
deciram wScriptVar, 1, 3
text "."
done

2
maps/BattleTowerHallway.asm
View File

@@ -26,7 +26,7 @@ BattleTowerHallway_MapScripts:
ld a, BANK(wBTChoiceOfLvlGroup)
ld [rSVBK], a
ld a, [wBTChoiceOfLvlGroup]
ld [ScriptVar], a
ld [wScriptVar], a
pop af
ld [rSVBK], a

2
maps/BillsHouse.asm
View File

@@ -239,7 +239,7 @@ BillsGrandpaYouDontHaveItTextText:
BillsGrandpaShownPokemonText:
text "Ah, so that is"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "?"
para "Isn't it cute!"

2
maps/BluesHouse.asm
View File

@@ -104,7 +104,7 @@ DaisyAlrightText:
done
GroomedMonLooksContentText:
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text " looks"
line "content."
done

2
maps/CeladonCafe.asm
View File

@@ -196,7 +196,7 @@ EatathonContestPosterText:
FoundLeftoversText:
text "<PLAYER> found"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "!"
done

2
maps/CeladonDeptStore6F.asm
View File

@@ -107,7 +107,7 @@ CeladonClangText:
text "Clang!"
para "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text_start
line "popped out."
done

2
maps/CeladonGameCornerPrizeRoom.asm
View File

@@ -233,7 +233,7 @@ CeladonPrizeRoom_AskWhichPrizeText:
CeladonPrizeRoom_ConfirmPurchaseText:
text "OK, so you wanted"
line "a @"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "?"
done

2
maps/DragonsDenB1F.asm
View File

@@ -394,7 +394,7 @@ TwinsLeaandpia2AfterBattleText:
Text_FoundDragonFang:
text "<PLAYER> found"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "!"
done

2
maps/ElmsLab.asm
View File

@@ -891,7 +891,7 @@ ChoseStarterText:
ReceivedStarterText:
text "<PLAYER> received"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "!"
done

2
maps/GoldenrodDeptStore6F.asm
View File

@@ -100,7 +100,7 @@ GoldenrodVendingText:
GoldenrodClangText:
text "Clang! A can of"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text_start
cont "popped out!"
done

2
maps/GoldenrodGameCorner.asm
View File

@@ -326,7 +326,7 @@ GoldenrodGameCornerPrizeVendorWhichPrizeText:
done
GoldenrodGameCornerPrizeVendorConfirmPrizeText:
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "."
line "Is that right?"
done

2
maps/GoldenrodHappinessRater.asm
View File

@@ -78,7 +78,7 @@ UnknownText_0x549a3:
para "Oh? Let me see"
line "your @"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "…"
done

6
maps/GoldenrodPokecenter1F.asm
View File

@@ -180,10 +180,10 @@ UnknownText_0x6113b:
line "to trade your"
para "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text " for"
line "@"
text_from_ram StringBuffer4
text_from_ram wStringBuffer4
text "."
para "We'll have to hold"
@@ -200,7 +200,7 @@ UnknownText_0x611c9:
line "to trade your"
para "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text " for a"
line "#MON that you"
cont "have never seen."

8
maps/GoldenrodUnderground.asm
View File

@@ -34,7 +34,7 @@ GoldenrodUnderground_MapScripts:
clearevent EVENT_SWITCH_13
clearevent EVENT_SWITCH_14
writebyte 0
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
return
.CheckBasementKey:
@@ -617,19 +617,19 @@ UnknownText_0x7c87b:
done
HaircutBrosText_SlightlyHappier:
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text " looks a"
line "little happier."
done
HaircutBrosText_Happier:
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text " looks"
line "happy."
done
HaircutBrosText_MuchHappier:
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text " looks"
line "delighted!"
done

32
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@@ -279,9 +279,9 @@ Switch1Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar 1
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
setevent EVENT_SWITCH_1
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -289,9 +289,9 @@ Switch1Script:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar -1
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_SWITCH_1
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -304,9 +304,9 @@ Switch2Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar 2
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
setevent EVENT_SWITCH_2
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -314,9 +314,9 @@ Switch2Script:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar -2
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_SWITCH_2
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -329,9 +329,9 @@ Switch3Script:
writetext SwitchRoomText_OffTurnOn
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar 3
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
setevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -339,9 +339,9 @@ Switch3Script:
writetext SwitchRoomText_OnTurnOff
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
addvar -3
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_SWITCH_3
jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
@@ -355,7 +355,7 @@ EmergencySwitchScript:
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
writebyte 7
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
setevent EVENT_EMERGENCY_SWITCH
setevent EVENT_SWITCH_1
setevent EVENT_SWITCH_2
@@ -367,7 +367,7 @@ EmergencySwitchScript:
yesorno
iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
writebyte 0
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
clearevent EVENT_EMERGENCY_SWITCH
clearevent EVENT_SWITCH_1
clearevent EVENT_SWITCH_2
@@ -379,7 +379,7 @@ GoldenrodUndergroundSwitchRoomEntrances_DontToggle:
end
GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
copybytetovar UndergroundSwitchPositions
copybytetovar wUndergroundSwitchPositions
ifequal 0, .Position0
ifequal 1, .Position1
ifequal 2, .Position2
@@ -499,7 +499,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
reloadmappart
closetext
writebyte 6
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
end
.Set4:

2
maps/GoldenrodUndergroundWarehouse.asm
View File

@@ -30,7 +30,7 @@ GoldenrodUndergroundWarehouse_MapScripts:
clearevent EVENT_SWITCH_13
clearevent EVENT_SWITCH_14
writebyte 0
copyvartobyte UndergroundSwitchPositions
copyvartobyte wUndergroundSwitchPositions
return
TrainerGruntM24:

48
maps/IlexForest.asm
View File

@@ -20,7 +20,7 @@ IlexForest_MapScripts:
.FarfetchdCallback:
checkevent EVENT_GOT_HM01_CUT
iftrue .Static
copybytetovar FarfetchdPosition
copybytetovar wFarfetchdPosition
ifequal 1, .PositionOne
ifequal 2, .PositionTwo
ifequal 3, .PositionThree
@@ -101,7 +101,7 @@ IlexForestCharcoalApprenticeScript:
end
IlexForestFarfetchdScript:
copybytetovar FarfetchdPosition
copybytetovar wFarfetchdPosition
ifequal 1, .Position1
ifequal 2, .Position2
ifequal 3, .Position3
@@ -126,7 +126,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 25
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 2
loadvar wFarfetchdPosition, 2
end
.Position2:
@@ -136,7 +136,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 20, 24
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 3
loadvar wFarfetchdPosition, 3
end
.Position2_Down:
@@ -144,7 +144,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 29
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 8
loadvar wFarfetchdPosition, 8
end
.Position3:
@@ -154,7 +154,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 29, 22
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 4
loadvar wFarfetchdPosition, 4
end
.Position3_Left:
@@ -162,7 +162,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 25
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 2
loadvar wFarfetchdPosition, 2
end
.Position4:
@@ -172,7 +172,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 28, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 5
loadvar wFarfetchdPosition, 5
end
.Position4_Up:
@@ -180,7 +180,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 20, 24
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 3
loadvar wFarfetchdPosition, 3
end
.Position5:
@@ -192,7 +192,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 24, 35
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 6
loadvar wFarfetchdPosition, 6
end
.Position5_Left:
@@ -200,7 +200,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 22, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 7
loadvar wFarfetchdPosition, 7
end
.Position5_Up:
@@ -208,7 +208,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 29, 22
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 4
loadvar wFarfetchdPosition, 4
end
.Position5_Right:
@@ -216,7 +216,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 29, 22
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 4
loadvar wFarfetchdPosition, 4
end
.Position6:
@@ -226,7 +226,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 22, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 7
loadvar wFarfetchdPosition, 7
end
.Position6_Right:
@@ -234,7 +234,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 28, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 5
loadvar wFarfetchdPosition, 5
end
.Position7:
@@ -245,7 +245,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 29
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 8
loadvar wFarfetchdPosition, 8
end
.Position7_Left:
@@ -253,7 +253,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 24, 35
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 6
loadvar wFarfetchdPosition, 6
end
.Position7_Down:
@@ -261,7 +261,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 28, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 5
loadvar wFarfetchdPosition, 5
end
.Position8:
@@ -273,7 +273,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 10, 35
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 9
loadvar wFarfetchdPosition, 9
end
.Position8_Right:
@@ -281,7 +281,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 22, 31
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 7
loadvar wFarfetchdPosition, 7
end
.Position8_Up:
@@ -290,7 +290,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 25
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 2
loadvar wFarfetchdPosition, 2
end
.Position9:
@@ -301,7 +301,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 6, 28
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 10
loadvar wFarfetchdPosition, 10
appear ILEXFOREST_BLACK_BELT
setevent EVENT_CHARCOAL_KILN_BOSS
setevent EVENT_HERDED_FARFETCHD
@@ -312,7 +312,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 29
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 8
loadvar wFarfetchdPosition, 8
end
.Position9_Down:
@@ -320,7 +320,7 @@ IlexForestFarfetchdScript:
moveobject ILEXFOREST_FARFETCHD, 15, 29
disappear ILEXFOREST_FARFETCHD
appear ILEXFOREST_FARFETCHD
loadvar FarfetchdPosition, 8
loadvar wFarfetchdPosition, 8
end
.Position10:

4
maps/LakeOfRageMagikarpHouse.asm
View File

@@ -198,10 +198,10 @@ UnknownText_0x19aabc:
text "CURRENT RECORD"
para "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text " caught by"
line "@"
text_from_ram StringBuffer4
text_from_ram wStringBuffer4
db "@@"
LakeOfRageMagikarpHouse_MapEvents:

8
maps/Pokecenter2F.asm
View File

@@ -912,7 +912,7 @@ Text_PleaseEnter:
Text_RejectNewMon:
text "Sorry--@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text_start
line "can't be taken."
prompt
@@ -920,17 +920,17 @@ Text_RejectNewMon:
Text_RejectMonWithNewMove:
text "You can't take the"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " with a"
cont "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "."
prompt
Text_RejectMonWithMail:
text "You can't take the"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " that"
cont "has MAIL with you."
prompt

2
maps/RadioTower1F.asm
View File

@@ -237,7 +237,7 @@ UnknownText_0x5ceba:
UnknownText_0x5cf3a:
text "This week's ID"
line "number is @"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "."
done

6
maps/Route35NationalParkGate.asm
View File

@@ -224,7 +224,7 @@ MovementData_0x6a2e9:
UnknownText_0x6a2eb:
text "Today's @"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "."
line "That means the"
@@ -287,7 +287,7 @@ UnknownText_0x6a4c6:
para "You'll have to use"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text ", the"
para "first #MON in"
@@ -371,7 +371,7 @@ UnknownText_0x6a71f:
UnknownText_0x6a79a:
text "You still have @"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text_start
line "minute(s) left."

6
maps/Route36NationalParkGate.asm
View File

@@ -474,7 +474,7 @@ MovementData_0x6add1:
UnknownText_0x6add5:
text "Today's @"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "."
line "That means the"
@@ -537,7 +537,7 @@ UnknownText_0x6afb0:
para "You'll have to use"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text ", the"
para "first #MON in"
@@ -621,7 +621,7 @@ UnknownText_0x6b209:
UnknownText_0x6b284:
text "You still have @"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text_start
line "minute(s) left."

4
maps/Route39Barn.asm
View File

@@ -67,9 +67,9 @@ MooMoo:
checkitem BERRY
iffalse .NoBerriesInBag
takeitem BERRY
copybytetovar MooMooBerries
copybytetovar wMooMooBerries
addvar 1
copyvartobyte MooMooBerries
copyvartobyte wMooMooBerries
ifequal 3, .ThreeBerries
ifequal 5, .FiveBerries
ifequal 7, .SevenBerries

2
maps/TrainerHouseB1F.asm
View File

@@ -119,7 +119,7 @@ TrainerHouseB1FIntroText:
done
TrainerHouseB1FYourOpponentIsText:
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text " is your"
line "opponent today."
done