ref: 8d8258f5e6215f5d818ca81f838b33f3de822a89
parent: 4fb07a5808296b0c555f726d20794fb51f2e1637
author: Bryan Bishop <kanzure@gmail.com>
date: Sat Jan 21 12:38:16 EST 2012
replaced $3e2e with GiveItem in some texts hg-commit-id: dda17ec62888
--- a/common.asm
+++ b/common.asm
@@ -10273,7 +10273,7 @@
ld hl, $51ca
call PrintText
ld bc,(TM_42 << 8) | 1
- call $3e2e
+ call GIveItem
jr nc, .asm_b655e ; 0x191aa
ld hl, $51cf
call PrintText
@@ -11190,7 +11190,7 @@
ld hl, $59d2
call PrintText
ld bc,(TM_41 << 8) | 1
- call $3e2e
+ call GiveItem
jr c, .asm_890ec ; 0x199b2
ld hl, $59e2
call PrintText
@@ -12635,7 +12635,7 @@
ld hl, $4ae3
call PrintText
ld bc, (POTION << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_a630e ; 0x1cace
ld hl, $4ae8
jr .asm_46d43 ; 0x1cad3
@@ -13628,7 +13628,7 @@
set 4, [hl]
jr nz, .asm_17c30 ; 0x1d2d7
ld bc, (POKE_BALL << 8) | 5
- call $3e2e
+ call GiveItem
ld hl, $530e
call PrintText
jr .asm_0f042 ; 0x1d2e5
@@ -14337,7 +14337,7 @@
ld hl, $581f
call PrintText
ld bc,(BICYCLE << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_d0d90 ; 0x1d769
ld a, $2d
ldh [$db], a
@@ -14577,7 +14577,7 @@
ld hl, $594c
call PrintText
ld bc, (POKE_FLUTE << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_5ce36 ; 0x1d92c
ld hl, $5951
call PrintText
@@ -15109,7 +15109,7 @@
ld hl, $5e75
call PrintText
ld bc,(TM_29 << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_4b1da ; 0x1de55
ld hl, $5e7a
call PrintText
@@ -15855,7 +15855,7 @@
ld hl, $662b
call PrintText
ld bc,(HM_02 << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_d3ee3 ; 0x1e616
ld hl, $d7e0
set 6, [hl]
@@ -16100,7 +16100,7 @@
ld hl, $68ba
call PrintText
ld bc,(S_S__TICKET << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_18a67 ; 0x1e888
ld hl, $68bf
call PrintText
@@ -26768,7 +26768,7 @@
ld hl, $4278
call PrintText
ld bc,(TM_18 << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_95f37 ; 0x4825e
ld hl, $d778
set 7, [hl]
@@ -28232,7 +28232,7 @@
ld hl, $51a7
call PrintText
ld bc,(COIN_CASE << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_78e93 ; 0x49187
ld hl, $d783
set 0, [hl]
@@ -28779,7 +28779,7 @@
ld hl, $559c
call PrintText
ld bc,(TM_39 << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_4c2be ; 0x4957c
ld hl, $55a1
call PrintText
@@ -29597,7 +29597,7 @@
and a
jr nz, .asm_1fa5e ; 0x49efc
ld bc,(DOME_FOSSIL << 8) | 1
- call $3e2e
+ call GiveItem
jp nc, $5f76
call $5f69
ld a, $6d
@@ -29628,7 +29628,7 @@
and a
jr nz, .asm_8e988 ; 0x49f3c
ld bc,(HELIX_FOSSIL << 8) | 1
- call $3e2e
+ call GiveItem
jp nc, $5f76
call $5f69
ld a, $6e
@@ -29855,7 +29855,7 @@
ld hl, $6350
call PrintText
ld bc,(HM_03 << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_a21d2 ; 0x4a330
ld hl, $6355
call PrintText
@@ -35276,7 +35276,7 @@
and a
jr nz, asm_eb1b7 ; 0x5608a
ld bc,(OLD_ROD << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, asm_fd67b ; 0x56092
ld hl, $d728
set 3, [hl]
@@ -35416,7 +35416,7 @@
and a
jr nz, asm_3ace4 ; 0x56196
ld bc,(GOOD_ROD << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, asm_628ee ; 0x5619e
ld hl, $d728
set 4, [hl]
@@ -35663,7 +35663,7 @@
and a
jr nz, asm_a2d76 ; 0x56499
ld bc,(SUPER_ROD << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, asm_e3b89 ; 0x564a1
ld hl, $d728
set 5, [hl]
@@ -37925,7 +37925,7 @@
ld hl, $5c6a
call PrintText
ld bc,(BIKE_VOUCHER << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, asm_867d4 ; 0x59c3d
ld hl, $5c6f
call PrintText
@@ -38050,7 +38050,7 @@
ld hl, $5ded
call PrintText
ld bc,(TM_36 << 8) | 1
- call $3e2e
+ call GiveItem
ld hl, $5dfd
jr nc, asm_2c1e0 ; 0x59dd8
ld hl, $d826
@@ -38946,7 +38946,7 @@
ld hl, $428e
call PrintText
ld bc,(OLD_AMBER << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_91ebf ; 0x5c26a
ld hl, $d754
set 1, [hl]
@@ -40103,7 +40103,7 @@
ld hl, $4cd9
call PrintText
ld bc,(TM_31 << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_16690 ; 0x5cca8
ld hl, $4cde
call PrintText
@@ -43348,7 +43348,7 @@
ld hl, $5927
call PrintText
ld bc,(HM_01 << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_ccdcd ; 0x618c7
ld hl, $592c
call PrintText
@@ -44159,7 +44159,7 @@
ld hl, $6311
call PrintText
ld bc,(MASTER_BALL << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_36088 ; 0x622f1
ld hl, $6316
call PrintText
@@ -46530,7 +46530,7 @@
ld hl, $514e
call PrintText
ld bc,(HM_04 << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_53b90 ; 0x75115
ld hl, $5153
call PrintText
@@ -47913,7 +47913,7 @@
ld hl, $5cc8
call PrintText
ld bc,(TM_35 << 8) | 1
- call $3e2e
+ call GiveItem
jr nc, .asm_6c187 ; 0x75ca8
ld hl, $5ccd
call PrintText
--- a/constants.asm
+++ b/constants.asm
@@ -93,6 +93,8 @@
W_WHICHTRADE EQU $CD3D ; which entry from TradeMons to select
+W_WHICHPOKEMON EQU $CF92 ; which pokemon you selected
+
W_OPPONENTHP EQU $CFE6 ; active opponent's hp (16 bits)
W_OPPONENTNUMBER EQU $CFE8 ; active opponent's position in team (0 to 5)
W_OPPONENTSTATUS EQU $CFE9 ; active opponent's status condition
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -566,6 +566,8 @@
"24d7": "TextScriptEnd",
"3e5c": "GenRandom", #bank 4
"6581": "ItemUseNotTime",
+ "3a87": "AddNTimes",
+ "3dab": "IsInArray", #bank 3
}
def random_asm_label():