Use more constants in scripts

This commit is contained in:
Remy Oukaour 2018-01-12 01:40:20 -05:00
parent b23085f526
commit d83aefb30a
120 changed files with 828 additions and 732 deletions

View File

@ -290,7 +290,8 @@ NUM_HMS = const_value - HM01
add_mt ICE_BEAM
NUM_TM_HM_TUTOR = __enum__ +- 1
ITEM_FROM_MEM EQU $ff
USE_SCRIPT_VAR EQU $00
ITEM_FROM_MEM EQU $ff
; leftovers from red
SAFARI_BALL EQU $08 ; MOON_STONE

View File

@ -3,6 +3,40 @@ PLAYER EQU 0
LAST_TALKED EQU -2
; memory constants
const_def
const MEM_BUFFER_0 ; use StringBuffer3
const MEM_BUFFER_1 ; use StringBuffer4
const MEM_BUFFER_2 ; use StringBuffer5
NUM_MEM_BUFFERS EQU const_value
; checkmoney/takemoney accounts
const_def
const YOUR_MONEY ; 0
const MOMS_MONEY ; 1
; checkmoney/checkcoins return values
const_def
const HAVE_MORE ; 0
const HAVE_AMOUNT ; 1
const HAVE_LESS ; 2
; checkpokeitem return values
const_def
const POKEMAIL_WRONG_MAIL ; 0
const POKEMAIL_CORRECT ; 1
const POKEMAIL_REFUSED ; 2
const POKEMAIL_NO_MAIL ; 3
const POKEMAIL_LAST_MON ; 4
; askforphonenumber return values
const_def
const PHONE_CONTACT_GOT ; 0
const PHONE_CONTACTS_FULL ; 1
const PHONE_CONTACT_REFUSED ; 2
; GetVarAction arguments (see engine/variables.asm)
const_def
const VAR_STRINGBUFFER2 ; 00
@ -80,6 +114,7 @@ NUM_PLAYER_EVENTS EQU const_value
const OBJECTTYPE_6
; showemote arguments
; Emotes indexes (see data/sprites/emotes.asm)
const_def
const EMOTE_SHOCK ; 0
@ -97,8 +132,8 @@ NUM_PLAYER_EVENTS EQU const_value
EMOTE_MEM EQU -1
; fruittree arguments
; FruitTreeItems indexes (see data/items/fruit_trees.asm)
; used by fruittree command
const_value set 1
const FRUITTREE_ROUTE_29 ; 01
const FRUITTREE_ROUTE_30_1 ; 02
@ -133,8 +168,18 @@ const_value set 1
NUM_FRUIT_TREES EQU const_value +- 1
; describedecoration arguments
; DescribeDecoration.JumpTable indexes (see engine/decorations.asm)
const_def
const DECODESC_POSTER ; 0
const DECODESC_LEFT_DOLL ; 1
const DECODESC_RIGHT_DOLL ; 2
const DECODESC_BIG_DOLL ; 3
const DECODESC_CONSOLE ; 4
; elevfloor macro values
; ElevatorFloorNames indexes (see data/elevator_floors.asm)
; used by elevfloor macro
const_def
const FLOOR_B4F
const FLOOR_B3F
@ -167,6 +212,40 @@ CMDQUEUE_CAPACITY EQU 4
CMDQUEUE_STONETABLE EQU 2
; SpecialGameboyCheck return values
const_def
const GBCHECK_GB ; 0
const GBCHECK_SGB ; 1
const GBCHECK_CGB ; 2
; Special_CheckMagikarpLength return values
const_def
const MAGIKARPLENGTH_NOT_MAGIKARP ; 0
const MAGIKARPLENGTH_REFUSED ; 1
const MAGIKARPLENGTH_TOO_SHORT ; 2
const MAGIKARPLENGTH_BEAT_RECORD ; 3
; SpecialReturnShuckle return values
const_def
const SHUCKIE_WRONG_MON ; 0
const SHUCKIE_REFUSED ; 1
const SHUCKIE_RETURNED ; 2
const SHUCKIE_HAPPY ; 3
const SHUCKIE_FAINTED ; 4
; CheckPartyFullAfterContest return values
const_def
const BUGCONTEST_CAUGHT_MON ; 0
const BUGCONTEST_BOXED_MON ; 1
const BUGCONTEST_NO_CATCH ; 2
; used by HealMachineAnim
; HealMachineAnim.Pointers indexes (see engine/events/heal_machine_anim.asm)
const_def
const HEALMACHINE_POKECENTER ; 0
const HEALMACHINE_ELMS_LAB ; 1
const HEALMACHINE_HALL_OF_FAME ; 2
; used by Special_UnownPuzzle
; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/unown_puzzle.asm)
const_def
@ -183,3 +262,9 @@ NUM_UNOWN_PUZZLES EQU const_value
const UNOWNWORDS_LIGHT ; 1
const UNOWNWORDS_WATER ; 2
const UNOWNWORDS_HO_OH ; 3
; used by Special_MoveTutor
const_value set 1
const MOVETUTOR_FLAMETHROWER ; 1
const MOVETUTOR_THUNDERBOLT ; 2
const MOVETUTOR_ICE_BEAM ; 3

View File

@ -133,7 +133,7 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s
## `$3E`: `readcoins` *memory*
## `$3F`: `RAM2MEM` *memory*
## `$3F`: `vartomem` *memory*
## `$40`: `pokenamemem` *mon_id*, *memory*
@ -151,7 +151,7 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s
## `$47`: `opentext`
## `$48`: `refreshscreen` *dummy*
## `$48`: `refreshscreen` [*dummy*=0]
## `$49`: `closetext`

View File

@ -81,7 +81,7 @@ CheckPartyFullAfterContest: ; 4d9e5
ld [hl], a
xor a
ld [wContestMon], a
and a
and a ; BUGCONTEST_CAUGHT_MON
ld [ScriptVar], a
ret
@ -142,12 +142,12 @@ CheckPartyFullAfterContest: ; 4d9e5
call CloseSRAM
xor a
ld [wContestMon], a
ld a, $1
ld a, BUGCONTEST_BOXED_MON
ld [ScriptVar], a
ret
.DidntCatchAnything: ; 4db35
ld a, $2
ld a, BUGCONTEST_NO_CATCH
ld [ScriptVar], a
ret

View File

@ -1061,12 +1061,13 @@ INCLUDE "data/decorations/decorations.asm"
DescribeDecoration:: ; 26f59
ld a, b
ld hl, JumpTable_DecorationDesc
ld hl, .JumpTable
rst JumpTable
ret
; 26f5f
JumpTable_DecorationDesc: ; 26f5f
.JumpTable: ; 26f5f
; entries correspond to DECODESC_* constants
dw DecorationDesc_Poster
dw DecorationDesc_LeftOrnament
dw DecorationDesc_RightOrnament

View File

@ -465,14 +465,14 @@ Special_DayCareManOutside: ; 16936
.Load0:
call PrintText
xor a
xor a ; FALSE
ld [ScriptVar], a
ret
.PartyFull:
ld hl, .PartyFullText
call PrintText
ld a, $1
ld a, TRUE
ld [ScriptVar], a
ret
; 16993

View File

@ -2,7 +2,7 @@ FruitTreeScript:: ; 44000
callasm GetCurTreeFruit
opentext
copybytetovar CurFruit
itemtotext $0, $0
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
writetext FruitBearingTreeText
buttonsound
callasm TryResetFruitTrees

View File

@ -21,7 +21,7 @@ CheckFirstMonIsEgg: ; 71ac
ld a, [PartySpecies]
ld [wd265], a
cp EGG
ld a, $1
ld a, 1
jr z, .egg
xor a

View File

@ -47,6 +47,7 @@ HealMachineAnim: ; 12324
; 12365
.Pointers: ; 12365
; entries correspond to HEALMACHINE_* constants
dw .Pokecenter
dw .ElmLab
dw .HallOfFame

View File

@ -76,7 +76,7 @@ Kurt_SelectApricorn: ; 88055
jr nz, .done
.nope
xor a
xor a ; FALSE
.done
ld c, a

View File

@ -52,22 +52,22 @@ Special_CheckMagikarpLength: ; fbb32
ld hl, PartyMonOT
call SkipNames
call CopyBytes
ld a, 3
ld a, MAGIKARPLENGTH_BEAT_RECORD
ld [ScriptVar], a
ret
.not_long_enough
ld a, 2
ld a, MAGIKARPLENGTH_TOO_SHORT
ld [ScriptVar], a
ret
.declined
ld a, 1
ld a, MAGIKARPLENGTH_REFUSED
ld [ScriptVar], a
ret
.not_magikarp
xor a
xor a ; MAGIKARPLENGTH_NOT_MAGIKARP
ld [ScriptVar], a
ret
; fbba9

View File

@ -13,7 +13,7 @@ RepelWoreOffScript:: ; 0x13619
HiddenItemScript:: ; 0x13625
opentext
copybytetovar EngineBuffer3
itemtotext 0, 0
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
writetext .found_text
giveitem ITEM_FROM_MEM
iffalse .bag_full

View File

@ -22,7 +22,7 @@ Special_MoveTutor: ; 4925b
.enter_loop
call CheckCanLearnMoveTutorMove
jr nc, .loop
xor a
xor a ; FALSE
ld [ScriptVar], a
jr .quit
@ -35,10 +35,11 @@ Special_MoveTutor: ; 4925b
.GetMoveTutorMove: ; 492a5
ld a, [ScriptVar]
cp 1
cp MOVETUTOR_FLAMETHROWER
jr z, .flamethrower
cp 2
cp MOVETUTOR_THUNDERBOLT
jr z, .thunderbolt
; MOVETUTOR_ICE_BEAM
ld a, ICE_BEAM
ret

View File

@ -1,3 +1,5 @@
MANIA_OT_ID EQU 00518
SpecialGiveShuckle: ; 7305
; Adding to the party.
@ -32,9 +34,9 @@ SpecialGiveShuckle: ; 7305
; OT ID.
ld hl, PartyMon1ID
call AddNTimes
ld a, $2
ld a, HIGH(MANIA_OT_ID)
ld [hli], a
ld [hl], $6
ld [hl], LOW(MANIA_OT_ID)
; Nickname.
ld a, [PartyCount]
@ -54,8 +56,7 @@ SpecialGiveShuckle: ; 7305
; Engine flag for this event.
ld hl, wDailyFlags
set 5, [hl]
; setflag ENGINE_SHUCKLE_GIVEN
set 5, [hl] ; ENGINE_SHUCKLE_GIVEN
ld a, 1
ld [ScriptVar], a
ret
@ -85,10 +86,10 @@ SpecialReturnShuckle: ; 737e
; OT ID
ld a, [hli]
cp HIGH(00518)
cp HIGH(MANIA_OT_ID)
jr nz, .DontReturn
ld a, [hl]
cp LOW(00518)
cp LOW(MANIA_OT_ID)
jr nz, .DontReturn
; OT
@ -115,28 +116,28 @@ SpecialReturnShuckle: ; 737e
call AddNTimes
ld a, [hl]
cp 150
ld a, $3
ld a, SHUCKIE_HAPPY
jr nc, .HappyToStayWithYou
xor a ; take from pc
ld [wPokemonWithdrawDepositParameter], a
callfar RemoveMonFromPartyOrBox
ld a, $2
ld a, SHUCKIE_RETURNED
.HappyToStayWithYou:
ld [ScriptVar], a
ret
.refused
ld a, $1
ld a, SHUCKIE_REFUSED
ld [ScriptVar], a
ret
.DontReturn:
xor a
xor a ; SHUCKIE_WRONG_MON
ld [ScriptVar], a
ret
.fainted
ld a, $4
ld a, SHUCKIE_FAINTED
ld [ScriptVar], a
ret

View File

@ -113,7 +113,7 @@ PokecenterNurseScript:
pause 10
special HealParty
playmusic MUSIC_NONE
writebyte 0 ; Machine is at a Pokemon Center
writebyte HEALMACHINE_POKECENTER
special HealMachineAnim
pause 30
special RestartMapMusic
@ -251,25 +251,25 @@ DayToTextScript:
if_equal THURSDAY, .Thursday
if_equal FRIDAY, .Friday
if_equal SATURDAY, .Saturday
stringtotext .SundayText, 0
stringtotext .SundayText, MEM_BUFFER_0
end
.Monday:
stringtotext .MondayText, 0
stringtotext .MondayText, MEM_BUFFER_0
end
.Tuesday:
stringtotext .TuesdayText, 0
stringtotext .TuesdayText, MEM_BUFFER_0
end
.Wednesday:
stringtotext .WednesdayText, 0
stringtotext .WednesdayText, MEM_BUFFER_0
end
.Thursday:
stringtotext .ThursdayText, 0
stringtotext .ThursdayText, MEM_BUFFER_0
end
.Friday:
stringtotext .FridayText, 0
stringtotext .FridayText, MEM_BUFFER_0
end
.Saturday:
stringtotext .SaturdayText, 0
stringtotext .SaturdayText, MEM_BUFFER_0
end
.SundayText:
db "SUNDAY@"
@ -298,7 +298,7 @@ RadioTowerRocketsScript:
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall SPECIALCALL_WEIRDBROADCAST
setmapscene MAHOGANY_TOWN, $1
setmapscene MAHOGANY_TOWN, 1
end
BugContestResultsWarpScript:
@ -307,7 +307,7 @@ BugContestResultsWarpScript:
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
warp ROUTE_36_NATIONAL_PARK_GATE, $0, $4
warp ROUTE_36_NATIONAL_PARK_GATE, 0, 4
applymovement PLAYER, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript:
@ -321,7 +321,7 @@ BugContestResultsScript:
farwritetext ContestResults_ReadyToJudgeText
waitbutton
special BugContestJudging
RAM2MEM $0
vartomem MEM_BUFFER_0
if_equal 1, BugContestResults_FirstPlace
if_equal 2, BugContestResults_SecondPlace
if_equal 3, BugContestResults_ThirdPlace
@ -349,14 +349,15 @@ BugContestResults_FinishUp
special ContestReturnMons
BugContestResults_DidNotLeaveMons
special CheckPartyFullAfterContest
if_equal $0, BugContestResults_CleanUp
if_equal $2, BugContestResults_CleanUp
if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
; BUGCONTEST_BOXED_MON
farwritetext ContestResults_PartyFullText
waitbutton
BugContestResults_CleanUp
closetext
setscene $0
setmapscene ROUTE_35_NATIONAL_PARK_GATE, $0
setscene 0
setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A
@ -384,7 +385,7 @@ BugContestResults_CleanUp
BugContestResults_FirstPlace ; 0xbc31e
setevent EVENT_GAVE_KURT_APRICORNS
itemtotext SUN_STONE, $1
itemtotext SUN_STONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem SUN_STONE
@ -393,7 +394,7 @@ BugContestResults_FirstPlace ; 0xbc31e
; 0xbc332
BugContestResults_SecondPlace ; 0xbc332
itemtotext EVERSTONE, $1
itemtotext EVERSTONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem EVERSTONE
@ -402,7 +403,7 @@ BugContestResults_SecondPlace ; 0xbc332
; 0xbc343
BugContestResults_ThirdPlace ; 0xbc343
itemtotext GOLD_BERRY, $1
itemtotext GOLD_BERRY, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
verbosegiveitem GOLD_BERRY
@ -1759,7 +1760,7 @@ RematchGiftFScript:
end
GymStatue1Script:
mapnametotext $0
mapnametotext MEM_BUFFER_0
opentext
farwritetext GymStatue_CityGymText
waitbutton
@ -1767,7 +1768,7 @@ GymStatue1Script:
end
GymStatue2Script:
mapnametotext $0
mapnametotext MEM_BUFFER_0
opentext
farwritetext GymStatue_CityGymText
buttonsound
@ -1813,18 +1814,18 @@ CoinVendor_IntroScript: ; 0xbcde0
loadmenudata .MenuDataHeader
verticalmenu
closewindow
if_equal $1, .Buy50
if_equal $2, .Buy500
if_equal 1, .Buy50
if_equal 2, .Buy500
jump .Cancel
; 0xbcdf7
.Buy50: ; 0xbcdf7
checkcoins MAX_COINS - 50
if_equal $0, .CoinCaseFull
checkmoney $0, 1000
if_equal $2, .NotEnoughMoney
if_equal HAVE_MORE, .CoinCaseFull
checkmoney YOUR_MONEY, 1000
if_equal HAVE_LESS, .NotEnoughMoney
givecoins 50
takemoney $0, 1000
takemoney YOUR_MONEY, 1000
waitsfx
playsound SFX_TRANSACTION
farwritetext CoinVendor_Buy50CoinsText
@ -1834,11 +1835,11 @@ CoinVendor_IntroScript: ; 0xbcde0
.Buy500: ; 0xbce1b
checkcoins MAX_COINS - 500
if_equal $0, .CoinCaseFull
checkmoney $0, 10000
if_equal $2, .NotEnoughMoney
if_equal HAVE_MORE, .CoinCaseFull
checkmoney YOUR_MONEY, 10000
if_equal HAVE_LESS, .NotEnoughMoney
givecoins 500
takemoney $0, 10000
takemoney YOUR_MONEY, 10000
waitsfx
playsound SFX_TRANSACTION
farwritetext CoinVendor_Buy500CoinsText

View File

@ -4,7 +4,7 @@ Script_BattleWhiteout:: ; 0x124c1
; 0x124c8
Script_OverworldWhiteout:: ; 0x124c8
refreshscreen $0
refreshscreen
callasm OverworldBGMap
Script_Whiteout: ; 0x124ce

View File

@ -128,7 +128,7 @@ CheckPokeItem:: ; 44654
push bc
push de
farcall SelectMonFromParty
ld a, $2
ld a, POKEMAIL_REFUSED
jr c, .pop_return
ld a, [CurPartyMon]
@ -137,7 +137,7 @@ CheckPokeItem:: ; 44654
call AddNTimes
ld d, [hl]
farcall ItemIsMail
ld a, $3
ld a, POKEMAIL_NO_MAIL
jr nc, .pop_return
ld a, BANK(sPartyMail)
@ -162,7 +162,7 @@ CheckPokeItem:: ; 44654
cp "@"
jr z, .done
cp c
ld a, $0
ld a, POKEMAIL_WRONG_MAIL
jr nz, .close_sram_return
inc hl
inc de
@ -173,12 +173,12 @@ CheckPokeItem:: ; 44654
.done
farcall CheckCurPartyMonFainted
ld a, $4
ld a, POKEMAIL_LAST_MON
jr c, .close_sram_return
xor a
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
ld a, $1
ld a, POKEMAIL_CORRECT
.close_sram_return
call CloseSRAM

View File

@ -437,7 +437,7 @@ WrongNumber: ; 90233
; 90241
Script_ReceivePhoneCall: ; 0x90241
refreshscreen $0
refreshscreen
callasm RingTwice_StartCall
ptcall wPhoneScriptPointer
waitbutton

File diff suppressed because it is too large Load Diff

View File

@ -128,7 +128,7 @@ ScriptCommandTable:
dw Script_warp ; 3c
dw Script_readmoney ; 3d
dw Script_readcoins ; 3e
dw Script_RAM2MEM ; 3f
dw Script_vartomem ; 3f
dw Script_pokenamemem ; 40
dw Script_itemtotext ; 41
dw Script_mapnametotext ; 42
@ -728,14 +728,14 @@ Script_askforphonenumber:
ld c, a
farcall AddPhoneNumber
jr c, .phonefull
xor a
xor a ; PHONE_CONTACT_GOT
jr .done
.phonefull
ld a, 1
ld a, PHONE_CONTACTS_FULL
jr .done
.refused
call GetScriptByte
ld a, 2
ld a, PHONE_CONTACT_REFUSED
.done
ld [ScriptVar], a
ret
@ -1880,7 +1880,7 @@ Script_checkver:
Script_pokenamemem:
; script command 0x40
; parameters: pokemon (0 to use ScriptVar), memory
; parameters: pokemon (0 aka USE_SCRIPT_VAR to use ScriptVar), memory
call GetScriptByte
and a
@ -1893,7 +1893,7 @@ Script_pokenamemem:
ConvertMemToText:
call GetScriptByte
cp 3
cp NUM_MEM_BUFFERS
jr c, .ok
xor a
.ok
@ -1907,10 +1907,10 @@ CopyConvertedText:
Script_itemtotext:
; script command 0x41
; parameters: item (0 to use ScriptVar), memory
; parameters: item (0 aka USE_SCRIPT_VAR to use ScriptVar), memory
call GetScriptByte
and a
and a ; USE_SCRIPT_VAR
jr nz, .ok
ld a, [ScriptVar]
.ok
@ -1999,7 +1999,7 @@ Script_readcoins:
ld de, StringBuffer1
jp ConvertMemToText
Script_RAM2MEM:
Script_vartomem:
; script command 0x3f
; parameters: memory
@ -2150,15 +2150,15 @@ Script_checkmoney:
farcall CompareMoney
CompareMoneyAction:
jr c, .two
jr z, .one
ld a, 0
jr c, .less
jr z, .exact
ld a, HAVE_MORE
jr .done
.one
ld a, 1
.exact
ld a, HAVE_AMOUNT
jr .done
.two
ld a, 2
.less
ld a, HAVE_LESS
.done
ld [ScriptVar], a
ret
@ -2166,9 +2166,9 @@ CompareMoneyAction:
GetMoneyAccount:
call GetScriptByte
and a
ld de, Money
ld de, Money ; YOUR_MONEY
ret z
ld de, wMomsMoney
ld de, wMomsMoney ; MOMS_MONEY
ret
LoadMoneyAmountToMem:
@ -2431,7 +2431,7 @@ Script_checkflag:
ld e, a
call GetScriptByte
ld d, a
ld b, 2 ; check
ld b, CHECK_FLAG
call _EngineFlagAction
ld a, c
and a
@ -2667,7 +2667,7 @@ Script_loadbytec2cf:
ld [wc2cf], a
ret
ld c, c ; XXX
db $49 ; XXX
Script_closetext:
; script command 0x49

View File

@ -603,13 +603,13 @@ SpecialGameboyCheck: ; c478
jr nz, .sgb
.gb
xor a
xor a ; GBCHECK_GB
jr .done
.sgb
ld a, 1
ld a, GBCHECK_SGB
jr .done
.cgb
ld a, 2
ld a, GBCHECK_CGB
.done
ld [ScriptVar], a
ret

View File

@ -424,9 +424,9 @@ readcoins: MACRO
db \1 ; memory
ENDM
enum RAM2MEM_command ; $3f
RAM2MEM: MACRO
db RAM2MEM_command
enum vartomem_command ; $3f
vartomem: MACRO
db vartomem_command
db \1 ; memory
ENDM
@ -483,7 +483,11 @@ ENDM
enum refreshscreen_command ; $48
refreshscreen: MACRO
db refreshscreen_command
if _NARG == 1
db \1 ; dummy
else
db 0
endc
ENDM
enum closetext_command ; $49

View File

@ -146,7 +146,7 @@ AzaleaGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext BUGSY, BUGSY1, $1
trainertotext BUGSY, BUGSY1, MEM_BUFFER_1
jumpstd gymstatue2
BugsyText_INeverLose:

View File

@ -125,7 +125,7 @@ Script_GivePlayerHisPrize: ; 0x9e47a
writebyte BATTLETOWERACTION_GIVEREWARD
special BattleTowerAction
if_equal POTION, Script_YourPackIsStuffedFull
itemtotext $0, $1
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1
giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive
writebyte BATTLETOWERACTION_1D

View File

@ -29,7 +29,7 @@ Script_BattleRoomLoop: ; 0x9f425
waitsfx
applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn
opentext
battletowertext 1
battletowertext $1
buttonsound
closetext
special BattleTowerBattle ; calls predef startbattle

View File

@ -70,7 +70,7 @@ BlackthornGymClairScript:
buttonsound
giveitem TM_DRAGONBREATH
iffalse .BagFull
itemtotext TM_DRAGONBREATH, $0
itemtotext TM_DRAGONBREATH, MEM_BUFFER_0
writetext BlackthornGymText_ReceivedTM24
playsound SFX_ITEM
waitsfx
@ -146,7 +146,7 @@ BlackthornGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext CLAIR, CLAIR1, $1
trainertotext CLAIR, CLAIR1, MEM_BUFFER_1
jumpstd gymstatue2
ClairIntroText:

View File

@ -27,8 +27,8 @@ DaisyScript:
writetext DaisyWhichMonText
waitbutton
special Special_DaisyMassage
if_equal 0, .Refused
if_equal 1, .CantGroomEgg
if_equal $0, .Refused
if_equal $1, .CantGroomEgg
setflag ENGINE_TEA_IN_BLUES_HOUSE
writetext DaisyAlrightText
waitbutton

View File

@ -92,7 +92,7 @@ ReleaseTheBeasts:
setevent EVENT_BURNED_TOWER_MORTY
setevent EVENT_BURNED_TOWER_1F_EUSINE
appear BURNEDTOWERB1F_EUSINE
refreshscreen $0
refreshscreen
changeblock 6, 14, $1b
reloadmappart
closetext
@ -106,7 +106,7 @@ BurnedTowerB1FEusine:
waitbutton
closetext
checkcode VAR_FACING
if_equal $1, .Movement
if_equal UP, .Movement
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
jump UnknownScript_0x18622a

View File

@ -96,7 +96,7 @@ CeladonCafeTrashcan:
giveitem LEFTOVERS
iffalse .PackFull
opentext
itemtotext LEFTOVERS, $0
itemtotext LEFTOVERS, MEM_BUFFER_0
writetext FoundLeftoversText
playsound SFX_ITEM
waitsfx
@ -107,7 +107,7 @@ CeladonCafeTrashcan:
.PackFull:
opentext
itemtotext LEFTOVERS, $0
itemtotext LEFTOVERS, MEM_BUFFER_0
writetext FoundLeftoversText
buttonsound
writetext NoRoomForLeftoversText

View File

@ -11,7 +11,7 @@ CeladonDeptStore6F_MapScriptHeader:
dbw MAPCALLBACK_TILES, .Callback
.Callback:
changeblock 12, 0, $3
changeblock 12, 0, $03
return
CeladonDeptStore6FSuperNerdScript:
@ -28,37 +28,37 @@ CeladonDeptStore6FVendingMachine:
loadmenudata .MenuData
verticalmenu
closewindow
if_equal $1, .FreshWater
if_equal $2, .SodaPop
if_equal $3, .Lemonade
if_equal 1, .FreshWater
if_equal 2, .SodaPop
if_equal 3, .Lemonade
closetext
end
.FreshWater:
checkmoney $0, 200
if_equal $2, .NotEnoughMoney
checkmoney YOUR_MONEY, 200
if_equal HAVE_LESS, .NotEnoughMoney
giveitem FRESH_WATER
iffalse .NotEnoughSpace
takemoney $0, 200
itemtotext FRESH_WATER, $0
takemoney YOUR_MONEY, 200
itemtotext FRESH_WATER, MEM_BUFFER_0
jump .VendItem
.SodaPop:
checkmoney $0, 300
if_equal $2, .NotEnoughMoney
checkmoney YOUR_MONEY, 300
if_equal HAVE_LESS, .NotEnoughMoney
giveitem SODA_POP
iffalse .NotEnoughSpace
takemoney $0, 300
itemtotext SODA_POP, $0
takemoney YOUR_MONEY, 300
itemtotext SODA_POP, MEM_BUFFER_0
jump .VendItem
.Lemonade:
checkmoney $0, 350
if_equal $2, .NotEnoughMoney
checkmoney YOUR_MONEY, 350
if_equal HAVE_LESS, .NotEnoughMoney
giveitem LEMONADE
iffalse .NotEnoughSpace
takemoney $0, 350
itemtotext LEMONADE, $0
takemoney YOUR_MONEY, 350
itemtotext LEMONADE, MEM_BUFFER_0
jump .VendItem
.VendItem:

View File

@ -59,8 +59,8 @@ CeladonGameCornerFisherScript:
checkitem COIN_CASE
iffalse .NoCoinCase
checkcoins MAX_COINS - 1
if_equal $0, .FullCoinCase
stringtotext .coinname, $1
if_equal HAVE_MORE, .FullCoinCase
stringtotext .coinname, MEM_BUFFER_1
scall .GiveCoins
givecoins 18
setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
@ -111,23 +111,23 @@ CeladonGameCornerPoster2Script:
jumptext CeladonGameCornerPoster2Text
CeladonGameCornerLuckySlotMachineScript:
random $6
if_equal $0, CeladonGameCornerSlotMachineScript
refreshscreen $0
writebyte $0
random 6
if_equal 0, CeladonGameCornerSlotMachineScript
refreshscreen
writebyte FALSE
special Special_SlotMachine
closetext
end
CeladonGameCornerSlotMachineScript:
refreshscreen $0
writebyte $1
refreshscreen
writebyte TRUE
special Special_SlotMachine
closetext
end
CeladonGameCornerCardFlipScript:
refreshscreen $0
refreshscreen
special Special_CardFlip
closetext
end

View File

@ -28,15 +28,15 @@ CeladonPrizeRoom_tmcounterloop:
loadmenudata CeladonPrizeRoom_TMMenuDataHeader
verticalmenu
closewindow
if_equal $1, .doubleteam
if_equal $2, .psychic
if_equal $3, .hyperbeam
if_equal 1, .doubleteam
if_equal 2, .psychic
if_equal 3, .hyperbeam
jump CeladonPrizeRoom_cancel
.doubleteam
checkcoins 1500
if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_DOUBLE_TEAM, $0
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_DOUBLE_TEAM, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
giveitem TM_DOUBLE_TEAM
@ -46,8 +46,8 @@ CeladonPrizeRoom_tmcounterloop:
.psychic
checkcoins 3500
if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_PSYCHIC_M, $0
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_PSYCHIC_M, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
giveitem TM_PSYCHIC_M
@ -57,8 +57,8 @@ CeladonPrizeRoom_tmcounterloop:
.hyperbeam
checkcoins 7500
if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_HYPER_BEAM, $0
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_HYPER_BEAM, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
giveitem TM_HYPER_BEAM
@ -132,17 +132,17 @@ GoldenrodGameCornerPokemonVendor:
loadmenudata .MenuDataHeader
verticalmenu
closewindow
if_equal $1, .pikachu
if_equal $2, .porygon
if_equal $3, .larvitar
if_equal 1, .pikachu
if_equal 2, .porygon
if_equal 3, .larvitar
jump CeladonPrizeRoom_cancel
.pikachu
checkcoins 2222
if_equal $2, CeladonPrizeRoom_notenoughcoins
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
if_equal $6, CeladonPrizeRoom_notenoughroom
pokenamemem PIKACHU, $0
if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem PIKACHU, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
waitsfx
@ -157,10 +157,10 @@ GoldenrodGameCornerPokemonVendor:
.porygon
checkcoins 5555
if_equal $2, CeladonPrizeRoom_notenoughcoins
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
if_equal $6, CeladonPrizeRoom_notenoughroom
pokenamemem PORYGON, $0
if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem PORYGON, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
waitsfx
@ -175,10 +175,10 @@ GoldenrodGameCornerPokemonVendor:
.larvitar
checkcoins 8888
if_equal $2, CeladonPrizeRoom_notenoughcoins
if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
if_equal $6, CeladonPrizeRoom_notenoughroom
pokenamemem LARVITAR, $0
if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem LARVITAR, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
waitsfx

View File

@ -109,7 +109,7 @@ CeladonGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext ERIKA, ERIKA1, $1
trainertotext ERIKA, ERIKA1, MEM_BUFFER_1
jumpstd gymstatue2
UnknownText_0x72b28:

View File

@ -16,7 +16,7 @@ CooltrainerMScript_0x71670:
opentext
writetext UnknownText_0x716ce
checkcode VAR_DEXCAUGHT
if_greater_than 248, UnknownScript_0x7167e
if_greater_than NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi
waitbutton
closetext
end

View File

@ -45,7 +45,7 @@ CeladonEusine:
waitbutton
closetext
checkcode VAR_FACING
if_equal $1, .Location1
if_equal UP, .Location1
applymovement CELADONPOKECENTER1F_EUSINE, .Movement1
jump .Continue

View File

@ -161,7 +161,7 @@ CeruleanGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext MISTY, MISTY1, $1
trainertotext MISTY, MISTY1, MEM_BUFFER_1
jumpstd gymstatue2
MovementData_0x1884e3:

View File

@ -69,7 +69,7 @@ CherrygroveCityGuideGent:
opentext
writetext GuideGentGiftText
buttonsound
stringtotext .mapcardname, $1
stringtotext .mapcardname, MEM_BUFFER_1
scall .JumpstdReceiveItem
setflag ENGINE_MAP_CARD
writetext GotMapCardText

View File

@ -138,7 +138,7 @@ CianwoodGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext CHUCK, CHUCK1, $1
trainertotext CHUCK, CHUCK1, MEM_BUFFER_1
jumpstd gymstatue2
CianwoodGymMovement_ChuckChucksBoulder:

View File

@ -33,9 +33,9 @@ DragonShrine_MapScriptHeader:
loadmenudata MenuDataHeader_0x18d215
verticalmenu
closewindow
if_equal $1, .RightAnswer
if_equal $2, .WrongAnswer
if_equal $3, .RightAnswer
if_equal 1, .RightAnswer
if_equal 2, .WrongAnswer
if_equal 3, .RightAnswer
end
.Question2:
@ -45,9 +45,9 @@ DragonShrine_MapScriptHeader:
loadmenudata MenuDataHeader_0x18d234
verticalmenu
closewindow
if_equal $1, .RightAnswer
if_equal $2, .RightAnswer
if_equal $3, .WrongAnswer
if_equal 1, .RightAnswer
if_equal 2, .RightAnswer
if_equal 3, .WrongAnswer
.Question3:
setevent EVENT_DRAGON_SHRINE_QUESTION_3
writetext UnknownText_0x18d3f3
@ -55,9 +55,9 @@ DragonShrine_MapScriptHeader:
loadmenudata MenuDataHeader_0x18d258
verticalmenu
closewindow
if_equal $1, .WrongAnswer
if_equal $2, .RightAnswer
if_equal $3, .RightAnswer
if_equal 1, .WrongAnswer
if_equal 2, .RightAnswer
if_equal 3, .RightAnswer
.Question4:
setevent EVENT_DRAGON_SHRINE_QUESTION_4
writetext UnknownText_0x18d420
@ -65,9 +65,9 @@ DragonShrine_MapScriptHeader:
loadmenudata MenuDataHeader_0x18d283
verticalmenu
closewindow
if_equal $1, .RightAnswer
if_equal $2, .WrongAnswer
if_equal $3, .RightAnswer
if_equal 1, .RightAnswer
if_equal 2, .WrongAnswer
if_equal 3, .RightAnswer
.Question5:
setevent EVENT_DRAGON_SHRINE_QUESTION_5
writetext UnknownText_0x18d44a
@ -75,9 +75,9 @@ DragonShrine_MapScriptHeader:
loadmenudata MenuDataHeader_0x18d2a5
verticalmenu
closewindow
if_equal $1, .WrongAnswer
if_equal $2, .RightAnswer
if_equal $3, .WrongAnswer
if_equal 1, .WrongAnswer
if_equal 2, .RightAnswer
if_equal 3, .WrongAnswer
.RightAnswer:
checkevent EVENT_DRAGON_SHRINE_QUESTION_5
iftrue .PassedTheTest

View File

@ -57,7 +57,7 @@ DragonsDenB1F_ClairScene:
buttonsound
giveitem TM_DRAGONBREATH
iffalse .BagFull
itemtotext TM_DRAGONBREATH, $0
itemtotext TM_DRAGONBREATH, MEM_BUFFER_0
writetext NotifyReceiveDragonbreath
playsound SFX_ITEM
waitsfx
@ -135,7 +135,7 @@ PokeBallScript_0x18c95a:
iffalse .BagFull
disappear DRAGONSDENB1F_POKE_BALL1
opentext
itemtotext DRAGON_FANG, $0
itemtotext DRAGON_FANG, MEM_BUFFER_0
writetext Text_FoundDragonFang
playsound SFX_ITEM
waitsfx
@ -145,7 +145,7 @@ PokeBallScript_0x18c95a:
.BagFull:
opentext
itemtotext DRAGON_FANG, $0
itemtotext DRAGON_FANG, MEM_BUFFER_0
writetext Text_FoundDragonFang
buttonsound
writetext Text_NoRoomForDragonFang

View File

@ -69,11 +69,11 @@ AcademyBlackboard:
loadmenudata .BlackboardMenuData
_2dmenu
closewindow
if_equal $1, .Poison
if_equal $2, .Paralysis
if_equal $3, .Sleep
if_equal $4, .Burn
if_equal $5, .Freeze
if_equal 1, .Poison
if_equal 2, .Paralysis
if_equal 3, .Sleep
if_equal 4, .Burn
if_equal 5, .Freeze
closetext
end

View File

@ -162,7 +162,7 @@ EcruteakGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext MORTY, MORTY1, $1
trainertotext MORTY, MORTY1, MEM_BUFFER_1
jumpstd gymstatue2
MovementData_0x99e5d:

View File

@ -161,7 +161,7 @@ CyndaquilPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface ELMSLAB_ELM, DOWN
refreshscreen $0
refreshscreen
pokepic CYNDAQUIL
cry CYNDAQUIL
waitbutton
@ -175,7 +175,7 @@ CyndaquilPokeBallScript:
writetext ChoseStarterText
buttonsound
waitsfx
pokenamemem CYNDAQUIL, $0
pokenamemem CYNDAQUIL, MEM_BUFFER_0
writetext ReceivedStarterText
playsound SFX_CAUGHT_MON
waitsfx
@ -191,7 +191,7 @@ TotodilePokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface ELMSLAB_ELM, DOWN
refreshscreen $0
refreshscreen
pokepic TOTODILE
cry TOTODILE
waitbutton
@ -205,7 +205,7 @@ TotodilePokeBallScript:
writetext ChoseStarterText
buttonsound
waitsfx
pokenamemem TOTODILE, $0
pokenamemem TOTODILE, MEM_BUFFER_0
writetext ReceivedStarterText
playsound SFX_CAUGHT_MON
waitsfx
@ -219,7 +219,7 @@ ChikoritaPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface ELMSLAB_ELM, DOWN
refreshscreen $0
refreshscreen
pokepic CHIKORITA
cry CHIKORITA
waitbutton
@ -233,7 +233,7 @@ ChikoritaPokeBallScript:
writetext ChoseStarterText
buttonsound
waitsfx
pokenamemem CHIKORITA, $0
pokenamemem CHIKORITA, MEM_BUFFER_0
writetext ReceivedStarterText
playsound SFX_CAUGHT_MON
waitsfx
@ -311,7 +311,7 @@ ElmsLabHealingMachine_HealParty:
special TrainerRankings_Healings
special HealParty
playmusic MUSIC_NONE
writebyte 1 ; Machine is in Elm's Lab
writebyte HEALMACHINE_ELMS_LAB
special HealMachineAnim
pause 30
special RestartMapMusic
@ -500,7 +500,7 @@ AideScript_GiveYouBalls:
opentext
writetext AideText_GiveYouBalls
buttonsound
itemtotext POKE_BALL, $1
itemtotext POKE_BALL, MEM_BUFFER_1
scall AideScript_ReceiveTheBalls
giveitem POKE_BALL, 5
writetext AideText_ExplainBalls

View File

@ -100,7 +100,7 @@ SailorScript_0x755f1:
setevent EVENT_FAST_SHIP_LAZY_SAILOR
setmapscene FAST_SHIP_B1F, 1
checkcode VAR_FACING
if_equal $3, UnknownScript_0x75629
if_equal RIGHT, UnknownScript_0x75629
applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
playsound SFX_EXIT_BUILDING
disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR

View File

@ -216,7 +216,7 @@ FuchsiaGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext JANINE, JANINE1, $1
trainertotext JANINE, JANINE1, MEM_BUFFER_1
jumpstd gymstatue2
Movement_NinjaSpin:

View File

@ -22,7 +22,7 @@ BillsHouseBill:
buttonsound
waitsfx
checkcode VAR_PARTYCOUNT
if_equal $6, UnknownScript_0x54c13
if_equal PARTY_LENGTH, UnknownScript_0x54c13
writetext UnknownText_0x54dae
playsound SFX_CAUGHT_MON
waitsfx
@ -74,8 +74,8 @@ BillsSister:
iftrue UnknownScript_0x54c58
writetext UnknownText_0x54f9e
askforphonenumber PHONE_BILL
if_equal $1, UnknownScript_0x54c64
if_equal $2, UnknownScript_0x54c5e
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x54c64
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e
waitsfx
addcellnum PHONE_BILL
writetext UnknownText_0x54fd9

View File

@ -63,35 +63,35 @@ MoveTutor:
yesorno
iffalse .Refused2
checkcoins 4000
if_equal $2, .NotEnoughMoney
if_equal HAVE_LESS, .NotEnoughMoney
writetext UnknownText_0x1990ce
loadmenudata .MoveMenuDataHeader
verticalmenu
closewindow
if_equal $1, .Flamethrower
if_equal $2, .Thunderbolt
if_equal $3, .IceBeam
if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower
if_equal MOVETUTOR_THUNDERBOLT, .Thunderbolt
if_equal MOVETUTOR_ICE_BEAM, .IceBeam
jump .Incompatible
.Flamethrower:
writebyte $1
writebyte MOVETUTOR_FLAMETHROWER
writetext UnknownText_0x1991cf
special Special_MoveTutor
if_equal $0, .TeachMove
if_equal FALSE, .TeachMove
jump .Incompatible
.Thunderbolt:
writebyte $2
writebyte MOVETUTOR_THUNDERBOLT
writetext UnknownText_0x1991cf
special Special_MoveTutor
if_equal $0, .TeachMove
if_equal FALSE, .TeachMove
jump .Incompatible
.IceBeam:
writebyte $3
writebyte MOVETUTOR_ICE_BEAM
writetext UnknownText_0x1991cf
special Special_MoveTutor
if_equal $0, .TeachMove
if_equal FALSE, .TeachMove
jump .Incompatible

View File

@ -68,8 +68,8 @@ ReceptionistScript_0x560ce:
special GetFirstPokemonHappiness
writetext UnknownText_0x56143
buttonsound
if_greater_than $95, .VeryHappy
if_greater_than $31, .SomewhatHappy
if_greater_than 150 - 1, .VeryHappy
if_greater_than 50 - 1, .SomewhatHappy
jump .NotVeryHappy
.VeryHappy:
@ -107,7 +107,7 @@ Carrie:
faceplayer
opentext
special SpecialGameboyCheck
if_not_equal $2, .NotGBC ; This is a dummy check from Gold and Silver. In normal gameplay, this would not be checked.
if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver
writetext UnknownText_0x56241
waitbutton
closetext

View File

@ -17,37 +17,37 @@ GoldenrodVendingMachine:
loadmenudata .MenuData
verticalmenu
closewindow
if_equal $1, .FreshWater
if_equal $2, .SodaPop
if_equal $3, .Lemonade
if_equal 1, .FreshWater
if_equal 2, .SodaPop
if_equal 3, .Lemonade
closetext
end
.FreshWater:
checkmoney $0, 200
if_equal $2, .NotEnoughMoney
checkmoney YOUR_MONEY, 200
if_equal HAVE_LESS, .NotEnoughMoney
giveitem FRESH_WATER
iffalse .NotEnoughSpace
takemoney $0, 200
itemtotext FRESH_WATER, $0
takemoney YOUR_MONEY, 200
itemtotext FRESH_WATER, MEM_BUFFER_0
jump .VendItem
.SodaPop:
checkmoney $0, 300
if_equal $2, .NotEnoughMoney
checkmoney YOUR_MONEY, 300
if_equal HAVE_LESS, .NotEnoughMoney
giveitem SODA_POP
iffalse .NotEnoughSpace
takemoney $0, 300
itemtotext SODA_POP, $0
takemoney YOUR_MONEY, 300
itemtotext SODA_POP, MEM_BUFFER_0
jump .VendItem
.Lemonade:
checkmoney $0, 350
if_equal $2, .NotEnoughMoney
checkmoney YOUR_MONEY, 350
if_equal HAVE_LESS, .NotEnoughMoney
giveitem LEMONADE
iffalse .NotEnoughSpace
takemoney $0, 350
itemtotext LEMONADE, $0
takemoney YOUR_MONEY, 350
itemtotext LEMONADE, MEM_BUFFER_0
jump .VendItem
.VendItem:

View File

@ -64,15 +64,15 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
loadmenudata GoldenrodGameCornerTMVendorMenuData
verticalmenu
closewindow
if_equal $1, .Thunder
if_equal $2, .Blizzard
if_equal $3, .FireBlast
if_equal 1, .Thunder
if_equal 2, .Blizzard
if_equal 3, .FireBlast
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.Thunder:
checkcoins 5500
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_THUNDER, $0
if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_THUNDER, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
giveitem TM_THUNDER
@ -82,8 +82,8 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
.Blizzard:
checkcoins 5500
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_BLIZZARD, $0
if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_BLIZZARD, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
giveitem TM_BLIZZARD
@ -93,8 +93,8 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
.FireBlast:
checkcoins 5500
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_FIRE_BLAST, $0
if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_FIRE_BLAST, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
giveitem TM_FIRE_BLAST
@ -168,17 +168,17 @@ GoldenrodGameCornerPrizeMonVendorScript:
loadmenudata .MenuDataHeader
verticalmenu
closewindow
if_equal $1, .abra
if_equal $2, .cubone
if_equal $3, .wobbuffet
if_equal 1, .abra
if_equal 2, .cubone
if_equal 3, .wobbuffet
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.abra
checkcoins 100
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem ABRA, $0
if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem ABRA, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
@ -193,10 +193,10 @@ GoldenrodGameCornerPrizeMonVendorScript:
.cubone
checkcoins 800
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem CUBONE, $0
if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem CUBONE, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
@ -211,10 +211,10 @@ GoldenrodGameCornerPrizeMonVendorScript:
.wobbuffet
checkcoins 1500
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem WOBBUFFET, $0
if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem WOBBUFFET, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
@ -301,21 +301,21 @@ GoldenrodGameCornerLeftTheirDrinkScript:
GoldenrodGameCornerSlotsMachineScript:
random 6
if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript
refreshscreen $0
refreshscreen
writebyte FALSE
special Special_SlotMachine
closetext
end
GoldenrodGameCornerLuckySlotsMachineScript:
refreshscreen $0
refreshscreen
writebyte TRUE
special Special_SlotMachine
closetext
end
GoldenrodGameCornerCardFlipMachineScript:
refreshscreen $0
refreshscreen
special Special_CardFlip
closetext
end

View File

@ -171,7 +171,7 @@ GoldenrodGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext WHITNEY, WHITNEY1, $1
trainertotext WHITNEY, WHITNEY1, MEM_BUFFER_1
jumpstd gymstatue2
BridgetWalksUpMovement:

View File

@ -16,11 +16,11 @@ TeacherScript_0x54953:
special GetFirstPokemonHappiness
writetext UnknownText_0x549a3
buttonsound
if_greater_than $f9, UnknownScript_0x54973
if_greater_than $c7, UnknownScript_0x54979
if_greater_than $95, UnknownScript_0x5497f
if_greater_than $63, UnknownScript_0x54985
if_greater_than $31, UnknownScript_0x5498b
if_greater_than 250 - 1, UnknownScript_0x54973
if_greater_than 200 - 1, UnknownScript_0x54979
if_greater_than 150 - 1, UnknownScript_0x5497f
if_greater_than 100 - 1, UnknownScript_0x54985
if_greater_than 50 - 1, UnknownScript_0x5498b
jump UnknownScript_0x54991
UnknownScript_0x54973:

View File

@ -34,7 +34,7 @@ OfficerScript_0x550ec:
closetext
applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146
applymovement PLAYER, MovementData_0x5514f
writebyte $0
writebyte FALSE
special Special_MagnetTrain
warpcheck
newloadmap MAPSETUP_TRAIN

View File

@ -28,8 +28,8 @@ UnknownScript_0x625df:
loadmenudata MenuDataHeader_0x62602
verticalmenu
closewindow
if_equal $1, UnknownScript_0x625f0
if_equal $2, UnknownScript_0x625f8
if_equal 1, UnknownScript_0x625f0
if_equal 2, UnknownScript_0x625f8
jump UnknownScript_0x62600
UnknownScript_0x625f0:
@ -73,8 +73,8 @@ UnknownScript_0x62629:
loadmenudata MenuDataHeader_0x6264c
verticalmenu
closewindow
if_equal $1, UnknownScript_0x6263a
if_equal $2, UnknownScript_0x62642
if_equal 1, UnknownScript_0x6263a
if_equal 2, UnknownScript_0x62642
jump UnknownScript_0x6264a
UnknownScript_0x6263a:

View File

@ -35,7 +35,7 @@ GoldenrodUnderground_MapScriptHeader:
clearevent EVENT_SWITCH_12
clearevent EVENT_SWITCH_13
clearevent EVENT_SWITCH_14
writebyte $0
writebyte 0
copyvartobyte UndergroundSwitchPositions
return
@ -196,8 +196,8 @@ OlderHaircutBrotherScript:
writetext UnknownText_0x7c5f9
yesorno
iffalse .Refused
checkmoney $0, 500
if_equal $2, .NotEnoughMoney
checkmoney YOUR_MONEY, 500
if_equal HAVE_LESS, .NotEnoughMoney
writetext UnknownText_0x7c69a
buttonsound
special Special_YoungerHaircutBrother
@ -227,7 +227,7 @@ OlderHaircutBrotherScript:
jump .then
.then
takemoney $0, 500
takemoney YOUR_MONEY, 500
special PlaceMoneyTopRight
writetext UnknownText_0x7c6b8
waitbutton
@ -279,8 +279,8 @@ YoungerHaircutBrotherScript:
writetext UnknownText_0x7c75c
yesorno
iffalse .Refused
checkmoney $0, 300
if_equal $2, .NotEnoughMoney
checkmoney YOUR_MONEY, 300
if_equal HAVE_LESS, .NotEnoughMoney
writetext UnknownText_0x7c7f1
buttonsound
special Special_OlderHaircutBrother
@ -310,7 +310,7 @@ YoungerHaircutBrotherScript:
jump .then
.then
takemoney $0, 300
takemoney YOUR_MONEY, 300
special PlaceMoneyTopRight
writetext UnknownText_0x7c80e
waitbutton

View File

@ -31,7 +31,7 @@ GoldenrodUndergroundWarehouse_MapScriptHeader:
clearevent EVENT_SWITCH_12
clearevent EVENT_SWITCH_13
clearevent EVENT_SWITCH_14
writebyte $0
writebyte 0
copyvartobyte UndergroundSwitchPositions
return

View File

@ -30,7 +30,7 @@ HallOfFame_MapScriptHeader:
applymovement PLAYER, HallOfFame_SlowlyApproachMachine
setscene 1
pause 15
writebyte 2 ; Machine is in the Hall of Fame
writebyte HEALMACHINE_HALL_OF_FAME
special HealMachineAnim
setevent EVENT_BEAT_ELITE_FOUR
setevent EVENT_TELEPORT_GUY

View File

@ -38,7 +38,7 @@ UnknownScript_0x7a4f6:
opentext
writetext UnknownText_0x7a604
buttonsound
stringtotext GearName, $1
stringtotext GearName, MEM_BUFFER_1
scall UnknownScript_0x7a57e
setflag ENGINE_POKEGEAR
setflag ENGINE_PHONE_CARD

View File

@ -31,27 +31,25 @@ KrissHouse2F_MapScriptHeader:
special ToggleMaptileDecorations
return
db 0, 0, 0 ; filler
Doll1:
describedecoration 1
describedecoration DECODESC_LEFT_DOLL
Doll2:
describedecoration 2
describedecoration DECODESC_RIGHT_DOLL
BigDoll:
describedecoration 3
describedecoration DECODESC_BIG_DOLL
GameConsole:
describedecoration 4
describedecoration DECODESC_CONSOLE
KrissHousePoster:
dw EVENT_KRISS_ROOM_POSTER, .Script
.Script:
describedecoration 0
describedecoration DECODESC_POSTER
KrissHouseRadio:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM

View File

@ -31,7 +31,7 @@ KrissNeighborsHouseRadio:
pause 45
writetext KrisNeighborRadioText3
pause 45
musicfadeout MUSIC_NEW_BARK_TOWN, $10
musicfadeout MUSIC_NEW_BARK_TOWN, 16
writetext KrisNeighborRadioText4
pause 45
closetext

View File

@ -132,7 +132,7 @@ KurtScript_0x18e178:
buttonsound
setevent EVENT_DRAGON_SHRINE_QUESTION_2
special Special_SelectApricornForKurt
if_equal $0, .Cancel
if_equal FALSE, .Cancel
if_equal BLU_APRICORN, .Blu
if_equal YLW_APRICORN, .Ylw
if_equal GRN_APRICORN, .Grn

View File

@ -45,9 +45,10 @@ UnknownScript_0x19a6e0:
writetext UnknownText_0x19a93e
waitbutton
special Special_CheckMagikarpLength
if_equal $0, UnknownScript_0x19a71c
if_equal $1, UnknownScript_0x19a722
if_equal $2, UnknownScript_0x19a716
if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c
if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722
if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716
; MAGIKARPLENGTH_BEAT_RECORD
jump UnknownScript_0x19a6fe
UnknownScript_0x19a6fe:

View File

@ -73,7 +73,7 @@ LanceScript_0x180e7b:
reloadmappart
closetext
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10
musicfadeout MUSIC_BEAUTY_ENCOUNTER, 16
pause 30
showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15
spriteface LANCESROOM_LANCE, DOWN

View File

@ -36,7 +36,7 @@ GentlemanScript_0x7ee6c:
.UnknownScript_0x7ee80:
writetext UnknownText_0x7f0a1
buttonsound
stringtotext .expncardname, $1
stringtotext .expncardname, MEM_BUFFER_1
scall .UnknownScript_0x7ee94
setflag ENGINE_EXPN_CARD
.UnknownScript_0x7ee8e:

View File

@ -146,7 +146,7 @@ MahoganyGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext PRYCE, PRYCE1, $1
trainertotext PRYCE, PRYCE1, MEM_BUFFER_1
jumpstd gymstatue2
PryceText_Intro:

View File

@ -56,13 +56,13 @@ UnknownScript_0x190040:
special PlaceMoneyTopRight
yesorno
iffalse UnknownScript_0x190072
checkmoney $0, 300
if_equal $2, UnknownScript_0x19006c
checkmoney YOUR_MONEY, 300
if_equal HAVE_LESS, UnknownScript_0x19006c
giveitem RAGECANDYBAR
iffalse UnknownScript_0x190078
waitsfx
playsound SFX_TRANSACTION
takemoney $0, 300
takemoney YOUR_MONEY, 300
special PlaceMoneyTopRight
writetext UnknownText_0x19014a
waitbutton

View File

@ -55,10 +55,11 @@ ManiaScript:
yesorno
iffalse .refused
special SpecialReturnShuckle
if_equal $0, .wrong
if_equal $1, .refused
if_equal $3, .superhappy
if_equal $4, .default_postevent
if_equal SHUCKIE_WRONG_MON, .wrong
if_equal SHUCKIE_REFUSED, .refused
if_equal SHUCKIE_HAPPY, .superhappy
if_equal SHUCKIE_FAINTED, .default_postevent
; SHUCKIE_RETURNED
writetext ManiaText_ThankYou
waitbutton
closetext

View File

@ -20,7 +20,7 @@ MobileBattleRoom_MapScriptHeader:
end
MapMobileBattleRoomSignpost0Script:
refreshscreen $0
refreshscreen
special Function1037c2
if_equal $1, .one
special Function1037eb
@ -39,7 +39,7 @@ MapMobileBattleRoomSignpost0Script:
pause 60
special FadeInPalettes
special RestartMapMusic
refreshscreen $0
refreshscreen
.two_
special TrainerRankings_Healings
special HealParty

View File

@ -20,7 +20,7 @@ MobileTradeRoomMobile_MapScriptHeader:
end
MapMobileTradeRoomMobileSignpost0Script:
refreshscreen $0
refreshscreen
special Function1037c2
writetext MobileTradeRoomMobile_EstablishingCommsText
waitbutton

View File

@ -35,7 +35,7 @@ UnknownScript_0x7e217:
buttonsound
waitsfx
checkcode VAR_PARTYCOUNT
if_equal $6, UnknownScript_0x7e237
if_equal PARTY_LENGTH, UnknownScript_0x7e237
writetext UnknownText_0x7e355
playsound SFX_CAUGHT_MON
waitsfx

View File

@ -94,9 +94,9 @@ UnknownScript_0x5c071:
scall UnknownScript_0x5c100
UnknownScript_0x5c074:
askforphonenumber PHONE_SCHOOLBOY_JACK
if_equal $1, UnknownScript_0x5c110
if_equal $2, UnknownScript_0x5c10c
trainertotext SCHOOLBOY, JACK1, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c110
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c
trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
scall UnknownScript_0x5c104
jump UnknownScript_0x5c108
@ -224,9 +224,9 @@ UnknownScript_0x5c160:
scall UnknownScript_0x5c193
UnknownScript_0x5c163:
askforphonenumber PHONE_POKEFAN_BEVERLY
if_equal $1, UnknownScript_0x5c1a3
if_equal $2, UnknownScript_0x5c19f
trainertotext POKEFANF, BEVERLY1, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f
trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
scall UnknownScript_0x5c197
jump UnknownScript_0x5c19b

View File

@ -26,8 +26,8 @@ Oak:
setevent EVENT_TALKED_TO_OAK_IN_KANTO
.CheckBadges:
checkcode VAR_BADGES
if_equal 16, .OpenMtSilver
if_equal 8, .Complain
if_equal NUM_BADGES, .OpenMtSilver
if_equal NUM_JOHTO_BADGES, .Complain
jump .AhGood
.CheckPokedex:

View File

@ -78,8 +78,8 @@ OlivineCitySailor1Script:
StandingYoungsterScript_0x1a88a6:
faceplayer
opentext
random $2
if_equal $0, UnknownScript_0x1a88b4
random 2
if_equal 0, UnknownScript_0x1a88b4
writetext UnknownText_0x1a8b04
waitbutton
closetext

View File

@ -91,7 +91,7 @@ OlivineGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext JASMINE, JASMINE1, $1
trainertotext JASMINE, JASMINE1, MEM_BUFFER_1
jumpstd gymstatue2
Jasmine_SteelTypeIntro:

View File

@ -41,9 +41,9 @@ UnknownScript_0x5afb0:
scall UnknownScript_0x5b057
UnknownScript_0x5afb3:
askforphonenumber PHONE_SAILOR_HUEY
if_equal $1, UnknownScript_0x5b067
if_equal $2, UnknownScript_0x5b063
trainertotext SAILOR, HUEY1, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5b067
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063
trainertotext SAILOR, HUEY1, MEM_BUFFER_0
scall UnknownScript_0x5b05b
jump UnknownScript_0x5b05f

View File

@ -72,7 +72,7 @@ PewterGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext BROCK, BROCK1, $1
trainertotext BROCK, BROCK1, MEM_BUFFER_1
jumpstd gymstatue2
UnknownText_0x1a28d0:

View File

@ -157,13 +157,13 @@ LinkReceptionistScript_Trade:
writetext Text_PleaseComeIn2
waitbutton
closetext
writebyte $0
writebyte FALSE
end
.Mobile_DidNotSave:
writetext Text_PleaseComeAgain
closetext
writebyte $1
writebyte TRUE
end
BattleTradeMobile_WalkIn:
@ -261,13 +261,13 @@ LinkReceptionistScript_Battle:
writetext Text_PleaseComeIn2
waitbutton
closetext
writebyte $0
writebyte FALSE
end
.Mobile_DidNotSave:
writetext Text_PleaseComeAgain
closetext
writebyte $1
writebyte TRUE
end
.SelectThreeMons:
@ -283,11 +283,11 @@ LinkReceptionistScript_Battle:
waitbutton
.Mobile_DidNotSelect:
closetext
writebyte $0
writebyte FALSE
end
.Mobile_OK:
writebyte $1
writebyte TRUE
end
Script_TimeCapsuleClosed:
@ -584,7 +584,7 @@ Script_LeftTimeCapsule:
end
MapPokecenter2FSignpost0Script:
refreshscreen $0
refreshscreen
special Special_DisplayLinkRecord
closetext
end

View File

@ -148,7 +148,7 @@ CooltrainerFScript_0x5cdd5:
waitsfx
writetext UnknownText_0x5d37b
buttonsound
stringtotext RadioCardText, $1
stringtotext RadioCardText, MEM_BUFFER_1
scall UnknownScript_0x5ce3e
writetext UnknownText_0x5d3c0
buttonsound

View File

@ -133,7 +133,7 @@ UnknownScript_0x5d7be:
waitbutton
closetext
spriteface RADIOTOWER2F_BUENA, DOWN
refreshscreen $0
refreshscreen
special SpecialBuenasPassword
closetext
iffalse UnknownScript_0x5d845
@ -142,7 +142,7 @@ UnknownScript_0x5d7be:
waitbutton
closetext
checkcode VAR_BLUECARDBALANCE
addvar $1
addvar 1
writevarcode VAR_BLUECARDBALANCE
waitsfx
playsound SFX_TRANSACTION
@ -157,7 +157,7 @@ UnknownScript_0x5d7be:
pause 20
special RestartMapMusic
checkcode VAR_BLUECARDBALANCE
if_equal $1e, UnknownScript_0x5d8a4
if_equal 30, UnknownScript_0x5d8a4
end
UnknownScript_0x5d800:
@ -281,8 +281,8 @@ UnknownScript_0x5d8cc:
writetext UnknownText_0x5e2bf
UnknownScript_0x5d8d0:
askforphonenumber PHONE_BUENA
if_equal $1, UnknownScript_0x5d8f6
if_equal $2, UnknownScript_0x5d8ed
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed
writetext UnknownText_0x5e2f3
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx

View File

@ -8,9 +8,9 @@ Route16_MapScriptHeader:
.AlwaysOnBike:
checkcode VAR_YCOORD
if_less_than $5, .CanWalk
if_less_than 5, .CanWalk
checkcode VAR_XCOORD
if_greater_than $d, .CanWalk
if_greater_than 13, .CanWalk
setflag ENGINE_ALWAYS_ON_BIKE
return

View File

@ -49,9 +49,9 @@ UnknownScript_0x1a4d62:
scall UnknownScript_0x1a4dc3
UnknownScript_0x1a4d65:
askforphonenumber PHONE_COOLTRAINERM_GAVEN
if_equal $1, UnknownScript_0x1a4dd3
if_equal $2, UnknownScript_0x1a4dcf
trainertotext COOLTRAINERM, GAVEN3, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a4dd3
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a4dcf
trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0
scall UnknownScript_0x1a4dc7
jump UnknownScript_0x1a4dcb
@ -155,7 +155,7 @@ UnknownScript_0x1a4e21:
askforphonenumber PHONE_COOLTRAINERF_BETH
if_equal $1, UnknownScript_0x1a4e8f
if_equal $2, UnknownScript_0x1a4e8b
trainertotext COOLTRAINERF, BETH1, $0
trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
scall UnknownScript_0x1a4e83
jump UnknownScript_0x1a4e87

View File

@ -84,9 +84,9 @@ UnknownScript_0x1a08e8:
scall UnknownScript_0x1a095b
UnknownScript_0x1a08eb:
askforphonenumber PHONE_BIRDKEEPER_JOSE
if_equal $1, UnknownScript_0x1a096b
if_equal $2, UnknownScript_0x1a0967
trainertotext BIRD_KEEPER, JOSE2, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a096b
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a0967
trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0
scall UnknownScript_0x1a095f
jump UnknownScript_0x1a0963
@ -217,9 +217,9 @@ UnknownScript_0x1a09d2:
scall UnknownScript_0x1a0a33
UnknownScript_0x1a09d5:
askforphonenumber PHONE_COOLTRAINERF_REENA
if_equal $1, UnknownScript_0x1a0a43
if_equal $2, UnknownScript_0x1a0a3f
trainertotext COOLTRAINERF, REENA1, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a0a43
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a0a3f
trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0
scall UnknownScript_0x1a0a37
jump UnknownScript_0x1a0a3b

View File

@ -16,7 +16,7 @@ SandstormHouseWoman:
special GetFirstPokemonHappiness
writetext SandstormHouseWomanText1
buttonsound
if_greater_than $95, .Loyal
if_greater_than 150 - 1, .Loyal
jump .Disloyal
.Loyal:

View File

@ -108,7 +108,7 @@ CatchingTutorialDudeScript:
faceplayer
opentext
checkcode VAR_BOXSPACE
if_equal $0, .BoxFull
if_equal 0, .BoxFull
checkevent EVENT_LEARNED_TO_CATCH_POKEMON
iftrue .BoxFull
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM

View File

@ -61,9 +61,9 @@ TrainerYoungsterJoey:
scall .AskNumber2
.RequestNumber:
askforphonenumber PHONE_YOUNGSTER_JOEY
if_equal $1, .PhoneFull
if_equal $2, .NumberDeclined
trainertotext YOUNGSTER, JOEY1, $0
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted

View File

@ -49,9 +49,9 @@ TrainerBugCatcherWade1:
scall .AskAgainSTD
.Continue:
askforphonenumber PHONE_BUG_CATCHER_WADE
if_equal $1, .PhoneFullSTD
if_equal $2, .DeclinedNumberSTD
trainertotext BUG_CATCHER, WADE1, $0
if_equal PHONE_CONTACTS_FULL, .PhoneFullSTD
if_equal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD
trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
scall .RegisterNumberSTD
jump .AcceptedNumberSTD
@ -198,10 +198,11 @@ Route31MailRecipientScript:
writetext Text_Route31SleepyManGotMail
buttonsound
checkpokeitem ReceivedSpearowMailText
if_equal $0, .WrongMail
if_equal $2, .Refused
if_equal $3, .NoMail
if_equal $4, .LastMon
if_equal POKEMAIL_WRONG_MAIL, .WrongMail
if_equal POKEMAIL_REFUSED, .Refused
if_equal POKEMAIL_NO_MAIL, .NoMail
if_equal POKEMAIL_LAST_MON, .LastMon
; POKEMAIL_CORRECT
writetext Text_Route31HandOverMailMon
buttonsound
writetext Text_Route31ReadingMail

View File

@ -190,9 +190,9 @@ TrainerFisherRalph1:
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_FISHER_RALPH
if_equal $1, .PhoneFull
if_equal $2, .NumberDeclined
trainertotext FISHER, RALPH1, $0
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext FISHER, RALPH1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@ -324,9 +324,9 @@ TrainerPicnickerLiz1:
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_PICNICKER_LIZ
if_equal $1, .PhoneFull
if_equal $2, .NumberDeclined
trainertotext PICNICKER, LIZ1, $0
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext PICNICKER, LIZ1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted

View File

@ -38,9 +38,9 @@ TrainerHikerAnthony:
scall .AskNumber2
.AskForPhoneNumber:
askforphonenumber PHONE_HIKER_ANTHONY
if_equal $1, .PhoneFull
if_equal $2, .NumberDeclined
trainertotext HIKER, ANTHONY2, $0
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext HIKER, ANTHONY2, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted

View File

@ -59,7 +59,7 @@ DayCareManScript_Outside:
special Special_DayCareManOutside
waitbutton
closetext
if_equal $1, .end_fail
if_equal TRUE, .end_fail
clearflag ENGINE_DAY_CARE_MAN_HAS_EGG
checkcode VAR_FACING
if_equal RIGHT, .walk_around_player
@ -112,9 +112,9 @@ TrainerCamperTodd1:
scall .AskNumber2
.FinishAsk:
askforphonenumber PHONE_CAMPER_TODD
if_equal $1, .PhoneFull
if_equal $2, .NumberDeclined
trainertotext CAMPER, TODD1, $0
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext CAMPER, TODD1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@ -237,9 +237,9 @@ TrainerPicnickerGina1:
scall .AskNumber2
.FinishAsk:
askforphonenumber PHONE_PICNICKER_GINA
if_equal $1, .PhoneFull
if_equal $2, .NumberDeclined
trainertotext PICNICKER, GINA1, $0
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext PICNICKER, GINA1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted

View File

@ -50,9 +50,9 @@ UnknownScript_0x19c8ec:
scall UnknownScript_0x19c907
UnknownScript_0x19c8ef:
askforphonenumber PHONE_JUGGLER_IRWIN
if_equal $1, UnknownScript_0x19c917
if_equal $2, UnknownScript_0x19c913
trainertotext JUGGLER, IRWIN1, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19c917
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19c913
trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0
scall UnknownScript_0x19c90b
jump UnknownScript_0x19c90f
@ -153,9 +153,9 @@ UnknownScript_0x19c9a4:
scall UnknownScript_0x19c907
UnknownScript_0x19c9a7:
askforphonenumber PHONE_BUG_CATCHER_ARNIE
if_equal $1, UnknownScript_0x19c917
if_equal $2, UnknownScript_0x19c913
trainertotext BUG_CATCHER, ARNIE1, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19c917
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19c913
trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0
scall UnknownScript_0x19c90b
jump UnknownScript_0x19c90f

View File

@ -58,8 +58,8 @@ Route35NationalParkGate_MapScriptHeader:
spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
opentext
checkcode VAR_CONTESTMINUTES
addvar $1
RAM2MEM $0
addvar 1
vartomem MEM_BUFFER_0
writetext UnknownText_0x6a79a
yesorno
iffalse .GoBackToContest
@ -94,7 +94,7 @@ OfficerScript_0x6a204:
yesorno
iffalse Route35NationalParkGate_DeclinedToParticipate
checkcode VAR_PARTYCOUNT
if_greater_than $1, Route35NationalParkGate_LeaveTheRestBehind
if_greater_than 1, Route35NationalParkGate_LeaveTheRestBehind
special ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
Route35NationalParkGate_OkayToProceed:
@ -129,13 +129,13 @@ Route35NationalParkGate_FacingLeft:
Route35NationalParkGate_LeaveTheRestBehind:
checkcode VAR_PARTYCOUNT
if_less_than 6, Route35NationalParkGate_LessThanFullParty
if_less_than PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty
checkcode VAR_BOXSPACE
if_equal 0, Route35NationalParkGate_NoRoomInBox
Route35NationalParkGate_LessThanFullParty: ; 6a27d
special CheckFirstMonIsEgg
if_equal $1, Route35NationalParkGate_FirstMonIsEgg
if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg
writetext UnknownText_0x6a4c6
yesorno
iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind

View File

@ -191,9 +191,9 @@ TrainerSchoolboyAlan1:
scall .AskNumber2
.ContinueAskForPhoneNumber:
askforphonenumber PHONE_SCHOOLBOY_ALAN
if_equal $1, .PhoneFull
if_equal $2, .NumberDeclined
trainertotext SCHOOLBOY, ALAN1, $0
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted

View File

@ -67,8 +67,8 @@ Route36NationalParkGate_MapScriptHeader:
spriteface PLAYER, UP
opentext
checkcode VAR_CONTESTMINUTES
addvar $1
RAM2MEM $0
addvar 1
vartomem MEM_BUFFER_0
writetext UnknownText_0x6b284
yesorno
iffalse .GoBackToContest
@ -155,7 +155,7 @@ Route36OfficerScriptContest:
yesorno
iffalse .DecidedNotToJoinContest
checkcode VAR_PARTYCOUNT
if_greater_than $1, .LeaveMonsWithOfficer
if_greater_than 1, .LeaveMonsWithOfficer
special ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
.ResumeStartingContest:
@ -182,12 +182,12 @@ Route36OfficerScriptContest:
.LeaveMonsWithOfficer:
checkcode VAR_PARTYCOUNT
if_less_than $6, .ContinueLeavingMons
if_less_than PARTY_LENGTH, .ContinueLeavingMons
checkcode VAR_BOXSPACE
if_equal $0, .BoxFull
if_equal 0, .BoxFull
.ContinueLeavingMons:
special CheckFirstMonIsEgg
if_equal $1, .FirstMonIsEgg
if_equal TRUE, .FirstMonIsEgg
writetext UnknownText_0x6afb0
yesorno
iffalse .RefusedToLeaveMons

View File

@ -61,9 +61,9 @@ TrainerLassDana1:
scall .AskNumber2F
.AskForPhoneNumber:
askforphonenumber PHONE_LASS_DANA
if_equal $1, .PhoneFull
if_equal $2, .DeclinedPhoneNumber
trainertotext LASS, DANA1, $0
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber
trainertotext LASS, DANA1, MEM_BUFFER_0
scall .RegisteredPhoneNumber
jump .NumberAccepted
@ -197,9 +197,9 @@ TrainerSchoolboyChad1:
scall .AskPhoneNumber2
.AskToRegisterNumber:
askforphonenumber PHONE_SCHOOLBOY_CHAD
if_equal $1, .PhoneFull
if_equal $2, .SaidNo
trainertotext SCHOOLBOY, CHAD1, $0
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .SaidNo
trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0
scall .RegisteredChad
jump .HaveChadsNumber

View File

@ -50,9 +50,9 @@ PokefanMDerekWantsYourNumber:
scall PokefanMDerekAsksNumber2
PokefanMDerekAsksForPhoneNumber:
askforphonenumber PHONE_POKEFANM_DEREK
if_equal $1, PokefanMDerekPhoneFull
if_equal $2, PokefanMDerekDeclined
trainertotext POKEFANM, DEREK1, $0
if_equal PHONE_CONTACTS_FULL, PokefanMDerekPhoneFull
if_equal PHONE_CONTACT_REFUSED, PokefanMDerekDeclined
trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
scall PokefanMDerekRegistered
jump PokefanMDerekAccepted

View File

@ -27,11 +27,11 @@ FarmerMScript_SellMilk:
special PlaceMoneyTopRight
yesorno
iffalse FarmerMScript_NoSale
checkmoney $0, 500
if_equal $2, FarmerMScript_NoMoney
checkmoney YOUR_MONEY, 500
if_equal HAVE_LESS, FarmerMScript_NoMoney
giveitem MOOMOO_MILK
iffalse FarmerMScript_NoRoom
takemoney $0, 500
takemoney YOUR_MONEY, 500
special PlaceMoneyTopRight
waitsfx
playsound SFX_TRANSACTION

View File

@ -61,9 +61,9 @@ UnknownScript_0x1a9268:
scall UnknownScript_0x1a92f5
UnknownScript_0x1a926b:
askforphonenumber PHONE_FISHER_TULLY
if_equal $1, UnknownScript_0x1a9305
if_equal $2, UnknownScript_0x1a9301
trainertotext FISHER, TULLY1, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a9305
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a9301
trainertotext FISHER, TULLY1, MEM_BUFFER_0
scall UnknownScript_0x1a92f9
jump UnknownScript_0x1a92fd

View File

@ -71,9 +71,9 @@ UnknownScript_0x19d0b8:
scall UnknownScript_0x19d130
UnknownScript_0x19d0bb:
askforphonenumber PHONE_POKEMANIAC_BRENT
if_equal $1, UnknownScript_0x19d140
if_equal $2, UnknownScript_0x19d13c
trainertotext POKEMANIAC, BRENT1, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d140
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d13c
trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0
scall UnknownScript_0x19d134
jump UnknownScript_0x19d138
@ -202,9 +202,9 @@ UnknownScript_0x19d1aa:
scall UnknownScript_0x19d23d
UnknownScript_0x19d1ad:
askforphonenumber PHONE_PICNICKER_TIFFANY
if_equal $1, UnknownScript_0x19d24d
if_equal $2, UnknownScript_0x19d249
trainertotext PICNICKER, TIFFANY3, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d24d
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d249
trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0
scall UnknownScript_0x19d241
jump UnknownScript_0x19d245

View File

@ -50,17 +50,17 @@ RocketScript_Southbound:
opentext
writetext RocketText_TollFee
buttonsound
checkmoney $0, ROUTE43GATE_TOLL - 1
if_equal $0, RocketScript_TollSouth
checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
if_equal HAVE_MORE, RocketScript_TollSouth
jump RocketScript_YoureBrokeSouth
RocketScript_TollSouth:
takemoney $0, ROUTE43GATE_TOLL
takemoney YOUR_MONEY, ROUTE43GATE_TOLL
writetext RocketText_ThankYou
jump RocketScript_ShakeDownSouth
RocketScript_YoureBrokeSouth:
takemoney $0, ROUTE43GATE_TOLL
takemoney YOUR_MONEY, ROUTE43GATE_TOLL
writetext RocketText_AllYouGot
jump RocketScript_ShakeDownSouth
@ -82,17 +82,17 @@ RocketScript_Northbound:
opentext
writetext RocketText_TollFee
buttonsound
checkmoney $0, ROUTE43GATE_TOLL - 1
if_equal $0, RocketScript_TollNorth
checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
if_equal HAVE_MORE, RocketScript_TollNorth
jump RocketScript_YoureBrokeNorth
RocketScript_TollNorth:
takemoney $0, ROUTE43GATE_TOLL
takemoney YOUR_MONEY, ROUTE43GATE_TOLL
writetext RocketText_ThankYou
jump RocketScript_ShakeDownNorth
RocketScript_YoureBrokeNorth:
takemoney $0, ROUTE43GATE_TOLL
takemoney YOUR_MONEY, ROUTE43GATE_TOLL
writetext RocketText_AllYouGot
jump RocketScript_ShakeDownNorth

View File

@ -41,9 +41,9 @@ UnknownScript_0x19d853:
scall UnknownScript_0x19d8e3
UnknownScript_0x19d856:
askforphonenumber PHONE_BIRDKEEPER_VANCE
if_equal $1, UnknownScript_0x19d8f3
if_equal $2, UnknownScript_0x19d8ef
trainertotext BIRD_KEEPER, VANCE1, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d8f3
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d8ef
trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0
scall UnknownScript_0x19d8e7
jump UnknownScript_0x19d8eb
@ -185,9 +185,9 @@ UnknownScript_0x19d957:
scall UnknownScript_0x19d8e3
UnknownScript_0x19d95a:
askforphonenumber PHONE_FISHER_WILTON
if_equal $1, UnknownScript_0x19d8f3
if_equal $2, UnknownScript_0x19d8ef
trainertotext FISHER, WILTON1, $0
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d8f3
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d8ef
trainertotext FISHER, WILTON1, MEM_BUFFER_0
scall UnknownScript_0x19d8e7
jump UnknownScript_0x19d8eb

Some files were not shown because too many files have changed in this diff Show More