summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-22 21:51:25 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-22 21:51:25 -0400
commit4f4904ec53d000a4c59994e0aecbb5ca79c6b059 (patch)
tree9a640d0fd0e16b54fe0a1975d7caaf925281a7e7 /main.asm
parent419f5d942b57cd4124d2770637faec12dc13ab18 (diff)
Next batch of item effects
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm10
1 files changed, 8 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index ac1fcd5f..9f241ce0 100644
--- a/main.asm
+++ b/main.asm
@@ -849,7 +849,10 @@ SECTION "bankd", ROMX, BANK[$d]
dr $34000, $34923
CheckTypeMatchup::
- dr $34923, $37e9b
+ dr $34923, $366f6
+
+CalcPlayerStats:
+ dr $366f6, $37e9b
GetItemHeldEffect:
dr $37e9b, $38000
@@ -1416,7 +1419,10 @@ Predef3A::
SECTION "bank40", ROMX, BANK[$40]
BattleText:: ; Not actually where it is, I just needed the label for BANK to work
- dr $100000, $104000
+ dr $100000, $101746
+
+Text_ConfusedNoMore::
+ dr $101746, $104000
SECTION "bank41", ROMX, BANK[$41]
dr $104000, $108000