Remove mom saving/spending coins (#1); add coins gained from a trainer battle to wCurLevelCoins (#30)

This commit is contained in:
xCrystal
2024-03-18 18:17:35 +01:00
parent 659dfb085a
commit 5f0cdcaa85
17 changed files with 10 additions and 954 deletions

View File

@@ -20,9 +20,6 @@ EngineFlags:
engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F
engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F
engine_flag wMomSavingCoins, MOM_SAVING_SOME_COINS_F
engine_flag wMomSavingCoins, MOM_ACTIVE_F
engine_flag wStatusFlags, STATUSFLAGS_POKEDEX_F
engine_flag wStatusFlags, STATUSFLAGS_UNOWN_DEX_F
engine_flag wStatusFlags, STATUSFLAGS_CAUGHT_POKERUS_F

View File

@@ -42,7 +42,6 @@ SpecialsPointers::
add_special DayCareLady
add_special DayCareManOutside
add_special MoveDeletion
add_special BankOfMom
add_special MagnetTrain
add_special NameRival
add_special OverworldTownMap

View File

@@ -1,29 +0,0 @@
MACRO momitem
; coins to trigger, cost, kind, item
dt \1
dt \2
db \3, \4
ENDM
MomItems_1:
momitem 0, 600, MOM_ITEM, SUPER_POTION
momitem 0, 90, MOM_ITEM, ANTIDOTE
momitem 0, 180, MOM_ITEM, POKE_BALL
momitem 0, 450, MOM_ITEM, ESCAPE_ROPE
momitem 0, 500, MOM_ITEM, GREAT_BALL
.End
MomItems_2:
momitem 900, 600, MOM_ITEM, SUPER_POTION
momitem 4000, 270, MOM_ITEM, REPEL
momitem 7000, 600, MOM_ITEM, SUPER_POTION
momitem 10000, 1800, MOM_DOLL, DECO_CHARMANDER_DOLL
momitem 15000, 3000, MOM_ITEM, MOON_STONE
momitem 19000, 600, MOM_ITEM, SUPER_POTION
momitem 30000, 4800, MOM_DOLL, DECO_CLEFAIRY_DOLL
momitem 40000, 900, MOM_ITEM, HYPER_POTION
momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL
momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL
.End
dt 0 ; unused

View File

@@ -64,7 +64,6 @@ PredefPointers::
add_predef PlayBattleAnim
add_predef DummyPredef38
add_predef DummyPredef39
add_predef DummyPredef3A
add_predef PartyMonItemName
add_predef GetMonFrontpic
add_predef GetMonBackpic

View File

@@ -183,28 +183,6 @@ TiedAgainstText:
line "<ENEMY>!"
prompt
SentSomeToMomText:
text "<PLAYER> got <COIN>@"
text_decimal wBattleReward, 3, 6
text_start
line "for winning!"
cont "Sent some to MOM!"
prompt
SentHalfToMomText:
text "Sent half to MOM!"
prompt
SentAllToMomText:
text "Sent all to MOM!"
prompt
UnusedRivalLossText: ; unreferenced
text "<RIVAL>: Huh? I"
line "should've chosen"
cont "your #MON!"
prompt
BattleText_MonFainted:
text_ram wBattleMonNickname
text_start
@@ -215,12 +193,6 @@ BattleText_UseNextMon:
text "Use next #MON?"
done
UnusedRivalWinText: ; unreferenced
text "<RIVAL>: Yes!"
line "I guess I chose a"
cont "good #MON!"
prompt
LostAgainstText:
text "Lost against"
line "<ENEMY>!"