Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More annotations and interpretations of functions and scripts

This commit is contained in:
PikalaxALT 2015-07-17 17:17:10 -04:00
parent 894955f9d9
commit 0fcef5fc08
32 changed files with 1157 additions and 1157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
constants/event_flags.asm
View File

@ -1,8 +1,8 @@
const_def const_def
const EVENT_CHRIS1_IN_CABLE_CLUB const EVENT_000
const EVENT_CHRIS2_IN_CABLE_CLUB const EVENT_001
const EVENT_002 const EVENT_002
const EVENT_003 const EVENT_003
const EVENT_004 const EVENT_004
@ -1648,6 +1648,9 @@
const EVENT_63D const EVENT_63D
const EVENT_63E const EVENT_63E
const EVENT_63F const EVENT_63F
; Sprite visibility: When these events are cleared, the sprite becomes visible; when set, the sprite is hidden.
; The map script command macros `disappear` and `appear` set/clear these flags and immediately apply the effect on visibility.
; The map script command macros `setevent` and `clearevent` set/clear these flags, and their effects will be seen when the map is reloaded.
const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
@ -1824,8 +1827,8 @@
const EVENT_6ED const EVENT_6ED
const EVENT_6EE const EVENT_6EE
const EVENT_6EF const EVENT_6EF
const EVENT_6F0 const EVENT_GOLDENROD_SALE_OFF
const EVENT_6F1 const EVENT_GOLDENROD_SALE_ON
const EVENT_6F2 const EVENT_6F2
const EVENT_6F3 const EVENT_6F3
const EVENT_6F4 const EVENT_6F4

104
constants/map_constants.asm
View File

@ -580,61 +580,61 @@ MAP_N_A EQU -1
const_value SET $80 const_value SET $80
SPRITE_POKEMON EQU const_value SPRITE_POKEMON EQU const_value
const SPRITE_UNOWN const SPRITE_UNOWN ; 80
const SPRITE_GEODUDE const SPRITE_GEODUDE ; 81
const SPRITE_GROWLITHE const SPRITE_GROWLITHE ; 82
const SPRITE_WEEDLE const SPRITE_WEEDLE ; 83
const SPRITE_SHELLDER const SPRITE_SHELLDER ; 84
const SPRITE_ODDISH const SPRITE_ODDISH ; 85
const SPRITE_GENGAR const SPRITE_GENGAR ; 86
const SPRITE_ZUBAT const SPRITE_ZUBAT ; 87
const SPRITE_MAGIKARP const SPRITE_MAGIKARP ; 88
const SPRITE_SQUIRTLE const SPRITE_SQUIRTLE ; 89
const SPRITE_TOGEPI const SPRITE_TOGEPI ; 8a
const SPRITE_BUTTERFREE const SPRITE_BUTTERFREE ; 8b
const SPRITE_DIGLETT const SPRITE_DIGLETT ; 8c
const SPRITE_POLIWAG const SPRITE_POLIWAG ; 8d
const SPRITE_PIKACHU const SPRITE_PIKACHU ; 8e
const SPRITE_CLEFAIRY const SPRITE_CLEFAIRY ; 8f
const SPRITE_CHARMANDER const SPRITE_CHARMANDER ; 90
const SPRITE_JYNX const SPRITE_JYNX ; 91
const SPRITE_STARMIE const SPRITE_STARMIE ; 92
const SPRITE_BULBASAUR const SPRITE_BULBASAUR ; 93
const SPRITE_JIGGLYPUFF const SPRITE_JIGGLYPUFF ; 94
const SPRITE_GRIMER const SPRITE_GRIMER ; 95
const SPRITE_EKANS const SPRITE_EKANS ; 96
const SPRITE_PARAS const SPRITE_PARAS ; 97
const SPRITE_TENTACOOL const SPRITE_TENTACOOL ; 98
const SPRITE_TAUROS const SPRITE_TAUROS ; 99
const SPRITE_MACHOP const SPRITE_MACHOP ; 9a
const SPRITE_VOLTORB const SPRITE_VOLTORB ; 9b
const SPRITE_LAPRAS const SPRITE_LAPRAS ; 9c
const SPRITE_RHYDON const SPRITE_RHYDON ; 9d
const SPRITE_MOLTRES const SPRITE_MOLTRES ; 9e
const SPRITE_SNORLAX const SPRITE_SNORLAX ; 9f
const SPRITE_GYARADOS const SPRITE_GYARADOS ; a0
const SPRITE_LUGIA const SPRITE_LUGIA ; a1
const SPRITE_HO_OH const SPRITE_HO_OH ; a2
const_value SET $e0 const_value SET $e0
const SPRITE_DAYCARE_MON_1 const SPRITE_DAYCARE_MON_1 ; e0
const SPRITE_DAYCARE_MON_2 const SPRITE_DAYCARE_MON_2 ; e1
const_value SET $f0 const_value SET $f0
SPRITE_VARS EQU const_value SPRITE_VARS EQU const_value
const SPRITE_CONSOLE const SPRITE_CONSOLE ; f0
const SPRITE_DOLL_1 const SPRITE_DOLL_1 ; f1
const SPRITE_DOLL_2 const SPRITE_DOLL_2 ; f2
const SPRITE_BIG_DOLL const SPRITE_BIG_DOLL ; f3
const SPRITE_WEIRD_TREE const SPRITE_WEIRD_TREE ; f4
const SPRITE_OLIVINE_RIVAL const SPRITE_OLIVINE_RIVAL ; f5
const SPRITE_AZALEA_ROCKET const SPRITE_AZALEA_ROCKET ; f6
const SPRITE_FUCHSIA_GYM_1 const SPRITE_FUCHSIA_GYM_1 ; f7
const SPRITE_FUCHSIA_GYM_2 const SPRITE_FUCHSIA_GYM_2 ; f8
const SPRITE_FUCHSIA_GYM_3 const SPRITE_FUCHSIA_GYM_3 ; f9
const SPRITE_FUCHSIA_GYM_4 const SPRITE_FUCHSIA_GYM_4 ; fa
const SPRITE_COPYCAT const SPRITE_COPYCAT ; fb
const SPRITE_JANINE_IMPERSONATOR const SPRITE_JANINE_IMPERSONATOR ; fc
; sprite types ; sprite types
const_value SET 1 const_value SET 1
@ -716,8 +716,8 @@ const_value SET 1
const MAPOBJECT_POINTER_HI ; b const MAPOBJECT_POINTER_HI ; b
const MAPOBJECT_FLAG_LO ; c const MAPOBJECT_FLAG_LO ; c
const MAPOBJECT_FLAG_HI ; d const MAPOBJECT_FLAG_HI ; d
const MAPOBJECT_E const MAPOBJECT_E ; unused
const MAPOBJECT_F const MAPOBJECT_F ; unused
MAPOBJECT_NOT_VISIBLE EQU -1 MAPOBJECT_NOT_VISIBLE EQU -1
MAPOBJECT_SCREEN_HEIGHT EQU 11 MAPOBJECT_SCREEN_HEIGHT EQU 11

68
constants/misc_constants.asm
View File

@ -98,3 +98,71 @@ SWITCH_SOMETIMES EQU 1 << SWITCH_SOMETIMES_F
SWITCH_RARELY EQU 1 << SWITCH_RARELY_F SWITCH_RARELY EQU 1 << SWITCH_RARELY_F
SWITCH_OFTEN EQU 1 << SWITCH_OFTEN_F SWITCH_OFTEN EQU 1 << SWITCH_OFTEN_F
SPRITE_GFX_LIST_CAPACITY EQU $20 SPRITE_GFX_LIST_CAPACITY EQU $20
const_value = 1
const MOM_ITEM
const MOM_DOLL
const_def
const DECO_BED
const DECO_CARPET
const DECO_PLANT
const DECO_POSTER
const DECO_CONSOLE
const DECO_ORNAMENT
const DECO_BIGDOLL
const_def
const CARPET_00
const CARPET_01
const PLANT_02
const PLANT_03
const PLANT_04
const PLANT_05
const CARPET_06
const POSTER_07
const POSTER_08
const POSTER_09
const POSTER_0A
const CARPET_0B
const CARPET_0C
const CARPET_0D
const CARPET_0E
const CARPET_0F
const CARPET_10
const CONSOLE_11
const CONSOLE_12
const CONSOLE_13
const CARPET_14
const CARPET_FAMICOM
const CONSTENT_SNES
const CARPET_N64
const CARPET_VIRTUAL_BOY
const CARPET_19
const BIGDOLL_SNORLAX
const BIGDOLL_ONIX
const BIGDOLL_LAPRAS
const CARPET_1D
const DOLL_PIKACHU
const DOLL_SURFING_PIKACHU
const DOLL_CLEFAIRY
const DOLL_JIGGLYPUFF
const DOLL_BULBASAUR
const DOLL_CHARMANDER
const DOLL_SQUIRTLE
const DOLL_POLIWAG
const DOLL_DIGLETT
const DOLL_STARMIE
const DOLL_MAGIKARP
const DOLL_ODDISH
const DOLL_GENGAR
const DOLL_SHELLDER
const DOLL_GRIMER
const DOLL_VOLTORM
const DOLL_WEEDLE
const DOLL_UNOWN
const DOLL_GEODUDE
const DOLL_MACHOP
const DOLL_TENTACOOL
const CARPET_GOLD_TROPHY
const CARPET_SILVER_TROPHY

34
engine/events_2.asm
View File

@ -271,21 +271,21 @@ Function97db3:: ; 97db3
Function97db5: ; 97db5 Function97db5: ; 97db5
ld hl, StatusFlags2 ld hl, StatusFlags2
bit 4, [hl] bit 4, [hl]
jr z, .asm_97df7 jr z, .NoCall
ld a, [PlayerState] ld a, [PlayerState]
cp $1 cp 1
jr nz, .asm_97df7 jr nz, .NoCall
call Function2d05 call Function2d05
and a and a
jr nz, .asm_97df7 jr nz, .NoCall
ld hl, wdca1 + 1 ld hl, wdca1 + 1
ld a, [hli] ld a, [hli]
ld d, a ld d, a
ld e, [hl] ld e, [hl]
cp $ff cp -1
jr nz, .asm_97dd8 jr nz, .asm_97dd8
ld a, e ld a, e
cp $ff cp -1
jr z, .asm_97ddc jr z, .asm_97ddc
.asm_97dd8 .asm_97dd8
@ -297,34 +297,34 @@ Function97db5: ; 97db5
.asm_97ddc .asm_97ddc
ld a, d ld a, d
cp $4 cp $4
jr c, .asm_97df7 jr c, .NoCall
ld a, [wdc31] ld a, [wSpecialPhoneCallID]
and a and a
jr nz, .asm_97df7 jr nz, .NoCall
ld a, $6 ld a, 6
ld [wdc31], a ld [wSpecialPhoneCallID], a
xor a xor a
ld [wdc31 + 1], a ld [wSpecialPhoneCallID + 1], a
ld hl, StatusFlags2 ld hl, StatusFlags2
res 4, [hl] res 4, [hl]
scf scf
ret ret
.asm_97df7 .NoCall
xor a xor a
ret ret
; 97df9 ; 97df9
Function97df9:: ; 97df9 Function97df9:: ; 97df9
ld hl, wd6de ld hl, wd6de
ld de, $0006 ld de, 6
ld c, $4 ld c, 4
xor a xor a
.asm_97e02 .loop
ld [hl], a ld [hl], a
add hl, de add hl, de
dec c dec c
jr nz, .asm_97e02 jr nz, .loop
ret ret
; 97e08 ; 97e08

2
engine/more_phone_scripts.asm
View File

@ -1656,5 +1656,5 @@ UnknownScript_0xa0b04:
UnknownScript_0xa0b09: UnknownScript_0xa0b09:
farwritetext UnknownText_0x174000 farwritetext UnknownText_0x174000
clearflag ENGINE_BIKE_SHOP_CALL_ENABLED clearflag ENGINE_BIKE_SHOP_CALL_ENABLED
specialphonecall $0000 specialphonecall ELMCALL_NONE
end end

16
engine/phone_scripts.asm
View File

@ -139,7 +139,7 @@ MomPhoneNoGymQuestScript: ; 0xbcfac
MomPhoneLectureScript: ; 0xbcfb1 MomPhoneLectureScript: ; 0xbcfb1
setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
setflag ENGINE_DST setflag ENGINE_DST
specialphonecall $0000 specialphonecall ELMCALL_NONE
farwritetext MomPhoneLectureText farwritetext MomPhoneLectureText
yesorno yesorno
iftrue MomPhoneSaveMoneyScript iftrue MomPhoneSaveMoneyScript
@ -247,7 +247,7 @@ ElmPhoneScript1: ; 0xbd00d
.pokerus ; 0xbd079 .pokerus ; 0xbd079
farwritetext ElmPhonePokerusText farwritetext ElmPhonePokerusText
specialphonecall $0000 specialphonecall ELMCALL_NONE
end end
ElmPhoneScript2: ; 0xbd081 ElmPhoneScript2: ; 0xbd081
@ -258,35 +258,35 @@ ElmPhoneScript2: ; 0xbd081
if_equal $5, .gift if_equal $5, .gift
if_equal $8, .gift if_equal $8, .gift
farwritetext ElmPhonePokerusText farwritetext ElmPhonePokerusText
specialphonecall $0000 specialphonecall ELMCALL_NONE
end end
.disaster ; 0xbd09f .disaster ; 0xbd09f
farwritetext ElmPhoneDisasterText farwritetext ElmPhoneDisasterText
specialphonecall $0000 specialphonecall ELMCALL_NONE
setevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON setevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
end end
.assistant ; 0xbd0aa .assistant ; 0xbd0aa
farwritetext ElmPhoneEggAssistantText farwritetext ElmPhoneEggAssistantText
specialphonecall $0000 specialphonecall ELMCALL_NONE
clearevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER clearevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
setevent EVENT_ELMS_AIDE_IN_LAB setevent EVENT_ELMS_AIDE_IN_LAB
end end
.rocket ; 0xbd0b8 .rocket ; 0xbd0b8
farwritetext ElmPhoneRocketText farwritetext ElmPhoneRocketText
specialphonecall $0000 specialphonecall ELMCALL_NONE
end end
.gift ; 0xbd0c0 .gift ; 0xbd0c0
farwritetext ElmPhoneGiftText farwritetext ElmPhoneGiftText
specialphonecall $0000 specialphonecall ELMCALL_NONE
end end
.unused ; 0xbd0c8 .unused ; 0xbd0c8
farwritetext ElmPhoneUnusedText farwritetext ElmPhoneUnusedText
specialphonecall $0000 specialphonecall ELMCALL_NONE
end end
; bd0d0 ; bd0d0

100
engine/scripting.asm
View File

@ -2450,7 +2450,7 @@ GetMoneyAccount: ; 0x97861
; 0x9786d ; 0x9786d
LoadMoneyAmountToMem: ; 0x9786d LoadMoneyAmountToMem: ; 0x9786d
ld bc, $ffc3 ld bc, hMoneyTemp
push bc push bc
call GetScriptByte call GetScriptByte
ld [bc], a ld [bc], a
@ -2498,8 +2498,8 @@ LoadCoinAmountToMem: ; 978a0
call GetScriptByte call GetScriptByte
ld [$ffc4], a ld [$ffc4], a
call GetScriptByte call GetScriptByte
ld [$ffc3], a ld [hMoneyTemp], a
ld bc, $ffc3 ld bc, hMoneyTemp
ret ret
; 0x978ae ; 0x978ae
@ -2572,6 +2572,7 @@ Script_checkcellnum: ; 0x97904
; script command 0x2a ; script command 0x2a
; parameters: ; parameters:
; person (SingleByteParam) ; person (SingleByteParam)
; returns false if the cell number is not in your phone
xor a xor a
ld [ScriptVar], a ld [ScriptVar], a
@ -2590,16 +2591,17 @@ Script_specialphonecall: ; 0x97919
; call_id (MultiByteParam) ; call_id (MultiByteParam)
call GetScriptByte call GetScriptByte
ld [wdc31], a ld [wSpecialPhoneCallID], a
call GetScriptByte call GetScriptByte
ld [wdc31 + 1], a ld [wSpecialPhoneCallID + 1], a
ret ret
; 0x97926 ; 0x97926
Script_checkphonecall: ; 0x97926 Script_checkphonecall: ; 0x97926
; script command 0x9d ; script command 0x9d
; returns false if no special phone call is stored
ld a, [wdc31] ld a, [wSpecialPhoneCallID]
and a and a
jr z, .ok jr z, .ok
ld a, 1 ld a, 1
@ -2648,6 +2650,7 @@ Script_giveegg: ; 0x97968
; parameters: ; parameters:
; pkmn (PokemonParam) ; pkmn (PokemonParam)
; level (DecimalParam) ; level (DecimalParam)
; if no room in the party, return 0 in ScriptVar; else, return 2
xor a xor a
ld [ScriptVar], a ld [ScriptVar], a
@ -2658,7 +2661,7 @@ Script_giveegg: ; 0x97968
ld [CurPartyLevel], a ld [CurPartyLevel], a
callba GiveEgg callba GiveEgg
ret nc ret nc
ld a, $2 ld a, 2
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 0x97988 ; 0x97988
@ -2672,7 +2675,7 @@ Script_setevent: ; 0x97988
ld e, a ld e, a
call GetScriptByte call GetScriptByte
ld d, a ld d, a
ld b, $1 ld b, 1 ; set
call EventFlagAction call EventFlagAction
ret ret
; 0x97996 ; 0x97996
@ -2686,7 +2689,7 @@ Script_clearevent: ; 0x97996
ld e, a ld e, a
call GetScriptByte call GetScriptByte
ld d, a ld d, a
ld b, $0 ld b, 0 ; clear
call EventFlagAction call EventFlagAction
ret ret
; 0x979a4 ; 0x979a4
@ -2700,13 +2703,13 @@ Script_checkevent: ; 0x979a4
ld e, a ld e, a
call GetScriptByte call GetScriptByte
ld d, a ld d, a
ld b, $2 ld b, 2 ; check
call EventFlagAction call EventFlagAction
ld a, c ld a, c
and a and a
jr z, .asm_979b7 ; 0x979b3 $2 jr z, .false ; 0x979b3 $2
ld a, $1 ld a, 1
.asm_979b7 .false
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 0x979bb ; 0x979bb
@ -2720,7 +2723,7 @@ Script_setflag: ; 0x979bb
ld e, a ld e, a
call GetScriptByte call GetScriptByte
ld d, a ld d, a
ld b, $1 ld b, 1 ; set
call _EngineFlagAction call _EngineFlagAction
ret ret
; 0x979c9 ; 0x979c9
@ -2734,7 +2737,7 @@ Script_clearflag: ; 0x979c9
ld e, a ld e, a
call GetScriptByte call GetScriptByte
ld d, a ld d, a
ld b, $0 ld b, 0 ; clear
call _EngineFlagAction call _EngineFlagAction
ret ret
; 0x979d7 ; 0x979d7
@ -2748,13 +2751,13 @@ Script_checkflag: ; 0x979d7
ld e, a ld e, a
call GetScriptByte call GetScriptByte
ld d, a ld d, a
ld b, $2 ld b, 2 ; check
call _EngineFlagAction call _EngineFlagAction
ld a, c ld a, c
and a and a
jr z, .asm_979ea ; 0x979e6 $2 jr z, .false ; 0x979e6 $2
ld a, $1 ld a, 1
.asm_979ea .false
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 0x979ee ; 0x979ee
@ -2808,7 +2811,7 @@ Script_warpfacing: ; 0x97a0e
set 5, a set 5, a
or c or c
ld [wd45b], a ld [wd45b], a
; 0x97a1d ; fall through
Script_warp: ; 0x97a1d Script_warp: ; 0x97a1d
; script command 0x3c ; script command 0x3c
@ -2818,6 +2821,7 @@ Script_warp: ; 0x97a1d
; x (SingleByteParam) ; x (SingleByteParam)
; y (SingleByteParam) ; y (SingleByteParam)
; This seems to be some sort of error handling case.
call GetScriptByte call GetScriptByte
and a and a
jr z, .not_ok ; 0x97a21 $27 jr z, .not_ok ; 0x97a21 $27
@ -2828,11 +2832,11 @@ Script_warp: ; 0x97a1d
ld [XCoord], a ld [XCoord], a
call GetScriptByte call GetScriptByte
ld [YCoord], a ld [YCoord], a
ld a, $ff ld a, -1
ld [wd001], a ld [wd001], a
ld a, $f1 ld a, -15
ld [$ff9f], a ld [$ff9f], a
ld a, $1 ld a, 1
call LoadMapStatus call LoadMapStatus
call StopScript call StopScript
ret ret
@ -2840,11 +2844,11 @@ Script_warp: ; 0x97a1d
call GetScriptByte call GetScriptByte
call GetScriptByte call GetScriptByte
call GetScriptByte call GetScriptByte
ld a, $ff ld a, -1
ld [wd001], a ld [wd001], a
ld a, $fb ld a, -5
ld [$ff9f], a ld [$ff9f], a
ld a, $1 ld a, 1
call LoadMapStatus call LoadMapStatus
call StopScript call StopScript
ret ret
@ -2882,7 +2886,7 @@ Script_blackoutmod: ; 0x97a78
Script_reloadmapmusic: ; 0x97a85 Script_reloadmapmusic: ; 0x97a85
; script command 0x83 ; script command 0x83
ld a, $1 ld a, 1
ld [wc2c1], a ld [wc2c1], a
ret ret
; 0x97a8b ; 0x97a8b
@ -2913,7 +2917,7 @@ Script_delcmdqueue: ; 0x97a9e
ld b, a ld b, a
callba Function97e5c callba Function97e5c
ret c ret c
ld a, $1 ld a, 1
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 0x97ab3 ; 0x97ab3
@ -2942,10 +2946,10 @@ Script_changeblock: ; 0x97acc
; block (SingleByteParam) ; block (SingleByteParam)
call GetScriptByte call GetScriptByte
add $4 add 4
ld d, a ld d, a
call GetScriptByte call GetScriptByte
add $4 add 4
ld e, a ld e, a
call GetBlockLocation call GetBlockLocation
call GetScriptByte call GetScriptByte
@ -2987,7 +2991,7 @@ Script_newloadmap: ; 0x97b08
call GetScriptByte call GetScriptByte
ld [$ff9f], a ld [$ff9f], a
ld a, $1 ld a, 1
call LoadMapStatus call LoadMapStatus
call StopScript call StopScript
ret ret
@ -3064,14 +3068,14 @@ Script_pause: ; 0x97b47
call GetScriptByte call GetScriptByte
and a and a
jr z, .asm_97b50 ; 0x97b4b $3 jr z, .loop ; 0x97b4b $3
ld [ScriptDelay], a ld [ScriptDelay], a
.asm_97b50 .loop
ld c, 2 ld c, 2
call DelayFrames call DelayFrames
ld hl, ScriptDelay ld hl, ScriptDelay
dec [hl] dec [hl]
jr nz, .asm_97b50 ; 0x97b59 $f5 jr nz, .loop ; 0x97b59 $f5
ret ret
; 0x97b5c ; 0x97b5c
@ -3082,9 +3086,9 @@ Script_deactivatefacing: ; 0x97b5c
call GetScriptByte call GetScriptByte
and a and a
jr z, .asm_97b65 ; 0x97b60 $3 jr z, .no_time ; 0x97b60 $3
ld [ScriptDelay], a ld [ScriptDelay], a
.asm_97b65 .no_time
ld a, SCRIPT_WAIT ld a, SCRIPT_WAIT
ld [ScriptMode], a ld [ScriptMode], a
call StopScript call StopScript
@ -3104,9 +3108,9 @@ Script_end: ; 0x97b74
; script command 0x91 ; script command 0x91
call ExitScriptSubroutine call ExitScriptSubroutine
jr c, .asm_97b7a jr c, .resume
ret ret
.asm_97b7a .resume
xor a xor a
ld [ScriptRunning], a ld [ScriptRunning], a
ld a, SCRIPT_OFF ld a, SCRIPT_OFF
@ -3121,8 +3125,8 @@ Script_return: ; 0x97b8c
; script command 0x90 ; script command 0x90
call ExitScriptSubroutine call ExitScriptSubroutine
jr c, .asm_97b91 jr c, .dummy
.asm_97b91 .dummy
ld hl, ScriptFlags ld hl, ScriptFlags
res 0, [hl] res 0, [hl]
call StopScript call StopScript
@ -3135,17 +3139,15 @@ ExitScriptSubroutine: ; 0x97b9a
ld hl, wd43c ld hl, wd43c
ld a, [hl] ld a, [hl]
and a and a
jr z, .asm_97bbe ; 0x97b9f $1d jr z, .done ; 0x97b9f $1d
dec [hl] dec [hl]
ld e, [hl] ld e, [hl]
ld d, $0 ld d, $0
ld hl, wd43d ld hl, wd43d
add hl, de add_n_times hl, de, 3
add hl, de
add hl, de
ld a, [hli] ld a, [hli]
ld b, a ld b, a
and $7f and " "
ld [ScriptBank], a ld [ScriptBank], a
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -3155,7 +3157,7 @@ ExitScriptSubroutine: ; 0x97b9a
ld [ScriptPos + 1], a ld [ScriptPos + 1], a
and a and a
ret ret
.asm_97bbe .done
scf scf
ret ret
; 0x97bc0 ; 0x97bc0
@ -3208,13 +3210,13 @@ Script_wait: ; 0x97c05
push bc push bc
call GetScriptByte call GetScriptByte
.asm_97c09 .loop
push af push af
ld c, 6 ld c, 6
call DelayFrames call DelayFrames
pop af pop af
dec a dec a
jr nz, .asm_97c09 ; 0x97c11 $f6 jr nz, .loop ; 0x97c11 $f6
pop bc pop bc
ret ret
; 0x97c15 ; 0x97c15
@ -3229,7 +3231,7 @@ Script_unknown0xa9: ; 0x97c15
; 0x97c20 ; 0x97c20
Function97c20: ; 97c20 Function97c20: ; 97c20 unreferenced
ld a, [.byte] ld a, [.byte]
ld [ScriptVar], a ld [ScriptVar], a
ret ret

8
engine/std_scripts.asm
View File

@ -159,7 +159,7 @@ PokeCenterNurseScript:
.pokerus_done .pokerus_done
setflag ENGINE_POKERUS setflag ENGINE_POKERUS
specialphonecall 1 ; elm calls about pokerus specialphonecall ELMCALL_POKERUS
end end
DifficultBookshelfScript: DifficultBookshelfScript:
@ -297,7 +297,7 @@ RadioTowerRocketsScript:
clearevent EVENT_6CE clearevent EVENT_6CE
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_756 setevent EVENT_756
specialphonecall $0004 specialphonecall ELMCALL_WEIRDBROADCAST
domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1 domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1
end end
@ -383,7 +383,7 @@ BugContestResults_CleanUp
; 0xbc31e ; 0xbc31e
BugContestResults_FirstPlace ; 0xbc31e BugContestResults_FirstPlace ; 0xbc31e
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
itemtotext SUN_STONE, $1 itemtotext SUN_STONE, $1
farwritetext ContestResults_PlayerWonAPrizeText farwritetext ContestResults_PlayerWonAPrizeText
closetext closetext
@ -581,7 +581,7 @@ InitializeEventsScript:
setevent EVENT_7A5 setevent EVENT_7A5
setevent EVENT_6EC setevent EVENT_6EC
setevent EVENT_6ED setevent EVENT_6ED
setevent EVENT_6F0 setevent EVENT_GOLDENROD_SALE_OFF
setevent EVENT_7A9 setevent EVENT_7A9
setevent EVENT_EUSINE_IN_BURNED_TOWER setevent EVENT_EUSINE_IN_BURNED_TOWER
setevent EVENT_6C8 setevent EVENT_6C8

2
hram.asm
View File

@ -41,6 +41,8 @@ hProduct EQU $ffb3
hMathBuffer EQU $ffb8 hMathBuffer EQU $ffb8
hMoneyTemp EQU $ffc3
hLCDStatCustom EQU $ffc6 hLCDStatCustom EQU $ffc6
hSerialSend EQU $ffcd hSerialSend EQU $ffcd

2
items/item_effects.asm
View File

@ -2810,7 +2810,7 @@ GorgeousBox: ; f767
; f769 ; f769
Function_0xf769: ; f769 Function_0xf769: ; f769
callba Function26f02 callba SetSpecificDecorationFlag
ld hl, UnknownText_0xf778 ld hl, UnknownText_0xf778
call PrintText call PrintText

1641
main.asm
View File

File diff suppressed because it is too large Load Diff

10
maps/BillsHouse.asm
View File

@ -8,7 +8,7 @@ BillsHouse_MapScriptHeader:
GrampsScript_0x189538: GrampsScript_0x189538:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x1896ba iftrue UnknownScript_0x1896ba
checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1896c0 iftrue UnknownScript_0x1896c0
@ -120,7 +120,7 @@ UnknownScript_0x18963b:
verbosegiveitem EVERSTONE, 1 verbosegiveitem EVERSTONE, 1
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
loadmovesprites loadmovesprites
end end
@ -131,7 +131,7 @@ UnknownScript_0x189652:
verbosegiveitem LEAF_STONE, 1 verbosegiveitem LEAF_STONE, 1
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
loadmovesprites loadmovesprites
end end
@ -142,7 +142,7 @@ UnknownScript_0x189669:
verbosegiveitem WATER_STONE, 1 verbosegiveitem WATER_STONE, 1
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
loadmovesprites loadmovesprites
end end
@ -153,7 +153,7 @@ UnknownScript_0x189680:
verbosegiveitem FIRE_STONE, 1 verbosegiveitem FIRE_STONE, 1
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
loadmovesprites loadmovesprites
end end

4
maps/Colosseum.asm
View File

@ -83,5 +83,5 @@ Colosseum_MapEventHeader:
; people-events ; people-events
db 2 db 2
person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS1_IN_CABLE_CLUB person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000
person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS2_IN_CABLE_CLUB person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001

116
maps/DragonShrine.asm
View File

@ -3,91 +3,91 @@ DragonShrine_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x18d01e, $0000 dw .Trigger1, $0000
dw UnknownScript_0x18d022, $0000 dw .Trigger2, $0000
; callback count ; callback count
db 0 db 0
UnknownScript_0x18d01e: .Trigger1:
priorityjump UnknownScript_0x18d023 priorityjump DragonShrineTestScript
end end
UnknownScript_0x18d022: .Trigger2:
end end
UnknownScript_0x18d023: DragonShrineTestScript:
applymovement $0, MovementData_0x18d2bf applymovement $0, MovementData_0x18d2bf
applymovement $2, MovementData_0x18d2c7 applymovement $2, MovementData_0x18d2c7
loadfont loadfont
writetext UnknownText_0x18d2ea writetext UnknownText_0x18d2ea
keeptextopen keeptextopen
UnknownScript_0x18d030: .Question1:
setevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_001
writetext UnknownText_0x18d3bc writetext UnknownText_0x18d3bc
keeptextopen keeptextopen
loadmenudata MenuDataHeader_0x18d215 loadmenudata MenuDataHeader_0x18d215
interpretmenu2 interpretmenu2
writebackup writebackup
if_equal $1, UnknownScript_0x18d0a9 if_equal $1, .RightAnswer
if_equal $2, UnknownScript_0x18d0cb if_equal $2, .WrongAnswer
if_equal $3, UnknownScript_0x18d0a9 if_equal $3, .RightAnswer
end end
UnknownScript_0x18d049: .Question2:
setevent EVENT_002 setevent EVENT_002
writetext UnknownText_0x18d3d3 writetext UnknownText_0x18d3d3
keeptextopen keeptextopen
loadmenudata MenuDataHeader_0x18d234 loadmenudata MenuDataHeader_0x18d234
interpretmenu2 interpretmenu2
writebackup writebackup
if_equal $1, UnknownScript_0x18d0a9 if_equal $1, .RightAnswer
if_equal $2, UnknownScript_0x18d0a9 if_equal $2, .RightAnswer
if_equal $3, UnknownScript_0x18d0cb if_equal $3, .WrongAnswer
UnknownScript_0x18d061: .Question3:
setevent EVENT_003 setevent EVENT_003
writetext UnknownText_0x18d3f3 writetext UnknownText_0x18d3f3
keeptextopen keeptextopen
loadmenudata MenuDataHeader_0x18d258 loadmenudata MenuDataHeader_0x18d258
interpretmenu2 interpretmenu2
writebackup writebackup
if_equal $1, UnknownScript_0x18d0cb if_equal $1, .WrongAnswer
if_equal $2, UnknownScript_0x18d0a9 if_equal $2, .RightAnswer
if_equal $3, UnknownScript_0x18d0a9 if_equal $3, .RightAnswer
UnknownScript_0x18d079: .Question4:
setevent EVENT_004 setevent EVENT_004
writetext UnknownText_0x18d420 writetext UnknownText_0x18d420
keeptextopen keeptextopen
loadmenudata MenuDataHeader_0x18d283 loadmenudata MenuDataHeader_0x18d283
interpretmenu2 interpretmenu2
writebackup writebackup
if_equal $1, UnknownScript_0x18d0a9 if_equal $1, .RightAnswer
if_equal $2, UnknownScript_0x18d0cb if_equal $2, .WrongAnswer
if_equal $3, UnknownScript_0x18d0a9 if_equal $3, .RightAnswer
UnknownScript_0x18d091: .Question5:
setevent EVENT_005 setevent EVENT_005
writetext UnknownText_0x18d44a writetext UnknownText_0x18d44a
keeptextopen keeptextopen
loadmenudata MenuDataHeader_0x18d2a5 loadmenudata MenuDataHeader_0x18d2a5
interpretmenu2 interpretmenu2
writebackup writebackup
if_equal $1, UnknownScript_0x18d0cb if_equal $1, .WrongAnswer
if_equal $2, UnknownScript_0x18d0a9 if_equal $2, .RightAnswer
if_equal $3, UnknownScript_0x18d0cb if_equal $3, .WrongAnswer
UnknownScript_0x18d0a9: .RightAnswer:
checkevent EVENT_005 checkevent EVENT_005
iftrue UnknownScript_0x18d100 iftrue .PassedTheTest
writetext UnknownText_0x18d82d writetext UnknownText_0x18d82d
keeptextopen keeptextopen
checkevent EVENT_004 checkevent EVENT_004
iftrue UnknownScript_0x18d091 iftrue .Question5
checkevent EVENT_003 checkevent EVENT_003
iftrue UnknownScript_0x18d079 iftrue .Question4
checkevent EVENT_002 checkevent EVENT_002
iftrue UnknownScript_0x18d061 iftrue .Question3
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iftrue UnknownScript_0x18d049 iftrue .Question2
UnknownScript_0x18d0cb: .WrongAnswer:
loadmovesprites loadmovesprites
spriteface $2, LEFT spriteface $2, LEFT
loadfont loadfont
@ -102,16 +102,16 @@ UnknownScript_0x18d0cb:
setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
loadfont loadfont
checkevent EVENT_005 checkevent EVENT_005
iftrue UnknownScript_0x18d091 iftrue .Question5
checkevent EVENT_004 checkevent EVENT_004
iftrue UnknownScript_0x18d079 iftrue .Question4
checkevent EVENT_003 checkevent EVENT_003
iftrue UnknownScript_0x18d061 iftrue .Question3
checkevent EVENT_002 checkevent EVENT_002
iftrue UnknownScript_0x18d049 iftrue .Question2
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iftrue UnknownScript_0x18d030 iftrue .Question1
UnknownScript_0x18d100: .PassedTheTest:
writetext UnknownText_0x18d47c writetext UnknownText_0x18d47c
closetext closetext
loadmovesprites loadmovesprites
@ -160,7 +160,7 @@ UnknownScript_0x18d100:
playsound SFX_GET_BADGE playsound SFX_GET_BADGE
waitbutton waitbutton
special RestartMapMusic special RestartMapMusic
specialphonecall $8 specialphonecall ELMCALL_MASTERBALL
dotrigger $1 dotrigger $1
domaptrigger GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F, $1 domaptrigger GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F, $1
writetext UnknownText_0x18d9f2 writetext UnknownText_0x18d9f2
@ -184,30 +184,30 @@ UnknownScript_0x18d100:
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
disappear $5 disappear $5
waitbutton waitbutton
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
end end
ElderScript_0x18d1a5: ElderScript_0x18d1a5:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x18d1f9 iftrue .DontGiveDratiniYet
checkevent EVENT_006 checkevent EVENT_006
iftrue UnknownScript_0x18d1ff iftrue .ReceivedDratini
checkevent EVENT_GOT_DRATINI checkevent EVENT_GOT_DRATINI
iffalse UnknownScript_0x18d1c5 iffalse .GiveDratini
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iftrue UnknownScript_0x18d1f3 iftrue .BeatRivalInMtMoon
writetext UnknownText_0x18d724 writetext UnknownText_0x18d724
closetext closetext
loadmovesprites loadmovesprites
end end
UnknownScript_0x18d1c5: .GiveDratini:
writetext UnknownText_0x18d604 writetext UnknownText_0x18d604
closetext closetext
checkcode VAR_PARTYCOUNT checkcode VAR_PARTYCOUNT
if_equal $6, UnknownScript_0x18d1ed if_equal 6, .PartyFull
writetext UnknownText_0x18d697 writetext UnknownText_0x18d697
playsound SFX_CAUGHT_MON playsound SFX_CAUGHT_MON
waitbutton waitbutton
@ -221,25 +221,25 @@ UnknownScript_0x18d1c5:
loadmovesprites loadmovesprites
end end
UnknownScript_0x18d1ed: .PartyFull:
writetext UnknownText_0x18d6ac writetext UnknownText_0x18d6ac
closetext closetext
loadmovesprites loadmovesprites
end end
UnknownScript_0x18d1f3: .BeatRivalInMtMoon:
writetext UnknownText_0x18d782 writetext UnknownText_0x18d782
closetext closetext
loadmovesprites loadmovesprites
end end
UnknownScript_0x18d1f9: .DontGiveDratiniYet:
writetext UnknownText_0x18d5e5 writetext UnknownText_0x18d5e5
closetext closetext
loadmovesprites loadmovesprites
end end
UnknownScript_0x18d1ff: .ReceivedDratini:
writetext UnknownText_0x18d6ca writetext UnknownText_0x18d6ca
closetext closetext
loadmovesprites loadmovesprites
@ -681,7 +681,7 @@ DragonShrine_MapEventHeader:
; people-events ; people-events
db 4 db 4
person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_CHRIS1_IN_CABLE_CLUB person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000
person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_CHRIS1_IN_CABLE_CLUB person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000
person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_CHRIS1_IN_CABLE_CLUB person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000
person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_790 person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_790

4
maps/DragonsDenB1F.asm
View File

@ -212,12 +212,12 @@ SilverScript_0x18c97e:
playmusic MUSIC_RIVAL_ENCOUNTER playmusic MUSIC_RIVAL_ENCOUNTER
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x18c995 iftrue UnknownScript_0x18c995
writetext UnknownText_0x18cc83 writetext UnknownText_0x18cc83
closetext closetext
loadmovesprites loadmovesprites
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
special RestartMapMusic special RestartMapMusic
end end

4
maps/EcruteakHouse.asm
View File

@ -86,7 +86,7 @@ UnknownScript_0x98076:
UnknownScript_0x9807c: UnknownScript_0x9807c:
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue UnknownScript_0x980a4 iftrue UnknownScript_0x980a4
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x980aa iftrue UnknownScript_0x980aa
checkitem CLEAR_BELL checkitem CLEAR_BELL
iftrue UnknownScript_0x98093 iftrue UnknownScript_0x98093
@ -102,7 +102,7 @@ UnknownScript_0x98093:
dotrigger $1 dotrigger $1
setevent EVENT_RANG_CLEAR_BELL setevent EVENT_RANG_CLEAR_BELL
clearevent EVENT_766 clearevent EVENT_766
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
end end
UnknownScript_0x980a4: UnknownScript_0x980a4:

36
maps/GoldenrodDeptStoreRoof.asm
View File

@ -7,30 +7,30 @@ GoldenrodDeptStoreRoof_MapScriptHeader:
; callbacks ; callbacks
dbw 1, UnknownScript_0x5671b dbw 1, .CheckSaleChangeBlock
dbw 2, UnknownScript_0x5672b dbw 2, .CheckSaleChangeClerk
UnknownScript_0x5671b: .CheckSaleChangeBlock:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
iftrue UnknownScript_0x56722 iftrue .ChangeBlock
return return
UnknownScript_0x56722: .ChangeBlock:
changeblock $0, $2, $3f changeblock $0, $2, $3f
changeblock $0, $4, $f changeblock $0, $4, $f
return return
UnknownScript_0x5672b: .CheckSaleChangeClerk:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
iftrue UnknownScript_0x56738 iftrue .ChangeClerk
setevent EVENT_6F0 setevent EVENT_GOLDENROD_SALE_OFF
clearevent EVENT_6F1 clearevent EVENT_GOLDENROD_SALE_ON
return return
UnknownScript_0x56738: .ChangeClerk:
clearevent EVENT_6F0 clearevent EVENT_GOLDENROD_SALE_OFF
setevent EVENT_6F1 setevent EVENT_GOLDENROD_SALE_ON
return return
ClerkScript_0x5673f: ClerkScript_0x5673f:
@ -225,11 +225,11 @@ GoldenrodDeptStoreRoof_MapEventHeader:
; people-events ; people-events
db 8 db 8
person_event SPRITE_CLERK, 8, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x5673f, EVENT_6F0 person_event SPRITE_CLERK, 8, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
person_event SPRITE_POKEFAN_F, 7, 14, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x56746, -1 person_event SPRITE_POKEFAN_F, 7, 14, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x56746, -1
person_event SPRITE_FISHER, 5, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x56749, -1 person_event SPRITE_FISHER, 5, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x56749, -1
person_event SPRITE_TWIN, 8, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56754, EVENT_6F1 person_event SPRITE_TWIN, 8, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON
person_event SPRITE_SUPER_NERD, 10, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x56757, EVENT_6F1 person_event SPRITE_SUPER_NERD, 10, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
person_event SPRITE_POKEFAN_M, 4, 11, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanMScript_0x5676a, EVENT_6F0 person_event SPRITE_POKEFAN_M, 4, 11, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF
person_event SPRITE_TEACHER, 7, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5676d, EVENT_6F0 person_event SPRITE_TEACHER, 7, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF
person_event SPRITE_BUG_CATCHER, 10, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x56770, EVENT_6F0 person_event SPRITE_BUG_CATCHER, 10, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF

6
maps/HallOfFame.asm
View File

@ -40,9 +40,9 @@ HallOfFameScript:
domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1 domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1
special HealParty special HealParty
checkevent EVENT_GOT_SS_TICKET_FROM_ELM checkevent EVENT_GOT_SS_TICKET_FROM_ELM
iftrue HallOfFame_SkipPhoneCall iftrue .SkipPhoneCall
specialphonecall $5 specialphonecall ELMCALL_SSTICKET
HallOfFame_SkipPhoneCall: .SkipPhoneCall:
halloffame halloffame
end end

10
maps/KrissHouse1F.asm
View File

@ -16,13 +16,13 @@ UnknownScript_0x7a4d7:
end end
UnknownScript_0x7a4d8: UnknownScript_0x7a4d8:
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
UnknownScript_0x7a4db: UnknownScript_0x7a4db:
playmusic MUSIC_MOM playmusic MUSIC_MOM
showemote EMOTE_SHOCK, $2, 15 showemote EMOTE_SHOCK, $2, 15
spriteface $0, LEFT spriteface $0, LEFT
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x7a4f2 iffalse UnknownScript_0x7a4f2
applymovement $2, MovementData_0x7a5fc applymovement $2, MovementData_0x7a5fc
jump UnknownScript_0x7a4f6 jump UnknownScript_0x7a4f6
@ -77,9 +77,9 @@ UnknownScript_0x7a549:
writetext UnknownText_0x7a850 writetext UnknownText_0x7a850
closetext closetext
loadmovesprites loadmovesprites
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x7a55d iftrue UnknownScript_0x7a55d
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iffalse UnknownScript_0x7a564 iffalse UnknownScript_0x7a564
jump UnknownScript_0x7a56b jump UnknownScript_0x7a56b
@ -109,7 +109,7 @@ UnknownScript_0x7a57e:
MomScript_0x7a582: MomScript_0x7a582:
faceplayer faceplayer
setevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_001
checktriggers checktriggers
iffalse UnknownScript_0x7a572 iffalse UnknownScript_0x7a572
loadfont loadfont

14
maps/KurtsHouse.asm
View File

@ -70,7 +70,7 @@ UnknownScript_0x18e1bf:
iffalse UnknownScript_0x18e2b2 iffalse UnknownScript_0x18e2b2
setevent EVENT_035 setevent EVENT_035
UnknownScript_0x18e1cc: UnknownScript_0x18e1cc:
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x18e29f iftrue UnknownScript_0x18e29f
checkevent EVENT_258 checkevent EVENT_258
iftrue UnknownScript_0x18e2b4 iftrue UnknownScript_0x18e2b4
@ -89,7 +89,7 @@ UnknownScript_0x18e1cc:
checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
iftrue UnknownScript_0x18e34e iftrue UnknownScript_0x18e34e
UnknownScript_0x18e202: UnknownScript_0x18e202:
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iftrue UnknownScript_0x18e212 iftrue UnknownScript_0x18e212
checkevent EVENT_002 checkevent EVENT_002
iftrue UnknownScript_0x18e212 iftrue UnknownScript_0x18e212
@ -110,7 +110,7 @@ UnknownScript_0x18e212:
iftrue UnknownScript_0x18e249 iftrue UnknownScript_0x18e249
checkitem PNK_APRICORN checkitem PNK_APRICORN
iftrue UnknownScript_0x18e249 iftrue UnknownScript_0x18e249
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iftrue UnknownScript_0x18e2ae iftrue UnknownScript_0x18e2ae
checkevent EVENT_002 checkevent EVENT_002
iftrue UnknownScript_0x18e243 iftrue UnknownScript_0x18e243
@ -163,7 +163,7 @@ UnknownScript_0x18e293:
jump UnknownScript_0x18e299 jump UnknownScript_0x18e299
UnknownScript_0x18e299: UnknownScript_0x18e299:
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
setflag ENGINE_KURT_MAKING_BALLS setflag ENGINE_KURT_MAKING_BALLS
UnknownScript_0x18e29f: UnknownScript_0x18e29f:
writetext UnknownText_0x18e779 writetext UnknownText_0x18e779
@ -178,7 +178,7 @@ UnknownScript_0x18e2a5:
end end
UnknownScript_0x18e2ab: UnknownScript_0x18e2ab:
setevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_001
UnknownScript_0x18e2ae: UnknownScript_0x18e2ae:
writetext UnknownText_0x18e82a writetext UnknownText_0x18e82a
closetext closetext
@ -349,9 +349,9 @@ UnknownScript_0x18e3e0:
KurtsGranddaughter1: KurtsGranddaughter1:
faceplayer faceplayer
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue KurtsGranddaughter2Subscript iftrue KurtsGranddaughter2Subscript
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iftrue KurtsGranddaughterFunScript iftrue KurtsGranddaughterFunScript
checkevent EVENT_FOREST_IS_RESTLESS checkevent EVENT_FOREST_IS_RESTLESS
iftrue .Lonely iftrue .Lonely

2
maps/MrPokemonsHouse.asm
View File

@ -126,7 +126,7 @@ UnknownScript_0x196ec9:
dotrigger $1 dotrigger $1
domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1 domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1
domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3
specialphonecall $2 specialphonecall ELMCALL_ROBBED
clearevent EVENT_COP_IN_ELMS_LAB clearevent EVENT_COP_IN_ELMS_LAB
checkevent EVENT_GOT_TOTODILE_FROM_ELM checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x196f49 iftrue UnknownScript_0x196f49

14
maps/OlivinePort.asm
View File

@ -20,14 +20,14 @@ UnknownScript_0x748b1:
applymovement $0, MovementData_0x74a32 applymovement $0, MovementData_0x74a32
appear $2 appear $2
dotrigger $0 dotrigger $0
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY
end end
SailorScript_0x748c0: SailorScript_0x748c0:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x74919 iftrue UnknownScript_0x74919
writetext UnknownText_0x74a55 writetext UnknownText_0x74a55
closetext closetext
@ -69,9 +69,9 @@ UnknownScript_0x74919:
UnknownScript_0x7491f: UnknownScript_0x7491f:
spriteface $4, RIGHT spriteface $4, RIGHT
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x7498b iftrue UnknownScript_0x7498b
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iftrue UnknownScript_0x7498b iftrue UnknownScript_0x7498b
spriteface $0, LEFT spriteface $0, LEFT
loadfont loadfont
@ -94,7 +94,7 @@ UnknownScript_0x7494e:
writetext UnknownText_0x74b11 writetext UnknownText_0x74b11
closetext closetext
loadmovesprites loadmovesprites
setevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_001
applymovement $0, MovementData_0x74a37 applymovement $0, MovementData_0x74a37
jump SailorScript_0x748c0 jump SailorScript_0x748c0
@ -138,7 +138,7 @@ UnknownScript_0x74992:
SailorScript_0x7499c: SailorScript_0x7499c:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x74919 iftrue UnknownScript_0x74919
checkevent EVENT_030 checkevent EVENT_030
iffalse UnknownScript_0x749c0 iffalse UnknownScript_0x749c0
@ -159,7 +159,7 @@ UnknownScript_0x749c0:
writetext UnknownText_0x74b11 writetext UnknownText_0x74b11
closetext closetext
loadmovesprites loadmovesprites
setevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_001
checkcode VAR_FACING checkcode VAR_FACING
if_equal $3, UnknownScript_0x749e5 if_equal $3, UnknownScript_0x749e5
applymovement $0, MovementData_0x74a3f applymovement $0, MovementData_0x74a3f

4
maps/PokeCenter2F.asm
View File

@ -17,7 +17,7 @@ PokeCenter2F_MapScriptHeader:
special Special_CheckMysteryGift special Special_CheckMysteryGift
if_equal $0, .Trigger1Done if_equal $0, .Trigger1Done
clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iftrue .Trigger1Done iftrue .Trigger1Done
priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy
@ -46,7 +46,7 @@ PokeCenter2F_MapScriptHeader:
PokeCenter2F_AppearMysteryGiftDeliveryGuy: PokeCenter2F_AppearMysteryGiftDeliveryGuy:
appear $5 appear $5
setevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_001
end end
Script_TradeCenterClosed: Script_TradeCenterClosed:

2
maps/Route31.asm
View File

@ -15,7 +15,7 @@ UnknownScript_0x1a543c:
return return
UnknownScript_0x1a5443: UnknownScript_0x1a5443:
specialphonecall $7 specialphonecall MOMCALL_WORRIED
return return
TrainerBug_catcherWade1: TrainerBug_catcherWade1:

20
maps/Route36NationalParkgate.asm
View File

@ -300,7 +300,7 @@ UnknownScript_0x6ad02:
YoungsterScript_0x6ad06: YoungsterScript_0x6ad06:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x6ad14 iffalse UnknownScript_0x6ad14
writetext UnknownText_0x6b399 writetext UnknownText_0x6b399
closetext closetext
@ -316,7 +316,7 @@ UnknownScript_0x6ad14:
YoungsterScript_0x6ad1a: YoungsterScript_0x6ad1a:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x6ad28 iffalse UnknownScript_0x6ad28
writetext UnknownText_0x6b40f writetext UnknownText_0x6b40f
closetext closetext
@ -332,7 +332,7 @@ UnknownScript_0x6ad28:
RockerScript_0x6ad2e: RockerScript_0x6ad2e:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x6ad3c iffalse UnknownScript_0x6ad3c
writetext UnknownText_0x6b462 writetext UnknownText_0x6b462
closetext closetext
@ -348,7 +348,7 @@ UnknownScript_0x6ad3c:
PokefanMScript_0x6ad42: PokefanMScript_0x6ad42:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x6ad50 iffalse UnknownScript_0x6ad50
writetext UnknownText_0x6b4da writetext UnknownText_0x6b4da
closetext closetext
@ -364,7 +364,7 @@ UnknownScript_0x6ad50:
YoungsterScript_0x6ad56: YoungsterScript_0x6ad56:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x6ad64 iffalse UnknownScript_0x6ad64
writetext UnknownText_0x6b54e writetext UnknownText_0x6b54e
closetext closetext
@ -380,7 +380,7 @@ UnknownScript_0x6ad64:
YoungsterScript_0x6ad6a: YoungsterScript_0x6ad6a:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x6ad78 iffalse UnknownScript_0x6ad78
writetext UnknownText_0x6b5b0 writetext UnknownText_0x6b5b0
closetext closetext
@ -396,7 +396,7 @@ UnknownScript_0x6ad78:
LassScript_0x6ad7e: LassScript_0x6ad7e:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x6ad8c iffalse UnknownScript_0x6ad8c
writetext UnknownText_0x6b64b writetext UnknownText_0x6b64b
closetext closetext
@ -412,7 +412,7 @@ UnknownScript_0x6ad8c:
YoungsterScript_0x6ad92: YoungsterScript_0x6ad92:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x6ada0 iffalse UnknownScript_0x6ada0
writetext UnknownText_0x6b6b8 writetext UnknownText_0x6b6b8
closetext closetext
@ -428,7 +428,7 @@ UnknownScript_0x6ada0:
YoungsterScript_0x6ada6: YoungsterScript_0x6ada6:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x6adb4 iffalse UnknownScript_0x6adb4
writetext UnknownText_0x6b71b writetext UnknownText_0x6b71b
closetext closetext
@ -444,7 +444,7 @@ UnknownScript_0x6adb4:
YoungsterScript_0x6adba: YoungsterScript_0x6adba:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iffalse UnknownScript_0x6adc8 iffalse UnknownScript_0x6adc8
writetext UnknownText_0x6b76f writetext UnknownText_0x6b76f
closetext closetext

4
maps/TimeCapsule.asm
View File

@ -73,5 +73,5 @@ TimeCapsule_MapEventHeader:
; people-events ; people-events
db 2 db 2
person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_CHRIS1_IN_CABLE_CLUB person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_000
person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_CHRIS2_IN_CABLE_CLUB person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_001

4
maps/TradeCenter.asm
View File

@ -73,5 +73,5 @@ TradeCenter_MapEventHeader:
; people-events ; people-events
db 2 db 2
person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS1_IN_CABLE_CLUB person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000
person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS2_IN_CABLE_CLUB person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001

14
maps/VermilionPort.asm
View File

@ -32,14 +32,14 @@ UnknownScript_0x74da6:
setevent EVENT_739 setevent EVENT_739
clearevent EVENT_733 clearevent EVENT_733
setevent EVENT_030 setevent EVENT_030
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY
end end
SailorScript_0x74dc4: SailorScript_0x74dc4:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x74e1a iftrue UnknownScript_0x74e1a
writetext UnknownText_0x74f06 writetext UnknownText_0x74f06
closetext closetext
@ -79,9 +79,9 @@ UnknownScript_0x74e1a:
UnknownScript_0x74e20: UnknownScript_0x74e20:
spriteface $3, RIGHT spriteface $3, RIGHT
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x74e86 iftrue UnknownScript_0x74e86
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iftrue UnknownScript_0x74e86 iftrue UnknownScript_0x74e86
spriteface $0, LEFT spriteface $0, LEFT
loadfont loadfont
@ -101,7 +101,7 @@ UnknownScript_0x74e20:
writetext UnknownText_0x74fc2 writetext UnknownText_0x74fc2
closetext closetext
loadmovesprites loadmovesprites
setevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_001
applymovement $0, MovementData_0x74ef8 applymovement $0, MovementData_0x74ef8
jump SailorScript_0x74dc4 jump SailorScript_0x74dc4
@ -145,7 +145,7 @@ UnknownScript_0x74e8d:
SailorScript_0x74e97: SailorScript_0x74e97:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x74e1a iftrue UnknownScript_0x74e1a
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_equal MONDAY, UnknownScript_0x74eda if_equal MONDAY, UnknownScript_0x74eda
@ -163,7 +163,7 @@ SailorScript_0x74e97:
writetext UnknownText_0x74fc2 writetext UnknownText_0x74fc2
closetext closetext
loadmovesprites loadmovesprites
setevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_001
applymovement $0, MovementData_0x74efe applymovement $0, MovementData_0x74efe
jump SailorScript_0x74dc4 jump SailorScript_0x74dc4

10
maps/VioletGym.asm
View File

@ -27,25 +27,25 @@ FalknerScript_0x683c2:
scall VioletGymTriggerRockets scall VioletGymTriggerRockets
.FightDone .FightDone
checkevent EVENT_GOT_TM31_MUD_SLAP checkevent EVENT_GOT_TM31_MUD_SLAP
iftrue UnknownScript_0x68412 iftrue .SpeechAfterTM
setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ROD
setevent EVENT_BEAT_BIRD_KEEPER_ABE setevent EVENT_BEAT_BIRD_KEEPER_ABE
domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $2 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $2
specialphonecall $3 specialphonecall ELMCALL_ASSISTANT
writetext UnknownText_0x685c8 writetext UnknownText_0x685c8
keeptextopen keeptextopen
verbosegiveitem TM_MUD_SLAP, 1 verbosegiveitem TM_MUD_SLAP, 1
iffalse UnknownScript_0x68416 iffalse .NoRoomForMudSlap
setevent EVENT_GOT_TM31_MUD_SLAP setevent EVENT_GOT_TM31_MUD_SLAP
writetext UnknownText_0x68648 writetext UnknownText_0x68648
closetext closetext
loadmovesprites loadmovesprites
end end
UnknownScript_0x68412: .SpeechAfterTM:
writetext UnknownText_0x68735 writetext UnknownText_0x68735
closetext closetext
UnknownScript_0x68416: .NoRoomForMudSlap:
loadmovesprites loadmovesprites
end end

32
maps/WarehouseEntrance.asm
View File

@ -265,20 +265,20 @@ UnknownScript_0x7c173:
jump UnknownScript_0x7c1c1 jump UnknownScript_0x7c1c1
UnknownScript_0x7c1a9: UnknownScript_0x7c1a9:
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
clearevent EVENT_CHRIS2_IN_CABLE_CLUB clearevent EVENT_001
clearevent EVENT_002 clearevent EVENT_002
jump UnknownScript_0x7c1cd jump UnknownScript_0x7c1cd
UnknownScript_0x7c1b5: UnknownScript_0x7c1b5:
clearevent EVENT_CHRIS1_IN_CABLE_CLUB clearevent EVENT_000
setevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_001
clearevent EVENT_002 clearevent EVENT_002
jump UnknownScript_0x7c1cd jump UnknownScript_0x7c1cd
UnknownScript_0x7c1c1: UnknownScript_0x7c1c1:
clearevent EVENT_CHRIS1_IN_CABLE_CLUB clearevent EVENT_000
clearevent EVENT_CHRIS2_IN_CABLE_CLUB clearevent EVENT_001
setevent EVENT_002 setevent EVENT_002
jump UnknownScript_0x7c1cd jump UnknownScript_0x7c1cd
@ -296,9 +296,9 @@ UnknownScript_0x7c1cd:
loadfont loadfont
writetext UnknownText_0x7c6d8 writetext UnknownText_0x7c6d8
closetext closetext
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x7c2bb iftrue UnknownScript_0x7c2bb
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iftrue UnknownScript_0x7c2c4 iftrue UnknownScript_0x7c2c4
jump UnknownScript_0x7c2cd jump UnknownScript_0x7c2cd
@ -348,20 +348,20 @@ UnknownScript_0x7c220:
jump UnknownScript_0x7c26e jump UnknownScript_0x7c26e
UnknownScript_0x7c256: UnknownScript_0x7c256:
setevent EVENT_CHRIS1_IN_CABLE_CLUB setevent EVENT_000
clearevent EVENT_CHRIS2_IN_CABLE_CLUB clearevent EVENT_001
clearevent EVENT_002 clearevent EVENT_002
jump UnknownScript_0x7c27a jump UnknownScript_0x7c27a
UnknownScript_0x7c262: UnknownScript_0x7c262:
clearevent EVENT_CHRIS1_IN_CABLE_CLUB clearevent EVENT_000
setevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_001
clearevent EVENT_002 clearevent EVENT_002
jump UnknownScript_0x7c27a jump UnknownScript_0x7c27a
UnknownScript_0x7c26e: UnknownScript_0x7c26e:
clearevent EVENT_CHRIS1_IN_CABLE_CLUB clearevent EVENT_000
clearevent EVENT_CHRIS2_IN_CABLE_CLUB clearevent EVENT_001
setevent EVENT_002 setevent EVENT_002
jump UnknownScript_0x7c27a jump UnknownScript_0x7c27a
@ -379,9 +379,9 @@ UnknownScript_0x7c27a:
loadfont loadfont
writetext UnknownText_0x7c82a writetext UnknownText_0x7c82a
closetext closetext
checkevent EVENT_CHRIS1_IN_CABLE_CLUB checkevent EVENT_000
iftrue UnknownScript_0x7c2bb iftrue UnknownScript_0x7c2bb
checkevent EVENT_CHRIS2_IN_CABLE_CLUB checkevent EVENT_001
iftrue UnknownScript_0x7c2c4 iftrue UnknownScript_0x7c2c4
jump UnknownScript_0x7c2cd jump UnknownScript_0x7c2cd

12
text/common_4.asm
View File

@ -542,7 +542,7 @@ UnknownText_0x1c4c08: ; 0x1c4c08
text_from_ram StringBuffer2 text_from_ram StringBuffer2
text "(S)" text "(S)"
line "will be ¥@" line "will be ¥@"
deciram $ffc3, $36 deciram hMoneyTemp, $36
text "." text "."
done done
; 0x1c4c28 ; 0x1c4c28
@ -574,7 +574,7 @@ UnknownText_0x1c4cae: ; 0x1c4cae
text_from_ram StringBuffer2 text_from_ram StringBuffer2
text "(S)" text "(S)"
line "will be ¥@" line "will be ¥@"
deciram $ffc3, $36 deciram hMoneyTemp, $36
text "." text "."
done done
; 0x1c4cce ; 0x1c4cce
@ -619,7 +619,7 @@ UnknownText_0x1c4db0: ; 0x1c4db0
text_from_ram StringBuffer2 text_from_ram StringBuffer2
text " costs" text " costs"
line "¥@" line "¥@"
deciram $ffc3, $36 deciram hMoneyTemp, $36
text ". Want it?" text ". Want it?"
done done
; 0x1c4dcd ; 0x1c4dcd
@ -671,7 +671,7 @@ UnknownText_0x1c4e89: ; 0x1c4e89
text_from_ram StringBuffer2 text_from_ram StringBuffer2
text "(S)" text "(S)"
line "will cost ¥@" line "will cost ¥@"
deciram $ffc3, $36 deciram hMoneyTemp, $36
text "." text "."
done done
; 0x1c4eab ; 0x1c4eab
@ -713,7 +713,7 @@ UnknownText_0x1c4f33: ; 0x1c4f33
UnknownText_0x1c4f3e: ; 0x1c4f3e UnknownText_0x1c4f3e: ; 0x1c4f3e
text "I can pay you" text "I can pay you"
line "¥@" line "¥@"
deciram $ffc3, $36 deciram hMoneyTemp, $36
text "." text "."
para "Is that OK?" para "Is that OK?"
@ -763,7 +763,7 @@ UnknownText_0x1c500d: ; 0x1c500d
UnknownText_0x1c502e: ; 0x1c502e UnknownText_0x1c502e: ; 0x1c502e
text "Got ¥@" text "Got ¥@"
deciram $ffc3, $36 deciram hMoneyTemp, $36
text " for" text " for"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram StringBuffer2

4
wram.asm
View File

@ -1381,6 +1381,7 @@ EngineBuffer1:: ; d03e
ds 1 ds 1
wd03f:: wd03f::
CurFruit:: ; d03f CurFruit:: ; d03f
MartPointerBank::
ds 1 ds 1
wd040:: wd040::
@ -2346,7 +2347,8 @@ FruitTreeFlags:: ; dc27
ds 5 ds 5
wdc2d:: ds 4 wdc2d:: ds 4
wdc31:: ds 4 wSpecialPhoneCallID:: ds 2
wdc33:: ds 2
wdc35:: ds 4 wdc35:: ds 4
wdc39:: ds 1 wdc39:: ds 1
wdc3a:: ds 1 wdc3a:: ds 1