From 86c1b05fbc74711d03e4a2122342c55e58d99995 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 6 Aug 2018 17:20:05 +0200 Subject: Split print_move_description and mon_menu --- engine/items/tmhm.asm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'engine/items') diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 38ffa865e..14e481248 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -557,18 +557,3 @@ CountTMsHMs: ld a, b ld [wTempTMHM], a ret - -PrintMoveDesc: - push hl - ld hl, MoveDescriptions - ld a, [wCurSpecies] - dec a - ld c, a - ld b, 0 - add hl, bc - add hl, bc - ld a, [hli] - ld e, a - ld d, [hl] - pop hl - jp PlaceString -- cgit v1.2.3 From f98a95b8ee2bb14f8fdb675e37c9876b8163b509 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 6 Aug 2018 19:43:54 +0200 Subject: wWeeklyFlags -> wDailyFlags2 These are by far not always checked each week, and as such shouldn't be called that. Since they're almost always used through the `bit` instruction, it's very inconvenient to just make wDailyFlags a `dw` instead. --- engine/items/mart.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/items') diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 7e185662b..8afae541a 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -54,8 +54,8 @@ BargainShop: ld a, [hli] or [hl] jr z, .skip_set - ld hl, wDailyFlags - set DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F, [hl] + ld hl, wDailyFlags1 + set DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F, [hl] .skip_set ld hl, Text_BargainShop_ComeAgain -- cgit v1.2.3 From 79cf90ab5ec6069d2d27281e6602e85ba5310c87 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Fri, 17 Aug 2018 17:48:41 +0200 Subject: Fix some StatUp-related labels --- engine/items/item_effects.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/items') diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index ee5c4d254..e751b42e6 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -2159,7 +2159,7 @@ XItemEffect: ld [hBattleTurn], a ld [wAttackMissed], a ld [wEffectFailed], a - farcall CheckIfStatCanBeRaised + farcall RaiseStat call WaitSFX farcall BattleCommand_StatUpMessage -- cgit v1.2.3