mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
- Renamed "Functiond283" to "GetPocketCapacity" and updated the pointers and constants to better reflect their hypothesized purposes.
- Using yenatch's version of the macro and constant handling, rewrote the tmhm bit array as a macro-defined environment.
This commit is contained in:
Scott Norton
PikalaxALT
parent
e2c2e20f93
commit
f74fd6903f
@ -5,7 +5,6 @@ INCLUDE "gbhw.asm"
|
||||
INCLUDE "hram.asm"
|
||||
|
||||
INCLUDE "constants/wram_constants.asm"
|
||||
|
||||
INCLUDE "constants/pokemon_constants.asm"
|
||||
INCLUDE "constants/type_constants.asm"
|
||||
INCLUDE "constants/move_constants.asm"
|
||||
|
||||
@ -190,70 +190,75 @@
|
||||
const MUSIC_MAIL ; $BC
|
||||
const MIRAGE_MAIL ; $BD
|
||||
const ITEM_BE ; $BE
|
||||
const TM_01 ; $BF
|
||||
const TM_02 ; $C0
|
||||
const TM_03 ; $C1
|
||||
const TM_04 ; $C2
|
||||
const ITEM_C3 ; $C3
|
||||
const TM_05 ; $C4
|
||||
const TM_06 ; $C5
|
||||
const TM_07 ; $C6
|
||||
const TM_08 ; $C7
|
||||
const TM_09 ; $C8
|
||||
const TM_10 ; $C9
|
||||
const TM_11 ; $CA
|
||||
const TM_12 ; $CB
|
||||
const TM_13 ; $CC
|
||||
const TM_14 ; $CD
|
||||
const TM_15 ; $CE
|
||||
const TM_16 ; $CF
|
||||
const TM_17 ; $D0
|
||||
const TM_18 ; $D1
|
||||
const TM_19 ; $D2
|
||||
const TM_20 ; $D3
|
||||
const TM_21 ; $D4
|
||||
const TM_22 ; $D5
|
||||
const TM_23 ; $D6
|
||||
const TM_24 ; $D7
|
||||
const TM_25 ; $D8
|
||||
const TM_26 ; $D9
|
||||
const TM_27 ; $DA
|
||||
const TM_28 ; $DB
|
||||
const ITEM_DC ; $DC
|
||||
const TM_29 ; $DD
|
||||
const TM_30 ; $DE
|
||||
const TM_31 ; $DF
|
||||
const TM_32 ; $E0
|
||||
const TM_33 ; $E1
|
||||
const TM_34 ; $E2
|
||||
const TM_35 ; $E3
|
||||
const TM_36 ; $E4
|
||||
const TM_37 ; $E5
|
||||
const TM_38 ; $E6
|
||||
const TM_39 ; $E7
|
||||
const TM_40 ; $E8
|
||||
const TM_41 ; $E9
|
||||
const TM_42 ; $EA
|
||||
const TM_43 ; $EB
|
||||
const TM_44 ; $EC
|
||||
const TM_45 ; $ED
|
||||
const TM_46 ; $EE
|
||||
const TM_47 ; $EF
|
||||
const TM_48 ; $F0
|
||||
const TM_49 ; $F1
|
||||
const TM_50 ; $F2
|
||||
const HM_01 ; $F3
|
||||
const HM_02 ; $F4
|
||||
const HM_03 ; $F5
|
||||
const HM_04 ; $F6
|
||||
const HM_05 ; $F7
|
||||
const HM_06 ; $F8
|
||||
const HM_07 ; $F9
|
||||
const HM_08 ; $FA
|
||||
|
||||
add_tm DYNAMICPUNCH
|
||||
add_tm HEADBUTT
|
||||
add_tm CURSE
|
||||
add_tm ROLLOUT
|
||||
const ITEM_C3
|
||||
add_tm ROAR
|
||||
add_tm TOXIC
|
||||
add_tm ZAP_CANNON
|
||||
add_tm ROCK_SMASH
|
||||
add_tm PSYCH_UP
|
||||
add_tm HIDDEN_POWER
|
||||
add_tm SUNNY_DAY
|
||||
add_tm SWEET_SCENT
|
||||
add_tm SNORE
|
||||
add_tm BLIZZARD
|
||||
add_tm HYPER_BEAM
|
||||
add_tm ICY_WIND
|
||||
add_tm PROTECT
|
||||
add_tm RAIN_DANCE
|
||||
add_tm GIGA_DRAIN
|
||||
add_tm ENDURE
|
||||
add_tm FRUSTRATION
|
||||
add_tm SOLARBEAM
|
||||
add_tm IRON_TAIL
|
||||
add_tm DRAGONBREATH
|
||||
add_tm THUNDER
|
||||
add_tm EARTHQUAKE
|
||||
add_tm RETURN
|
||||
add_tm DIG
|
||||
const ITEM_DC
|
||||
add_tm PSYCHIC
|
||||
add_tm SHADOW_BALL
|
||||
add_tm MUD_SLAP
|
||||
add_tm DOUBLE_TEAM
|
||||
add_tm ICE_PUNCH
|
||||
add_tm SWAGGER
|
||||
add_tm SLEEP_TALK
|
||||
add_tm SLUDGE_BOMB
|
||||
add_tm SANDSTORM
|
||||
add_tm FIRE_BLAST
|
||||
add_tm SWIFT
|
||||
add_tm DEFENSE_CURL
|
||||
add_tm THUNDERPUNCH
|
||||
add_tm DREAM_EATER
|
||||
add_tm DETECT
|
||||
add_tm REST
|
||||
add_tm ATTRACT
|
||||
add_tm THIEF
|
||||
add_tm STEEL_WING
|
||||
add_tm FIRE_PUNCH
|
||||
add_tm FURY_CUTTER
|
||||
add_tm NIGHTMARE
|
||||
NUM_TMS = const_value - TM01 - 2
|
||||
|
||||
add_hm CUT
|
||||
add_hm FLY
|
||||
add_hm SURF
|
||||
add_hm STRENGTH
|
||||
add_hm FLASH
|
||||
add_hm WHIRLPOOL
|
||||
add_hm WATERFALL
|
||||
NUM_HMS = const_value - HM01
|
||||
const HM_08
|
||||
|
||||
add_mt FLAMETHROWER
|
||||
add_mt THUNDERBOLT
|
||||
add_mt ICE_BEAM
|
||||
|
||||
NUM_TMS EQU 50
|
||||
NUM_HMS EQU 7
|
||||
|
||||
|
||||
; leftovers from red
|
||||
|
||||
2259
data/base_stats.asm
2259
data/base_stats.asm
File diff suppressed because it is too large
Load Diff
2
extras
2
extras
@ -1 +1 @@
|
||||
Subproject commit 46492bd9075313a52622cc585fe7b2ca404cbdcd
|
||||
Subproject commit bf76a6b84a2f57edbcd01d6b2841cb813b2afce4
|
||||
6
home.asm
6
home.asm
@ -991,7 +991,7 @@ GetItemName:: ; 3468
|
||||
push bc
|
||||
ld a, [wd265]
|
||||
|
||||
cp TM_01
|
||||
cp TM01
|
||||
jr nc, .TM
|
||||
|
||||
ld [CurSpecies], a
|
||||
@ -1019,7 +1019,7 @@ GetTMHMName:: ; 3487
|
||||
push af
|
||||
|
||||
; TM/HM prefix
|
||||
cp HM_01
|
||||
cp HM01
|
||||
push af
|
||||
jr c, .TM
|
||||
|
||||
@ -1094,7 +1094,7 @@ GetTMHMName:: ; 3487
|
||||
|
||||
|
||||
IsHM:: ; 34df
|
||||
cp HM_01
|
||||
cp HM01
|
||||
jr c, .NotHM
|
||||
scf
|
||||
ret
|
||||
|
||||
@ -2,7 +2,7 @@ PrintItemDescription: ; 0x1c8955
|
||||
; Print the description for item [CurSpecies] at de.
|
||||
|
||||
ld a, [CurSpecies]
|
||||
cp TM_01
|
||||
cp TM01
|
||||
jr c, .not_a_tm
|
||||
|
||||
ld [CurItem], a
|
||||
|
||||
@ -144,37 +144,37 @@ Mart8: ; 16134
|
||||
|
||||
Mart9: ; 1613b
|
||||
db 3 ; # items
|
||||
db TM_41
|
||||
db TM_48
|
||||
db TM_33
|
||||
db TM_THUNDERPUNCH
|
||||
db TM_FIRE_PUNCH
|
||||
db TM_ICE_PUNCH
|
||||
db $ff
|
||||
; 16140
|
||||
|
||||
Mart10: ; 16140
|
||||
db 4 ; # items
|
||||
db TM_41
|
||||
db TM_48
|
||||
db TM_33
|
||||
db TM_02
|
||||
db TM_THUNDERPUNCH
|
||||
db TM_FIRE_PUNCH
|
||||
db TM_ICE_PUNCH
|
||||
db TM_HEADBUTT
|
||||
db $ff
|
||||
; 16146
|
||||
|
||||
Mart11: ; 16146
|
||||
db 4 ; # items
|
||||
db TM_41
|
||||
db TM_48
|
||||
db TM_33
|
||||
db TM_08
|
||||
db TM_THUNDERPUNCH
|
||||
db TM_FIRE_PUNCH
|
||||
db TM_ICE_PUNCH
|
||||
db TM_ROCK_SMASH
|
||||
db $ff
|
||||
; 1614c
|
||||
|
||||
Mart12: ; 1614c
|
||||
db 5 ; # items
|
||||
db TM_41
|
||||
db TM_48
|
||||
db TM_33
|
||||
db TM_02
|
||||
db TM_08
|
||||
db TM_THUNDERPUNCH
|
||||
db TM_FIRE_PUNCH
|
||||
db TM_ICE_PUNCH
|
||||
db TM_HEADBUTT
|
||||
db TM_ROCK_SMASH
|
||||
db $ff
|
||||
; 16153
|
||||
|
||||
@ -339,11 +339,11 @@ Mart24: ; 161c2
|
||||
|
||||
Mart25: ; 161ce
|
||||
db 5 ; # items
|
||||
db TM_10
|
||||
db TM_11
|
||||
db TM_17
|
||||
db TM_18
|
||||
db TM_37
|
||||
db TM_HIDDEN_POWER
|
||||
db TM_SUNNY_DAY
|
||||
db TM_PROTECT
|
||||
db TM_RAIN_DANCE
|
||||
db TM_SANDSTORM
|
||||
db $ff
|
||||
; 161d5
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
INCLUDE "macros/enum.asm"
|
||||
INCLUDE "macros/basestats.asm"
|
||||
|
||||
INCLUDE "macros/event.asm"
|
||||
INCLUDE "macros/sound.asm"
|
||||
|
||||
66
macros/basestats.asm
Normal file
66
macros/basestats.asm
Normal file
@ -0,0 +1,66 @@
|
||||
define: macro
|
||||
if !def(\1)
|
||||
\1 equs \2
|
||||
endc
|
||||
endm
|
||||
|
||||
const_value = 0
|
||||
|
||||
add_tm: MACRO
|
||||
if !def(TM01)
|
||||
TM01 = const_value
|
||||
enum_start 1
|
||||
endc
|
||||
define _\@_1, "TM_\1"
|
||||
const _\@_1
|
||||
enum \1_TMNUM
|
||||
ENDM
|
||||
|
||||
add_hm: MACRO
|
||||
if !def(HM01)
|
||||
HM01 = const_value
|
||||
endc
|
||||
define _\@_1, "HM_\1"
|
||||
const _\@_1
|
||||
enum \1_TMNUM
|
||||
ENDM
|
||||
|
||||
add_mt: MACRO
|
||||
enum \1_TMNUM
|
||||
ENDM
|
||||
|
||||
tmhm: MACRO
|
||||
x = 0
|
||||
y = 0
|
||||
w = 0
|
||||
rept _NARG
|
||||
if def(\1_TMNUM)
|
||||
if \1_TMNUM < 25
|
||||
x = x | (1 << ((\1_TMNUM) - 1))
|
||||
else
|
||||
if \1_TMNUM < 49
|
||||
y = y | (1 << ((\1_TMNUM) - 1 - 24))
|
||||
else
|
||||
w = w | (1 << ((\1_TMNUM) - 1 - 48))
|
||||
endc
|
||||
endc
|
||||
else
|
||||
fail "\1 is not a TM, HM, or move tutor move"
|
||||
endc
|
||||
|
||||
shift
|
||||
endr
|
||||
|
||||
rept 3
|
||||
db x & $ff
|
||||
x = x >> 8
|
||||
endr
|
||||
rept 3
|
||||
db y & $ff
|
||||
y = y >> 8
|
||||
endr
|
||||
rept 2
|
||||
db w & $ff
|
||||
w = w >> 8
|
||||
endr
|
||||
ENDM
|
||||
30
main.asm
30
main.asm
@ -6823,26 +6823,26 @@ Functiond27b: ; d27b
|
||||
ret
|
||||
; d283
|
||||
|
||||
Functiond283: ; d283
|
||||
ld c, 20
|
||||
GetPocketCapacity: ; d283
|
||||
ld c, MAX_ITEMS
|
||||
ld a, e
|
||||
cp TMsHMsEnd % $100
|
||||
cp NumItems % $100
|
||||
jr nz, .asm_d28e
|
||||
ld a, d
|
||||
cp TMsHMsEnd / $100
|
||||
cp NumItems / $100
|
||||
ret z
|
||||
|
||||
.asm_d28e
|
||||
ld c, 50
|
||||
ld c, MAX_PC_ITEMS
|
||||
ld a, e
|
||||
cp BallsEnd % $100
|
||||
cp PCItems % $100
|
||||
jr nz, .asm_d299
|
||||
ld a, d
|
||||
cp BallsEnd / $100
|
||||
cp PCItems / $100
|
||||
ret z
|
||||
|
||||
.asm_d299
|
||||
ld c, $c
|
||||
ld c, MAX_BALLS
|
||||
ret
|
||||
; d29c
|
||||
|
||||
@ -6873,7 +6873,7 @@ Functiond29c: ; d29c
|
||||
jr .asm_d2a5
|
||||
|
||||
.asm_d2bd
|
||||
call Functiond283
|
||||
call GetPocketCapacity
|
||||
ld a, [de]
|
||||
cp c
|
||||
jr c, .asm_d2c6
|
||||
@ -7176,7 +7176,7 @@ GetTMHMNumber:: ; d407
|
||||
.skip
|
||||
dec a
|
||||
.done
|
||||
sub TM_01
|
||||
sub TM01
|
||||
inc a
|
||||
ld c, a
|
||||
ret
|
||||
@ -7189,9 +7189,9 @@ GetNumberedTMHM: ; d417
|
||||
ld a, c
|
||||
|
||||
; Skip any gaps.
|
||||
cp ITEM_C3 - (TM_01 - 1)
|
||||
cp ITEM_C3 - (TM01 - 1)
|
||||
jr c, .done
|
||||
cp ITEM_DC - (TM_01 - 1) - 1
|
||||
cp ITEM_DC - (TM01 - 1) - 1
|
||||
jr c, .skip_one
|
||||
|
||||
.skip_two
|
||||
@ -7199,7 +7199,7 @@ GetNumberedTMHM: ; d417
|
||||
.skip_one
|
||||
inc a
|
||||
.done
|
||||
add TM_01
|
||||
add TM01
|
||||
dec a
|
||||
ld c, a
|
||||
ret
|
||||
@ -35563,7 +35563,7 @@ Function2c7bf: ; 2c7bf (b:47bf)
|
||||
push af
|
||||
res 4, [hl]
|
||||
ld a, [CurItem]
|
||||
cp TM_01
|
||||
cp TM01
|
||||
jr c, .asm_2c7f5
|
||||
call GetTMHMItemMove
|
||||
ld a, [wd265]
|
||||
@ -35572,7 +35572,7 @@ Function2c7bf: ; 2c7bf (b:47bf)
|
||||
call CopyName1
|
||||
ld hl, UnknownText_0x2c8bf
|
||||
ld a, [CurItem]
|
||||
cp HM_01
|
||||
cp HM01
|
||||
jr c, .asm_2c7e9
|
||||
ld hl, UnknownText_0x2c8c4
|
||||
.asm_2c7e9
|
||||
|
||||
@ -35,7 +35,7 @@ UnknownScript_0x18ec48: ; 0x18ec48
|
||||
setevent EVENT_BEAT_BUG_CATCHER_JOSH
|
||||
writetext UnknownText_0x18ee2b
|
||||
keeptextopen
|
||||
verbosegiveitem TM_49, 1
|
||||
verbosegiveitem TM_FURY_CUTTER, 1
|
||||
iffalse UnknownScript_0x18ec71
|
||||
setevent EVENT_GOT_TM49_FURY_CUTTER
|
||||
writetext UnknownText_0x18eefa
|
||||
|
||||
@ -63,9 +63,9 @@ UnknownScript_0x194e69:
|
||||
iftrue UnknownScript_0x194e94
|
||||
writetext UnknownText_0x195196
|
||||
keeptextopen
|
||||
giveitem TM_24, $1
|
||||
giveitem TM_DRAGONBREATH, $1
|
||||
iffalse UnknownScript_0x194e8e
|
||||
itemtotext TM_24, $0
|
||||
itemtotext TM_DRAGONBREATH, $0
|
||||
writetext UnknownText_0x1951bf
|
||||
playsound SFX_ITEM
|
||||
waitbutton
|
||||
|
||||
@ -120,7 +120,7 @@ UnknownScript_0x18622a: ; 0x18622a
|
||||
; 0x186231
|
||||
|
||||
ItemFragment_0x186231: ; 0x186231
|
||||
db TM_20, 1
|
||||
db TM_ENDURE, 1
|
||||
; 0x186233
|
||||
|
||||
BurnedTowerB1FBoulder:
|
||||
|
||||
@ -36,10 +36,10 @@ UnknownScript_0x726fd: ; 0x726fd
|
||||
UnknownScript_0x72714: ; 0x72714
|
||||
checkcoins 1500
|
||||
if_equal $2, UnknownScript_0x72778
|
||||
itemtotext TM_32, $0
|
||||
itemtotext TM_DOUBLE_TEAM, $0
|
||||
scall UnknownScript_0x72768
|
||||
iffalse UnknownScript_0x72784
|
||||
giveitem TM_32, $1
|
||||
giveitem TM_DOUBLE_TEAM, $1
|
||||
iffalse UnknownScript_0x7277e
|
||||
takecoins 1500
|
||||
jump UnknownScript_0x7276d
|
||||
@ -48,10 +48,10 @@ UnknownScript_0x72714: ; 0x72714
|
||||
UnknownScript_0x72730: ; 0x72730
|
||||
checkcoins 3500
|
||||
if_equal $2, UnknownScript_0x72778
|
||||
itemtotext TM_29, $0
|
||||
itemtotext TM_PSYCHIC, $0
|
||||
scall UnknownScript_0x72768
|
||||
iffalse UnknownScript_0x72784
|
||||
giveitem TM_29, $1
|
||||
giveitem TM_PSYCHIC, $1
|
||||
iffalse UnknownScript_0x7277e
|
||||
takecoins 3500
|
||||
jump UnknownScript_0x7276d
|
||||
@ -60,10 +60,10 @@ UnknownScript_0x72730: ; 0x72730
|
||||
UnknownScript_0x7274c: ; 0x7274c
|
||||
checkcoins 7500
|
||||
if_equal $2, UnknownScript_0x72778
|
||||
itemtotext TM_15, $0
|
||||
itemtotext TM_HYPER_BEAM, $0
|
||||
scall UnknownScript_0x72768
|
||||
iffalse UnknownScript_0x72784
|
||||
giveitem TM_15, $1
|
||||
giveitem TM_HYPER_BEAM, $1
|
||||
iffalse UnknownScript_0x7277e
|
||||
takecoins 7500
|
||||
jump UnknownScript_0x7276d
|
||||
|
||||
@ -33,7 +33,7 @@ UnknownScript_0x72a9b: ; 0x72a9b
|
||||
iftrue UnknownScript_0x72aae
|
||||
writetext UnknownText_0x72cb0
|
||||
keeptextopen
|
||||
verbosegiveitem TM_19, 1
|
||||
verbosegiveitem TM_GIGA_DRAIN, 1
|
||||
iffalse UnknownScript_0x72aae
|
||||
setevent EVENT_GOT_TM19_GIGA_DRAIN
|
||||
UnknownScript_0x72aae: ; 0x72aae
|
||||
|
||||
@ -24,7 +24,7 @@ PharmacistScript_0x71afd: ; 0x71afd
|
||||
UnknownScript_0x71b14: ; 0x71b14
|
||||
writetext UnknownText_0x71ba3
|
||||
keeptextopen
|
||||
verbosegiveitem TM_03, 1
|
||||
verbosegiveitem TM_CURSE, 1
|
||||
iffalse UnknownScript_0x71b25
|
||||
setevent EVENT_GOT_TM03_CURSE
|
||||
UnknownScript_0x71b21: ; 0x71b21
|
||||
|
||||
@ -89,7 +89,7 @@ PokefanFScript_0x1a0084:
|
||||
UnknownScript_0x1a009c:
|
||||
writetext UnknownText_0x1a01e3
|
||||
keeptextopen
|
||||
verbosegiveitem HM_02, 1
|
||||
verbosegiveitem HM_FLY, 1
|
||||
iffalse UnknownScript_0x1a00b1
|
||||
setevent EVENT_GOT_HM02_FLY
|
||||
writetext UnknownText_0x1a021d
|
||||
|
||||
@ -50,7 +50,7 @@ UnknownScript_0x9d656: ; 0x9d656
|
||||
setevent EVENT_BEAT_BLACKBELT_LUNG
|
||||
writetext UnknownText_0x9d84d
|
||||
keeptextopen
|
||||
verbosegiveitem TM_01, 1
|
||||
verbosegiveitem TM_DYNAMICPUNCH, 1
|
||||
iffalse UnknownScript_0x9d67f
|
||||
setevent EVENT_GOT_TM01_DYNAMICPUNCH
|
||||
writetext UnknownText_0x9d8da
|
||||
|
||||
@ -190,7 +190,7 @@ UnknownScript_0x994ff: ; 0x994ff
|
||||
UnknownScript_0x99505: ; 0x99505
|
||||
writetext UnknownText_0x9991a
|
||||
keeptextopen
|
||||
verbosegiveitem HM_03, 1
|
||||
verbosegiveitem HM_SURF, 1
|
||||
setevent EVENT_GOT_HM03_SURF
|
||||
writetext UnknownText_0x9999b
|
||||
closetext
|
||||
|
||||
@ -29,7 +29,7 @@ ItemFragment_0x18c73b: ; 0x18c73b
|
||||
; 0x18c73d
|
||||
|
||||
ItemFragment_0x18c73d: ; 0x18c73d
|
||||
db TM_13, 1
|
||||
db TM_SNORE, 1
|
||||
; 0x18c73f
|
||||
|
||||
UnknownText_0x18c73f: ; 0x18c73f
|
||||
|
||||
@ -55,9 +55,9 @@ UnknownScript_0x18c8b8: ; 0x18c8b8
|
||||
loadfont
|
||||
writetext UnknownText_0x18c9bf
|
||||
keeptextopen
|
||||
giveitem TM_24, $1
|
||||
giveitem TM_DRAGONBREATH, $1
|
||||
iffalse UnknownScript_0x18c8f4
|
||||
itemtotext TM_24, $0
|
||||
itemtotext TM_DRAGONBREATH, $0
|
||||
writetext UnknownText_0x18c9fb
|
||||
playsound SFX_ITEM
|
||||
waitbutton
|
||||
|
||||
@ -51,7 +51,7 @@ UnknownScript_0x99d8c: ; 0x99d8c
|
||||
setevent EVENT_BEAT_MEDIUM_GRACE
|
||||
writetext UnknownText_0x9a059
|
||||
keeptextopen
|
||||
verbosegiveitem TM_30, 1
|
||||
verbosegiveitem TM_SHADOW_BALL, 1
|
||||
iffalse UnknownScript_0x99db5
|
||||
setevent EVENT_GOT_TM30_SHADOW_BALL
|
||||
writetext UnknownText_0x9a0ec
|
||||
|
||||
@ -45,7 +45,7 @@ UnknownScript_0x195e02: ; 0x195e02
|
||||
iftrue UnknownScript_0x195e15
|
||||
writetext UnknownText_0x196002
|
||||
keeptextopen
|
||||
verbosegiveitem TM_06, 1
|
||||
verbosegiveitem TM_TOXIC, 1
|
||||
iffalse UnknownScript_0x195e15
|
||||
setevent EVENT_GOT_TM06_TOXIC
|
||||
UnknownScript_0x195e15: ; 0x195e15
|
||||
|
||||
@ -70,7 +70,7 @@ ReceptionistScript_0x560ce:
|
||||
UnknownScript_0x560ee:
|
||||
writetext UnknownText_0x5615a
|
||||
keeptextopen
|
||||
verbosegiveitem TM_27, 1
|
||||
verbosegiveitem TM_RETURN, 1
|
||||
iffalse UnknownScript_0x56116
|
||||
setflag $005b
|
||||
loadmovesprites
|
||||
@ -85,7 +85,7 @@ UnknownScript_0x560fd:
|
||||
UnknownScript_0x56103:
|
||||
writetext UnknownText_0x561d8
|
||||
keeptextopen
|
||||
verbosegiveitem TM_21, 1
|
||||
verbosegiveitem TM_FRUSTRATION, 1
|
||||
iffalse UnknownScript_0x56116
|
||||
setflag $005b
|
||||
loadmovesprites
|
||||
|
||||
@ -67,10 +67,10 @@ UnknownScript_0x56c36: ; 056c36
|
||||
UnknownScript_0x56c4d: ; 0x56c4d
|
||||
checkcoins 5500
|
||||
if_equal $2, UnknownScript_0x56cb1
|
||||
itemtotext TM_25, $0
|
||||
itemtotext TM_THUNDER, $0
|
||||
scall UnknownScript_0x56ca1
|
||||
iffalse UnknownScript_0x56cbd
|
||||
giveitem TM_25, $1
|
||||
giveitem TM_THUNDER, $1
|
||||
iffalse UnknownScript_0x56cb7
|
||||
takecoins 5500
|
||||
jump UnknownScript_0x56ca6
|
||||
@ -79,10 +79,10 @@ UnknownScript_0x56c4d: ; 0x56c4d
|
||||
UnknownScript_0x56c69: ; 0x56c69
|
||||
checkcoins 5500
|
||||
if_equal $2, UnknownScript_0x56cb1
|
||||
itemtotext TM_14, $0
|
||||
itemtotext TM_BLIZZARD, $0
|
||||
scall UnknownScript_0x56ca1
|
||||
iffalse UnknownScript_0x56cbd
|
||||
giveitem TM_14, $1
|
||||
giveitem TM_BLIZZARD, $1
|
||||
iffalse UnknownScript_0x56cb7
|
||||
takecoins 5500
|
||||
jump UnknownScript_0x56ca6
|
||||
@ -91,10 +91,10 @@ UnknownScript_0x56c69: ; 0x56c69
|
||||
UnknownScript_0x56c85: ; 0x56c85
|
||||
checkcoins 5500
|
||||
if_equal $2, UnknownScript_0x56cb1
|
||||
itemtotext TM_38, $0
|
||||
itemtotext TM_FIRE_BLAST, $0
|
||||
scall UnknownScript_0x56ca1
|
||||
iffalse UnknownScript_0x56cbd
|
||||
giveitem TM_38, $1
|
||||
giveitem TM_FIRE_BLAST, $1
|
||||
iffalse UnknownScript_0x56cb7
|
||||
takecoins 5500
|
||||
jump UnknownScript_0x56ca6
|
||||
|
||||
@ -64,7 +64,7 @@ UnknownScript_0x54044: ; 0x54044
|
||||
UnknownScript_0x54064: ; 0x54064
|
||||
writetext UnknownText_0x5428b
|
||||
keeptextopen
|
||||
verbosegiveitem TM_45, 1
|
||||
verbosegiveitem TM_ATTRACT, 1
|
||||
iffalse UnknownScript_0x5407b
|
||||
setevent EVENT_GOT_TM45_ATTRACT
|
||||
writetext UnknownText_0x54302
|
||||
|
||||
@ -7,7 +7,7 @@ IcePath1F_MapScriptHeader: ; 0x7e470
|
||||
; 0x7e472
|
||||
|
||||
ItemFragment_0x7e472: ; 0x7e472
|
||||
db HM_07, 1
|
||||
db HM_WATERFALL, 1
|
||||
; 0x7e474
|
||||
|
||||
ItemFragment_0x7e474: ; 0x7e474
|
||||
|
||||
@ -7,7 +7,7 @@ IcePathB2FBlackthornSide_MapScriptHeader: ; 0x7e644
|
||||
; 0x7e646
|
||||
|
||||
ItemFragment_0x7e646: ; 0x7e646
|
||||
db TM_44, 1
|
||||
db TM_REST, 1
|
||||
; 0x7e648
|
||||
|
||||
MapIcePathB2FBlackthornSideSignpostItem0: ; 0x7e648
|
||||
|
||||
@ -377,7 +377,7 @@ BlackBeltScript_0x6edae: ; 0x6edae
|
||||
iftrue UnknownScript_0x6edd8
|
||||
writetext UnknownText_0x6f099
|
||||
keeptextopen
|
||||
verbosegiveitem HM_01, 1
|
||||
verbosegiveitem HM_CUT, 1
|
||||
setevent EVENT_GOT_HM01_CUT
|
||||
writetext UnknownText_0x6f141
|
||||
closetext
|
||||
@ -405,7 +405,7 @@ RockerScript_0x6edde: ; 0x6edde
|
||||
iftrue UnknownScript_0x6edf3
|
||||
writetext UnknownText_0x6f21b
|
||||
keeptextopen
|
||||
verbosegiveitem TM_02, 1
|
||||
verbosegiveitem TM_HEADBUTT, 1
|
||||
iffalse UnknownScript_0x6edf7
|
||||
setevent EVENT_GOT_TM02_HEADBUTT
|
||||
UnknownScript_0x6edf3: ; 0x6edf3
|
||||
|
||||
@ -284,7 +284,7 @@ ItemFragment_0x70148:
|
||||
db ELIXER, 1
|
||||
|
||||
ItemFragment_0x7014a:
|
||||
db TM_43, 1
|
||||
db TM_DETECT, 1
|
||||
|
||||
MapLakeofRageSignpostItem2:
|
||||
dw $00b5
|
||||
|
||||
@ -12,7 +12,7 @@ HiddenPowerGuy:
|
||||
iftrue .AlreadyGotItem
|
||||
writetext HiddenPowerGuyText1
|
||||
keeptextopen
|
||||
verbosegiveitem TM_10, 1
|
||||
verbosegiveitem TM_HIDDEN_POWER, 1
|
||||
iffalse .Done
|
||||
setevent EVENT_GOT_TM10_HIDDEN_POWER
|
||||
writetext HiddenPowerGuyText2
|
||||
|
||||
@ -36,7 +36,7 @@ UnknownScript_0x199ac8: ; 0x199ac8
|
||||
setevent EVENT_BEAT_BOARDER_DOUGLAS
|
||||
writetext UnknownText_0x199d55
|
||||
keeptextopen
|
||||
verbosegiveitem TM_16, 1
|
||||
verbosegiveitem TM_ICY_WIND, 1
|
||||
iffalse UnknownScript_0x199af4
|
||||
setevent EVENT_GOT_TM16_ICY_WIND
|
||||
writetext UnknownText_0x199def
|
||||
|
||||
@ -44,7 +44,7 @@ ItemFragment_0x7e0e0: ; 0x7e0e0
|
||||
; 0x7e0e2
|
||||
|
||||
ItemFragment_0x7e0e2: ; 0x7e0e2
|
||||
db TM_40, 1
|
||||
db TM_DEFENSE_CURL, 1
|
||||
; 0x7e0e4
|
||||
|
||||
ItemFragment_0x7e0e4: ; 0x7e0e4
|
||||
|
||||
@ -12,7 +12,7 @@ MrPsychic:
|
||||
iftrue .AlreadyGotItem
|
||||
writetext MrPsychicText1
|
||||
keeptextopen
|
||||
verbosegiveitem TM_29, 1
|
||||
verbosegiveitem TM_PSYCHIC, 1
|
||||
iffalse .Done
|
||||
setevent EVENT_GOT_TM29_PSYCHIC
|
||||
.AlreadyGotItem
|
||||
|
||||
@ -396,7 +396,7 @@ ItemFragment_0x5c1cc: ; 0x5c1cc
|
||||
; 0x5c1ce
|
||||
|
||||
ItemFragment_0x5c1ce: ; 0x5c1ce
|
||||
db TM_28, 1
|
||||
db TM_DIG, 1
|
||||
; 0x5c1d0
|
||||
|
||||
MapNationalParkSignpostItem2: ; 0x5c1d0
|
||||
|
||||
@ -113,7 +113,7 @@ ItemFragment_0x5c945: ; 0x5c945
|
||||
; 0x5c947
|
||||
|
||||
ItemFragment_0x5c947: ; 0x5c947
|
||||
db TM_28, 1
|
||||
db TM_DIG, 1
|
||||
; 0x5c949
|
||||
|
||||
MapNationalParkBugContestSignpostItem2: ; 0x5c949
|
||||
|
||||
@ -13,7 +13,7 @@ SailorScript_0x9c8c1: ; 0x9c8c1
|
||||
iftrue UnknownScript_0x9c8d3
|
||||
writetext UnknownText_0x9c8df
|
||||
keeptextopen
|
||||
verbosegiveitem HM_04, 1
|
||||
verbosegiveitem HM_STRENGTH, 1
|
||||
setevent EVENT_GOT_HM04_STRENGTH
|
||||
UnknownScript_0x9c8d3: ; 0x9c8d3
|
||||
writetext UnknownText_0x9c965
|
||||
|
||||
@ -31,7 +31,7 @@ UnknownScript_0x9c159: ; 0x9c159
|
||||
iftrue UnknownScript_0x9c172
|
||||
writetext UnknownText_0x9c354
|
||||
keeptextopen
|
||||
verbosegiveitem TM_23, 1
|
||||
verbosegiveitem TM_IRON_TAIL, 1
|
||||
iffalse UnknownScript_0x9c176
|
||||
setevent EVENT_GOT_TM23_IRON_TAIL
|
||||
writetext UnknownText_0x9c3a5
|
||||
|
||||
@ -73,7 +73,7 @@ ItemFragment_0x609ac: ; 0x609ac
|
||||
; 0x609ae
|
||||
|
||||
ItemFragment_0x609ae: ; 0x609ae
|
||||
db TM_34, 1
|
||||
db TM_SWAGGER, 1
|
||||
; 0x609b0
|
||||
|
||||
MapOlivineLighthouse5FSignpostItem0: ; 0x609b0
|
||||
|
||||
@ -183,7 +183,7 @@ UnknownScript_0x188eac: ; 0x188eac
|
||||
iftrue UnknownScript_0x188ec5
|
||||
writetext UnknownText_0x1893c4
|
||||
keeptextopen
|
||||
verbosegiveitem TM_07, 1
|
||||
verbosegiveitem TM_ZAP_CANNON, 1
|
||||
iffalse UnknownScript_0x188ec3
|
||||
setevent EVENT_GOT_TM07_ZAP_CANNON
|
||||
writetext UnknownText_0x1893f4
|
||||
|
||||
@ -69,7 +69,7 @@ UnknownScript_0x5e584: ; 0x5e584
|
||||
UnknownScript_0x5e58a: ; 0x5e58a
|
||||
writetext UnknownText_0x5e7e2
|
||||
keeptextopen
|
||||
verbosegiveitem TM_11, 1
|
||||
verbosegiveitem TM_SUNNY_DAY, 1
|
||||
iffalse UnknownScript_0x5e5a1
|
||||
writetext UnknownText_0x5e821
|
||||
closetext
|
||||
|
||||
@ -11,7 +11,7 @@ ItemFragment_0x743b5: ; 0x743b5
|
||||
; 0x743b7
|
||||
|
||||
ItemFragment_0x743b7: ; 0x743b7
|
||||
db TM_47, 1
|
||||
db TM_STEEL_WING, 1
|
||||
; 0x743b9
|
||||
|
||||
MapRockTunnel1FSignpostItem0: ; 0x743b9
|
||||
|
||||
@ -434,7 +434,7 @@ MapRoute27Signpost0Script: ; 0x1a0a5f
|
||||
; 0x1a0a62
|
||||
|
||||
ItemFragment_0x1a0a62: ; 0x1a0a62
|
||||
db TM_22, 1
|
||||
db TM_SOLARBEAM, 1
|
||||
; 0x1a0a64
|
||||
|
||||
ItemFragment_0x1a0a64: ; 0x1a0a64
|
||||
|
||||
@ -19,7 +19,7 @@ SandstormHouseWoman:
|
||||
.Loyal
|
||||
writetext SandstormHouseWomanLoyalText
|
||||
keeptextopen
|
||||
verbosegiveitem TM_37, 1
|
||||
verbosegiveitem TM_SANDSTORM, 1
|
||||
iffalse .Done
|
||||
setevent EVENT_GOT_TM37_SANDSTORM
|
||||
.AlreadyGotItem
|
||||
|
||||
@ -18,7 +18,7 @@ Celebrity:
|
||||
iftrue .AlreadyGotItem
|
||||
writetext CelebrityText1
|
||||
keeptextopen
|
||||
verbosegiveitem TM_47, 1
|
||||
verbosegiveitem TM_STEEL_WING, 1
|
||||
iffalse .Done
|
||||
setevent EVENT_GOT_TM47_STEEL_WING
|
||||
.Done
|
||||
|
||||
@ -247,7 +247,7 @@ UnknownScript_0x1a5584: ; 0x1a5584
|
||||
writetext UnknownText_0x1a57ba
|
||||
keeptextopen
|
||||
setevent EVENT_GAVE_KENYA
|
||||
verbosegiveitem TM_50, 1
|
||||
verbosegiveitem TM_NIGHTMARE, 1
|
||||
iffalse UnknownScript_0x1a55b3
|
||||
setevent EVENT_GOT_TM50_NIGHTMARE
|
||||
UnknownScript_0x1a55af: ; 0x1a55af
|
||||
|
||||
@ -98,7 +98,7 @@ FisherScript_0x1904ce:
|
||||
iftrue UnknownScript_0x1904e3
|
||||
writetext UnknownText_0x191133
|
||||
keeptextopen
|
||||
verbosegiveitem TM_05, 1
|
||||
verbosegiveitem TM_ROAR, 1
|
||||
iffalse UnknownScript_0x1904e7
|
||||
setevent EVENT_GOT_TM05_ROAR
|
||||
UnknownScript_0x1904e3:
|
||||
|
||||
@ -52,7 +52,7 @@ TeacherScript_0x62d63: ; 0x62d63
|
||||
iftrue UnknownScript_0x62d7e
|
||||
writetext UnknownText_0x62d9d
|
||||
keeptextopen
|
||||
verbosegiveitem TM_12, 1
|
||||
verbosegiveitem TM_SWEET_SCENT, 1
|
||||
iffalse UnknownScript_0x62d82
|
||||
setevent EVENT_GOT_TM12_SWEET_SCENT
|
||||
UnknownScript_0x62d7e: ; 0x62d7e
|
||||
|
||||
@ -422,7 +422,7 @@ MapRoute35Signpost1Script: ; 0x19ca79
|
||||
; 0x19ca7c
|
||||
|
||||
ItemFragment_0x19ca7c: ; 0x19ca7c
|
||||
db TM_04, 1
|
||||
db TM_ROLLOUT, 1
|
||||
; 0x19ca7e
|
||||
|
||||
FruitTreeScript_0x19ca7e: ; 0x19ca7e
|
||||
|
||||
@ -147,7 +147,7 @@ FisherScript_0x1940b9: ; 0x1940b9
|
||||
UnknownScript_0x1940cd: ; 0x1940cd
|
||||
writetext UnknownText_0x1944d0
|
||||
keeptextopen
|
||||
verbosegiveitem TM_08, 1
|
||||
verbosegiveitem TM_ROCK_SMASH, 1
|
||||
iffalse UnknownScript_0x1940de
|
||||
setevent EVENT_GOT_TM08_ROCK_SMASH
|
||||
UnknownScript_0x1940da: ; 0x1940da
|
||||
|
||||
@ -84,7 +84,7 @@ PokefanFScript_0x9cf0e: ; 0x9cf0e
|
||||
UnknownScript_0x9cf22: ; 0x9cf22
|
||||
writetext UnknownText_0x9d156
|
||||
keeptextopen
|
||||
verbosegiveitem TM_13, 1
|
||||
verbosegiveitem TM_SNORE, 1
|
||||
iffalse UnknownScript_0x9cf33
|
||||
setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
|
||||
UnknownScript_0x9cf2f: ; 0x9cf2f
|
||||
|
||||
@ -128,7 +128,7 @@ OfficerScript_0x19ac85: ; 0x19ac85
|
||||
iftrue UnknownScript_0x19ac9c
|
||||
writetext UnknownText_0x19ad9b
|
||||
keeptextopen
|
||||
verbosegiveitem TM_36, 1
|
||||
verbosegiveitem TM_SLUDGE_BOMB, 1
|
||||
iffalse UnknownScript_0x19aca0
|
||||
setevent EVENT_GOT_TM36_SLUDGE_BOMB
|
||||
loadmovesprites
|
||||
|
||||
@ -29,7 +29,7 @@ UnknownScript_0x5ad22: ; 0x5ad22
|
||||
; 0x5ad28
|
||||
|
||||
ItemFragment_0x5ad28: ; 0x5ad28
|
||||
db TM_18, 1
|
||||
db TM_RAIN_DANCE, 1
|
||||
; 0x5ad2a
|
||||
|
||||
UnknownText_0x5ad2a: ; 0x5ad2a
|
||||
|
||||
@ -75,7 +75,7 @@ SageLiScript: ; 0x1849a6
|
||||
loadfont
|
||||
writetext UnknownText_0x184cc2
|
||||
keeptextopen
|
||||
verbosegiveitem HM_05, 1
|
||||
verbosegiveitem HM_FLASH, 1
|
||||
setevent EVENT_GOT_HM05_FLASH
|
||||
setevent EVENT_BEAT_SAGE_LI
|
||||
writetext UnknownText_0x184d13
|
||||
|
||||
@ -348,7 +348,7 @@ UnknownScript_0x6d184: ; 0x6d184
|
||||
loadfont
|
||||
writetext UnknownText_0x6d809
|
||||
keeptextopen
|
||||
verbosegiveitem HM_06, 1
|
||||
verbosegiveitem HM_WHIRLPOOL, 1
|
||||
setevent EVENT_GOT_HM06_WHIRLPOOL
|
||||
writetext UnknownText_0x6d8f8
|
||||
closetext
|
||||
@ -422,7 +422,7 @@ UnknownScript_0x6d207: ; 0x6d207
|
||||
; 0x6d20d
|
||||
|
||||
ItemFragment_0x6d20d: ; 0x6d20d
|
||||
db TM_46, 1
|
||||
db TM_THIEF, 1
|
||||
; 0x6d20f
|
||||
|
||||
MapTeamRocketBaseB2FSignpostItem22: ; 0x6d20f
|
||||
|
||||
@ -144,7 +144,7 @@ ItemFragment_0x7d9e4: ; 0x7d9e4
|
||||
; 0x7d9e6
|
||||
|
||||
ItemFragment_0x7d9e6: ; 0x7d9e6
|
||||
db TM_35, 1
|
||||
db TM_SLEEP_TALK, 1
|
||||
; 0x7d9e8
|
||||
|
||||
ItemFragment_0x7d9e8: ; 0x7d9e8
|
||||
|
||||
@ -123,7 +123,7 @@ HikerLeonardScript: ; 0x5a00e
|
||||
; 0x5a016
|
||||
|
||||
ItemFragment_0x5a016: ; 0x5a016
|
||||
db TM_39, 1
|
||||
db TM_SWIFT, 1
|
||||
; 0x5a018
|
||||
|
||||
ItemFragment_0x5a018: ; 0x5a018
|
||||
|
||||
@ -100,7 +100,7 @@ UnknownScript_0x7451f: ; 0x7451f
|
||||
; 0x74529
|
||||
|
||||
ItemFragment_0x74529: ; 0x74529
|
||||
db TM_26, 1
|
||||
db TM_EARTHQUAKE, 1
|
||||
; 0x7452b
|
||||
|
||||
ItemFragment_0x7452b: ; 0x7452b
|
||||
|
||||
@ -35,7 +35,7 @@ UnknownScript_0x683ec: ; 0x683ec
|
||||
specialphonecall $3
|
||||
writetext UnknownText_0x685c8
|
||||
keeptextopen
|
||||
verbosegiveitem TM_31, 1
|
||||
verbosegiveitem TM_MUD_SLAP, 1
|
||||
iffalse UnknownScript_0x68416
|
||||
setevent EVENT_GOT_TM31_MUD_SLAP
|
||||
writetext UnknownText_0x68648
|
||||
|
||||
@ -52,7 +52,7 @@ FisherScript_0x1a9a75:
|
||||
iftrue UnknownScript_0x1a9a8a
|
||||
writetext UnknownText_0x1a9cc4
|
||||
keeptextopen
|
||||
verbosegiveitem TM_42, 1
|
||||
verbosegiveitem TM_DREAM_EATER, 1
|
||||
iffalse UnknownScript_0x1a9a8e
|
||||
setevent EVENT_GOT_TM42_DREAM_EATER
|
||||
UnknownScript_0x1a9a8a:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user