pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Battle Tower scripts and text labels

Browse Source
This commit is contained in:
PikalaxALT 2015-11-26 21:05:32 -05:00
parent 01792e00d2
commit c7985e1f3c
46 changed files with 434 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
constants/battle_tower_constants.asm
View File

@ -1,33 +1,39 @@
const_def const_def
const BATTLE_TOWER_ACTION_00 const BATTLETOWERACTION_00
const BATTLE_TOWER_ACTION_01 const BATTLETOWERACTION_01
const BATTLE_TOWER_ACTION_02 const BATTLETOWERACTION_02
const BATTLE_TOWER_ACTION_03 const BATTLETOWERACTION_03
const BATTLE_TOWER_ACTION_04 const BATTLETOWERACTION_CHALLENGECANCELED
const BATTLE_TOWER_ACTION_05 const BATTLETOWERACTION_05
const BATTLE_TOWER_ACTION_06 const BATTLETOWERACTION_06 ; reset stuff in SRAM bank 5
const BATTLE_TOWER_ACTION_07 const BATTLETOWERACTION_SAVELEVELGROUP
const BATTLE_TOWER_ACTION_08 const BATTLETOWERACTION_LOADLEVELGROUP
const BATTLE_TOWER_ACTION_09 const BATTLETOWERACTION_CHECKSAVEFILEISYOURS
const BATTLE_TOWER_ACTION_0A const BATTLETOWERACTION_0A
const BATTLE_TOWER_ACTION_0B const BATTLETOWERACTION_CHECKMOBILEEVENT
const BATTLE_TOWER_ACTION_0C const BATTLETOWERACTION_0C ; more time stuff in SRAM bank 5
const BATTLE_TOWER_ACTION_0D const BATTLETOWERACTION_0D ; more time stuff in SRAM bank 5
const BATTLE_TOWER_ACTION_0E const BATTLETOWERACTION_0E ; egg ticket
const BATTLE_TOWER_ACTION_0F const BATTLETOWERACTION_0F ; check w3_d090
const BATTLE_TOWER_ACTION_10 const BATTLETOWERACTION_10 ; jumptable based on 5:a800
const BATTLE_TOWER_ACTION_11 const BATTLETOWERACTION_11 ; store 0 in 5:aa8d
const BATTLE_TOWER_ACTION_12 const BATTLETOWERACTION_12 ; store 1 in 5:aa8d
const BATTLE_TOWER_ACTION_13 const BATTLETOWERACTION_13 ; check 5:aa8d
const BATTLE_TOWER_ACTION_14 const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [sbe4f]
const BATTLE_TOWER_ACTION_15 const BATTLETOWERACTION_15 ; set 0, [sbe4f]
const BATTLE_TOWER_ACTION_16 const BATTLETOWERACTION_16 ; update time in SRAM bank 5
const BATTLE_TOWER_ACTION_17 const BATTLETOWERACTION_17 ; check time in SRAM bank 5
const BATTLE_TOWER_ACTION_18 const BATTLETOWERACTION_18 ; level check
const BATTLE_TOWER_ACTION_19 const BATTLETOWERACTION_19 ; ubers check
const BATTLE_TOWER_ACTION_1A const BATTLETOWERACTION_RESETDATA ; clear data
const BATTLE_TOWER_ACTION_1B const BATTLETOWERACTION_1B ; give reward
const BATTLE_TOWER_ACTION_1C const BATTLETOWERACTION_1C ; set won challenge
const BATTLE_TOWER_ACTION_1D const BATTLETOWERACTION_1D ; set received reward
const BATTLE_TOWER_ACTION_1E const BATTLETOWERACTION_1E ; save options
const BATTLE_TOWER_ACTION_1F const BATTLETOWERACTION_CHOOSEREWARD
BATTLETOWER_NO_CHALLENGE EQU 0
BATTLETOWER_SAVED_AND_LEFT EQU 1
BATTLETOWER_CHALLENGE_IN_PROGESS EQU 2
BATTLETOWER_WON_CHALLENGE EQU 3
BATTLETOWER_RECEIVED_REWARD EQU 4

2
engine/credits.asm
View File

@ -118,7 +118,7 @@ const_value SET -7
const CREDITS_END const CREDITS_END
Function109847:: ; 109847 Credits:: ; 109847
bit 6, b bit 6, b
ld a, $0 ld a, $0
jr z, .asm_10984f jr z, .asm_10984f

16
engine/evolution_animation.asm
View File

@ -389,14 +389,14 @@ Function4e881: ; 4e881
ld [hSCY], a ld [hSCY], a
ld [hSCX], a ld [hSCX], a
call EnableLCD call EnableLCD
ld hl, UnknownText_0x4e8bd ld hl, .SavingRecordDontTurnOff
call PrintText call PrintText
call Function3200 call Function3200
call SetPalettes call SetPalettes
ret ret
; 4e8bd ; 4e8bd
UnknownText_0x4e8bd: ; 0x4e8bd .SavingRecordDontTurnOff: ; 0x4e8bd
; SAVING RECORD… DON'T TURN OFF! ; SAVING RECORD… DON'T TURN OFF!
text_jump UnknownText_0x1bd39e text_jump UnknownText_0x1bd39e
db "@" db "@"
@ -418,15 +418,15 @@ Function4e8c2: ; 4e8c2
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
xor a xor a
call ByteFill call ByteFill
ld hl, wd000 ld hl, wd000 ; UnknBGPals
ld c, $40 ld c, 4 * $10
.asm_4e8ee .load_white_palettes
ld a, -1 ld a, (palred 31 + palgreen 31 + palblue 31) % $100
ld [hli], a ld [hli], a
ld a, " " ld a, (palred 31 + palgreen 31 + palblue 31) / $100
ld [hli], a ld [hli], a
dec c dec c
jr nz, .asm_4e8ee jr nz, .load_white_palettes
xor a xor a
ld [hSCY], a ld [hSCY], a
ld [hSCX], a ld [hSCX], a

4
engine/map_setup.asm
View File

@ -272,8 +272,8 @@ MapSetupCommands: ; 15440
dba LoadMapAttributes ; 1a dba LoadMapAttributes ; 1a
dba LoadMapAttributes_SkipPeople ; 1b dba LoadMapAttributes_SkipPeople ; 1b
dba ClearBGPalettes ; 1c dba ClearBGPalettes ; 1c
dba RotatePalettesRightPalettes ; 1d dba FadeOutPalettes ; 1d
dba RotatePalettesLeftPalettes ; 1e dba FadeInPalettes ; 1e
dba GetCoordOfUpperLeftCorner ; 1f dba GetCoordOfUpperLeftCorner ; 1f
dba RestoreFacingAfterWarp ; 20 dba RestoreFacingAfterWarp ; 20
dba SpawnInFacingDown ; 21 dba SpawnInFacingDown ; 21

18
engine/save.asm
View File

@ -182,7 +182,7 @@ AskOverwriteSaveFile: ; 14b89
ld a, [wSaveFileExists] ld a, [wSaveFileExists]
and a and a
jr z, .erase jr z, .erase
call Function14bcb call CompareLoadedAndSavedPlayerID
jr z, .yoursavefile jr z, .yoursavefile
ld hl, UnknownText_0x15297 ld hl, UnknownText_0x15297
call SaveTheGame_yesorno call SaveTheGame_yesorno
@ -223,7 +223,7 @@ SaveTheGame_yesorno: ; 14baf
ret ret
; 14bcb ; 14bcb
Function14bcb: ; 14bcb CompareLoadedAndSavedPlayerID: ; 14bcb
ld a, BANK(sPlayerData) ld a, BANK(sPlayerData)
call GetSRAMBank call GetSRAMBank
ld hl, sPlayerData + (PlayerID - wPlayerData) ld hl, sPlayerData + (PlayerID - wPlayerData)
@ -291,7 +291,7 @@ SaveGameData_: ; 14c10
ld a, BANK(sBattleTowerChallengeState) ld a, BANK(sBattleTowerChallengeState)
call GetSRAMBank call GetSRAMBank
ld a, [sBattleTowerChallengeState] ld a, [sBattleTowerChallengeState]
cp $4 cp BATTLETOWER_RECEIVED_REWARD
jr nz, .ok jr nz, .ok
xor a xor a
ld [sBattleTowerChallengeState], a ld [sBattleTowerChallengeState], a
@ -373,7 +373,7 @@ ErasePreviousSave: ; 14cbb
call EraseLinkBattleStats call EraseLinkBattleStats
call EraseMysteryGift call EraseMysteryGift
call SaveData call SaveData
call Function14d5c call EraseBattleTowerStatus
ld a, BANK(sStackTop) ld a, BANK(sStackTop)
call GetSRAMBank call GetSRAMBank
xor a xor a
@ -437,7 +437,7 @@ Unknown_14d2c: ; 14d2c
db $11, $0c, $0c, $06, $06, $04 db $11, $0c, $0c, $06, $06, $04
; 14d5c ; 14d5c
Function14d5c: ; 14d5c EraseBattleTowerStatus: ; 14d5c
ld a, BANK(sBattleTowerChallengeState) ld a, BANK(sBattleTowerChallengeState)
call GetSRAMBank call GetSRAMBank
xor a xor a
@ -486,7 +486,7 @@ Function14d93: ; 14d93
; 14da0 ; 14da0
Function14da0: ; 14da0 HallOfFame_InitSaveIfNeeded: ; 14da0
ld a, [wSavedAtLeastOnce] ld a, [wSavedAtLeastOnce]
and a and a
ret nz ret nz
@ -512,7 +512,7 @@ SaveOptions: ; 14dbb
ld bc, OptionsEnd - Options ld bc, OptionsEnd - Options
call CopyBytes call CopyBytes
ld a, [Options] ld a, [Options]
and $ef and $ff ^ (1 << NO_TEXT_SCROLL)
ld [sOptions], a ld [sOptions], a
jp CloseSRAM jp CloseSRAM
; 14dd7 ; 14dd7
@ -791,9 +791,9 @@ LoadPlayerData: ; 14fd7 (5:4fd7)
ld a, BANK(sBattleTowerChallengeState) ld a, BANK(sBattleTowerChallengeState)
call GetSRAMBank call GetSRAMBank
ld a, [sBattleTowerChallengeState] ld a, [sBattleTowerChallengeState]
cp $4 cp BATTLETOWER_RECEIVED_REWARD
jr nz, .not_4 jr nz, .not_4
ld a, $3 ld a, BATTLETOWER_WON_CHALLENGE
ld [sBattleTowerChallengeState], a ld [sBattleTowerChallengeState], a
.not_4 .not_4
call CloseSRAM call CloseSRAM

6
engine/specials.asm
View File

@ -66,11 +66,11 @@ SpecialsPointers:: ; c029
add_special Special_CardFlip add_special Special_CardFlip
add_special Special_DummyNonfunctionalGameCornerGame add_special Special_DummyNonfunctionalGameCornerGame
add_special Special_ClearBGPalettesBufferScreen add_special Special_ClearBGPalettesBufferScreen
add_special RotatePalettesRightPalettes add_special FadeOutPalettes
add_special Special_BattleTowerFade add_special Special_BattleTowerFade
add_special Special_FadeBlackQuickly add_special Special_FadeBlackQuickly
add_special RotatePalettesLeftPalettes add_special FadeInPalettes
add_special Special_RotatePalettesLeftQuickly add_special Special_FadeInQuickly
add_special Special_ReloadSpritesNoPalettes add_special Special_ReloadSpritesNoPalettes
add_special ClearBGPalettes add_special ClearBGPalettes
add_special UpdateTimePals add_special UpdateTimePals

6
engine/timeofdaypals.asm
View File

@ -116,7 +116,7 @@ _UpdateTimePals:: ; 8c070
ret ret
; 8c079 ; 8c079
RotatePalettesLeftPalettes:: ; 8c079 FadeInPalettes:: ; 8c079
ld c, $12 ld c, $12
call GetTimePalFade call GetTimePalFade
ld b, $4 ld b, $4
@ -124,7 +124,7 @@ RotatePalettesLeftPalettes:: ; 8c079
ret ret
; 8c084 ; 8c084
RotatePalettesRightPalettes:: ; 8c084 FadeOutPalettes:: ; 8c084
call Function8c0c1 call Function8c0c1
ld c, $9 ld c, $9
call GetTimePalFade call GetTimePalFade
@ -150,7 +150,7 @@ endr
ret ret
; 8c0ab ; 8c0ab
Special_RotatePalettesLeftQuickly: ; 8c0ab Special_FadeInQuickly: ; 8c0ab
ld c, $0 ld c, $0
call GetTimePalFade call GetTimePalFade
ld b, $4 ld b, $4

4
event/field_moves.asm
View File

@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4
; 8c7e1 ; 8c7e1
BlindingFlash: ; 8c7e1 BlindingFlash: ; 8c7e1
callba RotatePalettesRightPalettes callba FadeOutPalettes
ld hl, StatusFlags ld hl, StatusFlags
set 2, [hl] set 2, [hl]
callba Function8c0e5 callba Function8c0e5
@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1
ld b, SCGB_09 ld b, SCGB_09
call GetSGBLayout call GetSGBLayout
callba Function49409 callba Function49409
callba RotatePalettesLeftPalettes callba FadeInPalettes
ret ret
; 8c80a ; 8c80a

96
event/halloffame.asm
View File

@ -1,5 +1,5 @@
HallOfFame:: ; 0x8640e HallOfFame:: ; 0x8640e
call Function8648e call HallOfFame_FadeOutMusic
ld a, [StatusFlags] ld a, [StatusFlags]
push af push af
ld a, 1 ld a, 1
@ -12,7 +12,7 @@ HallOfFame:: ; 0x8640e
ld hl, StatusFlags ld hl, StatusFlags
set 6, [hl] ; hall of fame set 6, [hl] ; hall of fame
callba Function14da0 callba HallOfFame_InitSaveIfNeeded
ld hl, wHallOfFameCount ld hl, wHallOfFameCount
ld a, [hl] ld a, [hl]
@ -26,10 +26,10 @@ HallOfFame:: ; 0x8640e
xor a xor a
ld [wc2cd], a ld [wc2cd], a
call Function864c3 call AnimateHallOfFame
pop af pop af
ld b, a ld b, a
callba Function109847 callba Credits
ret ret
; 0x86455 ; 0x86455
@ -38,9 +38,9 @@ RedCredits:: ; 86455
ld [MusicFadeIDLo], a ld [MusicFadeIDLo], a
ld a, MUSIC_NONE / $100 ld a, MUSIC_NONE / $100
ld [MusicFadeIDHi], a ld [MusicFadeIDHi], a
ld a, $a ld a, 10
ld [MusicFade], a ld [MusicFade], a
callba RotatePalettesRightPalettes callba FadeOutPalettes
xor a xor a
ld [VramState], a ld [VramState], a
ld [hMapAnims], a ld [hMapAnims], a
@ -52,18 +52,18 @@ RedCredits:: ; 86455
ld [wSpawnAfterChampion], a ld [wSpawnAfterChampion], a
ld a, [StatusFlags] ld a, [StatusFlags]
ld b, a ld b, a
callba Function109847 callba Credits
ret ret
; 8648e ; 8648e
Function8648e: ; 8648e HallOfFame_FadeOutMusic: ; 8648e
ld a, MUSIC_NONE % $100 ld a, MUSIC_NONE % $100
ld [MusicFadeIDLo], a ld [MusicFadeIDLo], a
ld a, MUSIC_NONE / $100 ld a, MUSIC_NONE / $100
ld [MusicFadeIDHi], a ld [MusicFadeIDHi], a
ld a, 10 ld a, 10
ld [MusicFade], a ld [MusicFade], a
callba RotatePalettesRightPalettes callba FadeOutPalettes
xor a xor a
ld [VramState], a ld [VramState], a
ld [hMapAnims], a ld [hMapAnims], a
@ -72,7 +72,7 @@ Function8648e: ; 8648e
jp DelayFrames jp DelayFrames
; 864b4 ; 864b4
Function864b4: ; 864b4 HallOfFame_PlayMusicDE: ; 864b4
push de push de
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic
@ -82,29 +82,29 @@ Function864b4: ; 864b4
ret ret
; 864c3 ; 864c3
Function864c3: ; 864c3 AnimateHallOfFame: ; 864c3
xor a xor a
ld [wJumptableIndex], a ld [wJumptableIndex], a
call Function8671c call LoadHOFTeam
jr c, .done jr c, .done
ld de, SCREEN_WIDTH ld de, MUSIC_HALL_OF_FAME
call Function864b4 call HallOfFame_PlayMusicDE
xor a xor a
ld [wcf64], a ld [wcf64], a
.loop .loop
ld a, [wcf64] ld a, [wcf64]
cp 6 cp PARTY_LENGTH
jr nc, .done jr nc, .done
ld hl, wc608 + 1 ld hl, wHallOfFameTempMon1
ld bc, $10 ld bc, wHallOfFameTempMon1End - wHallOfFameTempMon1
call AddNTimes call AddNTimes
ld a, [hl] ld a, [hl]
cp -1 cp -1
jr z, .done jr z, .done
push hl push hl
call Function865b5 call AnimateHOFMonEntrance
pop hl pop hl
call Function8650c call .DisplayNewHallOfFamer
jr c, .done jr c, .done
ld hl, wcf64 ld hl, wcf64
inc [hl] inc [hl]
@ -120,9 +120,9 @@ Function864c3: ; 864c3
ret ret
; 8650c ; 8650c
Function8650c: ; 8650c .DisplayNewHallOfFamer: ; 8650c
call Function86748 call DisplayHOFMon
ld de, String_8652c ld de, .String_NewHallOfFamer
hlcoord 1, 2 hlcoord 1, 2
call PlaceString call PlaceString
call WaitBGMap call WaitBGMap
@ -135,7 +135,7 @@ Function8650c: ; 8650c
ret ret
; 8652c ; 8652c
String_8652c: .String_NewHallOfFamer:
db "New Hall of Famer!@" db "New Hall of Famer!@"
; 8653f ; 8653f
@ -227,7 +227,7 @@ GetHallOfFameParty: ; 8653f
ret ret
; 865b5 ; 865b5
Function865b5: ; 865b5 AnimateHOFMonEntrance: ; 865b5
push hl push hl
call ClearBGPalettes call ClearBGPalettes
callba Function4e906 callba Function4e906
@ -265,7 +265,7 @@ endr
ld b, SCGB_1A ld b, SCGB_1A
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
call Function86635 call HOF_SlideBackpic
xor a xor a
ld [wc2c6], a ld [wc2c6], a
hlcoord 0, 0 hlcoord 0, 0
@ -278,23 +278,23 @@ endr
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld [hSCY], a ld [hSCY], a
call Function86643 call HOF_SlideFrontpic
ret ret
; 86635 ; 86635
Function86635: ; 86635 HOF_SlideBackpic:
.loop .backpicloop
ld a, [hSCX] ld a, [hSCX]
cp $70 cp $70
ret z ret z
add $4 add $4
ld [hSCX], a ld [hSCX], a
call DelayFrame call DelayFrame
jr .loop jr .backpicloop
; 86643 ; 86643
Function86643: ; 86643 HOF_SlideFrontpic:
.loop .frontpicloop
ld a, [hSCX] ld a, [hSCX]
and a and a
ret z ret z
@ -303,7 +303,7 @@ rept 2
endr endr
ld [hSCX], a ld [hSCX], a
call DelayFrame call DelayFrame
jr .loop jr .frontpicloop
; 86650 ; 86650
_HallOfFamePC: ; 86650 _HallOfFamePC: ; 86650
@ -311,7 +311,7 @@ _HallOfFamePC: ; 86650
xor a xor a
ld [wJumptableIndex], a ld [wJumptableIndex], a
.loop .loop
call Function8671c call LoadHOFTeam
ret c ret c
call Function86665 call Function86665
ret c ret c
@ -361,8 +361,8 @@ Function86692: ; 86692
ld a, [wcf64] ld a, [wcf64]
cp $6 cp $6
jr nc, .fail jr nc, .fail
ld hl, wc608 + 1 ld hl, wHallOfFameTempMon1
ld bc, $10 ld bc, wHallOfFameTempMon1End - wHallOfFameTempMon1
call AddNTimes call AddNTimes
ld a, [hl] ld a, [hl]
cp $ff cp $ff
@ -376,8 +376,8 @@ Function86692: ; 86692
push hl push hl
call ClearBGPalettes call ClearBGPalettes
pop hl pop hl
call Function86748 call DisplayHOFMon
ld a, [wc608] ld a, [wHallOfFameTempWinCount]
cp 200 + 1 cp 200 + 1
jr c, .print_num_hof jr c, .print_num_hof
ld de, String_866fc ld de, String_866fc
@ -391,7 +391,7 @@ Function86692: ; 86692
hlcoord 1, 2 hlcoord 1, 2
call PlaceString call PlaceString
hlcoord 2, 2 hlcoord 2, 2
ld de, wc608 ld de, wHallOfFameTempWinCount
lb bc, 1, 3 lb bc, 1, 3
call PrintNum call PrintNum
hlcoord 11, 2 hlcoord 11, 2
@ -423,10 +423,10 @@ String_8670c:
; 8671c ; 8671c
Function8671c: ; 8671c LoadHOFTeam: ; 8671c
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
cp NUM_HOF_TEAMS cp NUM_HOF_TEAMS
jr nc, .full jr nc, .invalid
ld hl, sHallOfFame ld hl, sHallOfFame
ld bc, HOF_LENGTH ld bc, HOF_LENGTH
call AddNTimes call AddNTimes
@ -434,23 +434,23 @@ Function8671c: ; 8671c
call GetSRAMBank call GetSRAMBank
ld a, [hl] ld a, [hl]
and a and a
jr z, .fail jr z, .absent
ld de, wc608 ld de, wHallOfFameTemp
ld bc, HOF_LENGTH ld bc, HOF_LENGTH
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
and a and a
ret ret
.fail .absent
call CloseSRAM call CloseSRAM
.full .invalid
scf scf
ret ret
; 86748 ; 86748
Function86748: ; 86748 DisplayHOFMon: ; 86748
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld a, [hli] ld a, [hli]
@ -466,7 +466,7 @@ Function86748: ; 86748
ld a, [hli] ld a, [hli]
ld [TempMonLevel], a ld [TempMonLevel], a
ld de, StringBuffer2 ld de, StringBuffer2
ld bc, 10 ld bc, PKMN_NAME_LENGTH - 1
call CopyBytes call CopyBytes
ld a, "@" ld a, "@"
ld [StringBuffer2 + 10], a ld [StringBuffer2 + 10], a
@ -564,7 +564,7 @@ Function86810: ; 86810
ld b, SCGB_1A ld b, SCGB_1A
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
call Function86635 call HOF_SlideBackpic
xor a xor a
ld [wc2c6], a ld [wc2c6], a
hlcoord 0, 0 hlcoord 0, 0
@ -583,7 +583,7 @@ Function86810: ; 86810
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld [hSCY], a ld [hSCY], a
call Function86643 call HOF_SlideFrontpic
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
hlcoord 0, 2 hlcoord 0, 2

12
event/sacred_ash.asm
View File

@ -52,12 +52,12 @@ SacredAshScript: ; 0x50821
special HealParty special HealParty
reloadmappart reloadmappart
playsound SFX_WARP_TO playsound SFX_WARP_TO
special RotatePalettesRightPalettes special FadeOutPalettes
special RotatePalettesLeftPalettes special FadeInPalettes
special RotatePalettesRightPalettes special FadeOutPalettes
special RotatePalettesLeftPalettes special FadeInPalettes
special RotatePalettesRightPalettes special FadeOutPalettes
special RotatePalettesLeftPalettes special FadeInPalettes
waitsfx waitsfx
writetext UnknownText_0x50845 writetext UnknownText_0x50845
playsound SFX_CAUGHT_MON playsound SFX_CAUGHT_MON

2
event/whiteout.asm
View File

@ -10,7 +10,7 @@ Script_OverworldWhiteout:: ; 0x124c8
Script_Whiteout: ; 0x124ce Script_Whiteout: ; 0x124ce
writetext .WhitedOutText writetext .WhitedOutText
waitbutton waitbutton
special RotatePalettesRightPalettes special FadeOutPalettes
pause 40 pause 40
special HealParty special HealParty
checkflag ENGINE_BUG_CONTEST_TIMER checkflag ENGINE_BUG_CONTEST_TIMER

4
home/map.asm
View File

@ -2007,7 +2007,7 @@ FadeToMenu:: ; 2b29
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call LoadStandardMenuDataHeader call LoadStandardMenuDataHeader
callba RotatePalettesRightPalettes callba FadeOutPalettes
call ClearSprites call ClearSprites
call DisableSpriteUpdates call DisableSpriteUpdates
ret ret
@ -2034,7 +2034,7 @@ Function2b5c:: ; 2b5c
call GetSGBLayout call GetSGBLayout
callba Function49409 callba Function49409
call Function3200 call Function3200
callba RotatePalettesLeftPalettes callba FadeInPalettes
call EnableSpriteUpdates call EnableSpriteUpdates
ret ret
; 2b74 ; 2b74

4
macros.asm
View File

@ -234,3 +234,7 @@ hlbgcoord EQUS "bgcoord hl,"
debgcoord EQUS "bgcoord de," debgcoord EQUS "bgcoord de,"
bcbgcoord EQUS "bgcoord bc," bcbgcoord EQUS "bgcoord bc,"
bgrows EQUS "* $20" bgrows EQUS "* $20"
palred EQUS "$0400 *"
palgreen EQUS "$0020 *"
palblue EQUS "$0001 *"

150
maps/BattleTower1F.asm
View File

@ -10,27 +10,27 @@ BattleTower1F_MapScriptHeader:
db 0 db 0
.Trigger0: .Trigger0:
writebyte BATTLE_TOWER_ACTION_09 writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
special BattleTowerAction special BattleTowerAction
iffalse .SkipEverything iffalse .SkipEverything
writebyte BATTLE_TOWER_ACTION_02 writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction special BattleTowerAction
if_equal $0, .SkipEverything if_equal $0, .SkipEverything
if_equal $2, .priorityjump1 if_equal $2, .priorityjump1
if_equal $3, .SkipEverything if_equal $3, .SkipEverything
if_equal $4, .SkipEverything if_equal $4, .SkipEverything
loadfont loadfont
writetext UnknownText_0x9f037 writetext Text_WeveBeenWaitingForYou
waitbutton waitbutton
closetext closetext
priorityjump UnknownScript_0x9e44e priorityjump Script_ResumeBattleTowerChallenge
end end
.priorityjump1: .priorityjump1:
priorityjump BattleTower_LeftWithoutSaving priorityjump BattleTower_LeftWithoutSaving
writebyte BATTLE_TOWER_ACTION_04 writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special BattleTowerAction
writebyte BATTLE_TOWER_ACTION_06 writebyte BATTLETOWERACTION_06
special BattleTowerAction special BattleTowerAction
.SkipEverything: .SkipEverything:
dotrigger $1 dotrigger $1
@ -49,13 +49,13 @@ UnknownScript_0x9e3e0:
end end
ReceptionistScript_0x9e3e2: ReceptionistScript_0x9e3e2:
writebyte BATTLE_TOWER_ACTION_02 writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction special BattleTowerAction
if_equal $3, BattleTowerBattleRoomScript_0x9f4e4 ; maps/BattleTowerBattleRoom.asm if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
loadfont loadfont
writetext Text_BattleTowerWelcomesYou writetext Text_BattleTowerWelcomesYou
keeptextopen keeptextopen
writebyte BATTLE_TOWER_ACTION_00 writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [sbe4f]
special BattleTowerAction special BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo jump Script_BattleTowerIntroductionYesNo
@ -66,10 +66,10 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
special Special_Menu_ChallengeExplanationCancel special Special_Menu_ChallengeExplanationCancel
if_equal $1, Script_ChoseChallenge if_equal $1, Script_ChoseChallenge
if_equal $2, Script_BattleTowerExplanation if_equal $2, Script_BattleTowerExplanation
jump UnknownScript_0x9e4b0 jump Script_BattleTowerHopeToServeYouAgain
Script_ChoseChallenge: ; 0x9e40f Script_ChoseChallenge: ; 0x9e40f
writebyte BATTLE_TOWER_ACTION_1A ; ResetBattleTowerTrainerSRAM writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
special BattleTowerAction special BattleTowerAction
special SpecialCheckForBattleTowerRules special SpecialCheckForBattleTowerRules
if_not_equal $0, Script_WaitButton if_not_equal $0, Script_WaitButton
@ -80,50 +80,50 @@ Script_ChoseChallenge: ; 0x9e40f
special Special_TryQuickSave special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $1 dotrigger $1
writebyte BATTLE_TOWER_ACTION_01 writebyte BATTLETOWERACTION_01 ; set 1, [sbe4f]
special BattleTowerAction special BattleTowerAction
special Function1700b0 special Function1700b0
if_equal $a, Script_Menu_ChallengeExplanationCancel if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, UnknownScript_0x9e550 if_not_equal $0, UnknownScript_0x9e550
writebyte BATTLE_TOWER_ACTION_11 writebyte BATTLETOWERACTION_11
special BattleTowerAction special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom writetext Text_RightThisWayToYourBattleRoom
waitbutton waitbutton
closetext closetext
writebyte BATTLE_TOWER_ACTION_1E writebyte BATTLETOWERACTION_1E
special BattleTowerAction special BattleTowerAction
jump UnknownScript_0x9e454 jump Script_WalkToBattleTowerElevator
UnknownScript_0x9e44e: Script_ResumeBattleTowerChallenge:
closetext closetext
writebyte BATTLE_TOWER_ACTION_08 writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
special BattleTowerAction special BattleTowerAction
UnknownScript_0x9e454: Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, $8 musicfadeout MUSIC_NONE, 8
domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0 domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0
domaptrigger BATTLE_TOWER_ELEVATOR, $0 domaptrigger BATTLE_TOWER_ELEVATOR, $0
domaptrigger BATTLE_TOWER_HALLWAY, $0 domaptrigger BATTLE_TOWER_HALLWAY, $0
follow $2, PLAYER follow $2, PLAYER
applymovement $2, MovementData_0x9e571 applymovement $2, MovementData_BattleTower1FWalkToElevator
writebyte BATTLE_TOWER_ACTION_0A writebyte BATTLETOWERACTION_0A
special BattleTowerAction special BattleTowerAction
warpsound warpsound
disappear $2 disappear $2
stopfollow stopfollow
applymovement PLAYER, MovementData_0x9e576 applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom
warpcheck warpcheck
end end
Script_GivePlayerHisPrize: ; 0x9e47a Script_GivePlayerHisPrize: ; 0x9e47a
writebyte BATTLE_TOWER_ACTION_1C writebyte BATTLETOWERACTION_1C
special BattleTowerAction special BattleTowerAction
writebyte BATTLE_TOWER_ACTION_1B writebyte BATTLETOWERACTION_1B
special BattleTowerAction special BattleTowerAction
if_equal POTION, Script_YourPackIsStuffedFull if_equal POTION, Script_YourPackIsStuffedFull
itemtotext $0, $1 itemtotext $0, $1
giveitem ITEM_FROM_MEM, 5 giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive writetext Text_PlayerGotFive
writebyte BATTLE_TOWER_ACTION_1D writebyte BATTLETOWERACTION_1D
special BattleTowerAction special BattleTowerAction
closetext closetext
end end
@ -137,21 +137,21 @@ Script_YourPackIsStuffedFull: ; 0x9e498
Script_BattleTowerIntroductionYesNo: ; 0x9e49e Script_BattleTowerIntroductionYesNo: ; 0x9e49e
writetext Text_WouldYouLikeToHearAboutTheBattleTower writetext Text_WouldYouLikeToHearAboutTheBattleTower
yesorno yesorno
iffalse UnknownScript_0x9e4a8 iffalse Script_BattleTowerSkipExplanation
Script_BattleTowerExplanation: ; 0x9e4a5 Script_BattleTowerExplanation: ; 0x9e4a5
writetext Text_BattleTowerIntroduction_2 writetext Text_BattleTowerIntroduction_2
UnknownScript_0x9e4a8: Script_BattleTowerSkipExplanation:
writebyte BATTLE_TOWER_ACTION_01 writebyte BATTLETOWERACTION_01
special BattleTowerAction special BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel jump Script_Menu_ChallengeExplanationCancel
UnknownScript_0x9e4b0: Script_BattleTowerHopeToServeYouAgain:
writetext Text_WeHopeToServeYouAgain writetext Text_WeHopeToServeYouAgain
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x9e4b6: UnreferencedScript_0x9e4b6:
special Function17f53d special Function17f53d
closetext closetext
end end
@ -162,13 +162,13 @@ Script_WaitButton: ; 0x9e4bb
end end
UnknownScript_0x9e4be: UnreferencedScript_0x9e4be:
writetext Text_SaveBeforeEnteringBattleRoom writetext Text_SaveBeforeEnteringBattleRoom
yesorno yesorno
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
special Special_TryQuickSave special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
writebyte BATTLE_TOWER_ACTION_01 writebyte BATTLETOWERACTION_01
special BattleTowerAction special BattleTowerAction
special Function1700ba special Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel if_equal $a, Script_Menu_ChallengeExplanationCancel
@ -181,45 +181,45 @@ UnknownScript_0x9e4be:
closetext closetext
end end
UnknownScript_0x9e4ea: UnreferencedScript_0x9e4ea:
writebyte BATTLE_TOWER_ACTION_18 writebyte BATTLETOWERACTION_18
special BattleTowerAction special BattleTowerAction
if_not_equal $0, Script_APkmnLevelExceeds if_not_equal $0, Script_APkmnLevelExceeds
writebyte BATTLE_TOWER_ACTION_19 writebyte BATTLETOWERACTION_19
special BattleTowerAction special BattleTowerAction
if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
special SpecialCheckForBattleTowerRules special SpecialCheckForBattleTowerRules
if_not_equal $0, Script_WaitButton if_not_equal $0, Script_WaitButton
writebyte BATTLE_TOWER_ACTION_05 writebyte BATTLETOWERACTION_05
special BattleTowerAction special BattleTowerAction
if_equal $0, UnknownScript_0x9e512 if_equal $0, .zero
writetext UnknownText_0x9ecb0 writetext Text_CantBeRegistered_PreviousRecordDeleted
jump UnknownScript_0x9e515 jump continue
UnknownScript_0x9e512: .zero:
writetext UnknownText_0x9ec6d writetext Text_CantBeRegistered
UnknownScript_0x9e515: continue:
yesorno yesorno
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
writetext UnknownText_0x9ef79 writetext Text_SaveBeforeReentry
yesorno yesorno
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $0 dotrigger $0
special Special_TryQuickSave special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $1 dotrigger $1
writebyte BATTLE_TOWER_ACTION_06 writebyte BATTLETOWERACTION_06
special BattleTowerAction special BattleTowerAction
writebyte BATTLE_TOWER_ACTION_12 writebyte BATTLETOWERACTION_12
special BattleTowerAction special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom writetext Text_RightThisWayToYourBattleRoom
waitbutton waitbutton
jump UnknownScript_0x9e44e jump Script_ResumeBattleTowerChallenge
UnknownScript_0x9e53b: UnreferencedScript_0x9e53b:
writetext UnknownText_0x9f076 writetext Text_FiveDayBattleLimit_Mobile
waitbutton waitbutton
jump UnknownScript_0x9e4b0 jump Script_BattleTowerHopeToServeYouAgain
Script_APkmnLevelExceeds: ; 0x9e542 Script_APkmnLevelExceeds: ; 0x9e542
writetext Text_APkmnLevelExceeds writetext Text_APkmnLevelExceeds
@ -240,7 +240,7 @@ BattleTower_LeftWithoutSaving:
loadfont loadfont
writetext Text_BattleTower_LeftWithoutSaving writetext Text_BattleTower_LeftWithoutSaving
waitbutton waitbutton
jump UnknownScript_0x9e4b0 jump Script_BattleTowerHopeToServeYouAgain
YoungsterScript_0x9e55d: YoungsterScript_0x9e55d:
faceplayer faceplayer
@ -260,24 +260,24 @@ BugCatcherScript_0x9e56b:
GrannyScript_0x9e56e: GrannyScript_0x9e56e:
jumptextfaceplayer Text_BattleTowerGranny jumptextfaceplayer Text_BattleTowerGranny
MovementData_0x9e571: MovementData_BattleTower1FWalkToElevator:
step_up step_up
step_up step_up
step_up step_up
step_up step_up
step_up step_up
MovementData_0x9e576: MovementData_BattleTowerHallwayPlayerEntersBattleRoom:
step_up step_up
step_end step_end
MovementData_0x9e578: MovementData_BattleTowerElevatorExitElevator:
step_down step_down
step_end step_end
MovementData_0x9e57a: MovementData_BattleTowerHallwayWalkTo1020Room:
step_right step_right
step_right step_right
MovementData_0x9e57c: MovementData_BattleTowerHallwayWalkTo3040Room:
step_right step_right
step_right step_right
step_up step_up
@ -285,13 +285,13 @@ MovementData_0x9e57c:
turn_head_left turn_head_left
step_end step_end
MovementData_0x9e582: MovementData_BattleTowerHallwayWalkTo90100Room:
step_left step_left
step_left step_left
MovementData_0x9e584: MovementData_BattleTowerHallwayWalkTo7080Room:
step_left step_left
step_left step_left
MovementData_0x9e586: MovementData_BattleTowerHallwayWalkTo5060Room:
step_left step_left
step_left step_left
step_up step_up
@ -299,7 +299,7 @@ MovementData_0x9e586:
turn_head_right turn_head_right
step_end step_end
MovementData_0x9e58c: MovementData_BattleTowerBattleRoomPlayerWalksIn:
step_up step_up
step_up step_up
step_up step_up
@ -307,28 +307,28 @@ MovementData_0x9e58c:
turn_head_right turn_head_right
step_end step_end
MovementData_0x9e592: MovementData_BattleTowerBattleRoomOpponentWalksIn:
slow_step_down slow_step_down
slow_step_down slow_step_down
slow_step_down slow_step_down
turn_head_left turn_head_left
step_end step_end
MovementData_0x9e597: MovementData_BattleTowerBattleRoomOpponentWalksOut:
turn_head_up turn_head_up
slow_step_up slow_step_up
slow_step_up slow_step_up
slow_step_up slow_step_up
step_end step_end
MovementData_0x9e59c: MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer:
slow_step_right slow_step_right
slow_step_right slow_step_right
slow_step_up slow_step_up
slow_step_up slow_step_up
step_end step_end
MovementData_0x9e5a1: MovementData_BattleTowerBattleRoomReceptionistWalksAway:
slow_step_down slow_step_down
slow_step_down slow_step_down
slow_step_left slow_step_left
@ -336,11 +336,11 @@ MovementData_0x9e5a1:
turn_head_right turn_head_right
step_end step_end
MovementData_0x9e5a7: MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist:
turn_head_down turn_head_down
step_end step_end
MovementData_0x9e5a9: MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent:
turn_head_right turn_head_right
step_end step_end
@ -482,7 +482,7 @@ Text_ThanksForVisiting: ; 0x9ea49
line "visiting!" line "visiting!"
done done
UnknownText_0x9ea5f: Text_BeatenAllTheTrainers_Mobile:
text "Congratulations!" text "Congratulations!"
para "You've beaten all" para "You've beaten all"
@ -512,7 +512,7 @@ Text_CongratulationsYouveBeatenAllTheTrainers: ; 0x9eaef
para "" para ""
done done
UnknownText_0x9eb45: Text_AskRegisterRecord_Mobile:
text "Would you like to" text "Would you like to"
line "register your" line "register your"
@ -560,7 +560,7 @@ Text_WouldYouLikeToHearAboutTheBattleTower: ; 0x9ec3d
cont "BATTLE TOWER?" cont "BATTLE TOWER?"
done done
UnknownText_0x9ec6d: Text_CantBeRegistered:
text "Your record from" text "Your record from"
line "the previous" line "the previous"
@ -568,7 +568,7 @@ UnknownText_0x9ec6d:
line "be registered. OK?" line "be registered. OK?"
done done
UnknownText_0x9ecb0: Text_CantBeRegistered_PreviousRecordDeleted:
text "Your record from" text "Your record from"
line "the previous" line "the previous"
@ -637,7 +637,7 @@ Text_NextUpOpponentNo: ; 0x9eebc
text ". Ready?" text ". Ready?"
done done
UnknownText_0x9eee0: Text_SaveBeforeConnecting_Mobile:
text "Your session will" text "Your session will"
line "be SAVED before" line "be SAVED before"
@ -658,7 +658,7 @@ Text_SaveAndEndTheSession: ; 0x9ef5e
line "session?" line "session?"
done done
UnknownText_0x9ef79: Text_SaveBeforeReentry:
text "Your record will" text "Your record will"
line "be SAVED before" line "be SAVED before"
@ -671,7 +671,7 @@ Text_CancelYourBattleRoomChallenge: ; 0x9efbf
line "ROOM challenge?" line "ROOM challenge?"
done done
UnknownText_0x9efe3: Text_RegisterRecordOnFile_Mobile:
text "We have your" text "We have your"
line "previous record on" line "previous record on"
@ -680,7 +680,7 @@ UnknownText_0x9efe3:
cont "it at the CENTER?" cont "it at the CENTER?"
done done
UnknownText_0x9f037: Text_WeveBeenWaitingForYou:
text "We've been waiting" text "We've been waiting"
line "for you. This way" line "for you. This way"
@ -688,7 +688,7 @@ UnknownText_0x9f037:
line "please." line "please."
done done
UnknownText_0x9f076: Text_FiveDayBattleLimit_Mobile:
text "You may enter only" text "You may enter only"
line "five BATTLE ROOMS" line "five BATTLE ROOMS"
cont "each day." cont "each day."
@ -713,7 +713,7 @@ Text_TooMuchTimeElapsedNoRegister: ; 0x9f0c1
done done
; a dupe? ; a dupe?
UnknownText_0x9f151: Text_RegisterRecordTimedOut_Mobile:
text "Sorry, but it's" text "Sorry, but it's"
line "not possible to" line "not possible to"

60
maps/BattleTowerBattleRoom.asm
View File

@ -3,21 +3,21 @@ BattleTowerBattleRoom_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw Script_EnterBattleRoom, 0 dw .EnterBattleRoom, 0
dw UnknownScript_0x9f420, 0 dw .DummyTrigger, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
Script_EnterBattleRoom: ; 0x9f419 .EnterBattleRoom: ; 0x9f419
disappear $2 disappear $2
priorityjump Script_BattleRoom priorityjump Script_BattleRoom
dotrigger $1 dotrigger $1
UnknownScript_0x9f420: .DummyTrigger:
end end
Script_BattleRoom: ; 0x9f421 Script_BattleRoom: ; 0x9f421
applymovement PLAYER, MovementData_0x9e58c applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn
; beat all 7 opponents in a row ; beat all 7 opponents in a row
Script_BattleRoomLoop: ; 0x9f425 Script_BattleRoomLoop: ; 0x9f425
writebyte $2 writebyte $2
@ -25,31 +25,31 @@ Script_BattleRoomLoop: ; 0x9f425
appear $2 appear $2
warpsound warpsound
waitsfx waitsfx
applymovement $2, MovementData_0x9e592 applymovement $2, MovementData_BattleTowerBattleRoomOpponentWalksIn
loadfont loadfont
battletowertext 1 battletowertext 1
keeptextopen keeptextopen
closetext closetext
special BattleTowerBattle ; calls predef startbattle special BattleTowerBattle ; calls predef startbattle
special RotatePalettesRightPalettes special FadeOutPalettes
reloadmap reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge if_not_equal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers
applymovement $2, MovementData_0x9e597 applymovement $2, MovementData_BattleTowerBattleRoomOpponentWalksOut
warpsound warpsound
disappear $2 disappear $2
applymovement $3, MovementData_0x9e59c applymovement $3, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer
applymovement PLAYER, MovementData_0x9e5a7 applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist
loadfont loadfont
writetext Text_YourPkmnWillBeHealedToFullHealth writetext Text_YourPkmnWillBeHealedToFullHealth
waitbutton waitbutton
closetext closetext
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
special RotatePalettesRightPalettes special FadeOutPalettes
special LoadMapPalettes special LoadMapPalettes
pause 60 pause 60
special RotatePalettesLeftPalettes special FadeInPalettes
special RestartMapMusic special RestartMapMusic
loadfont loadfont
writetext Text_NextUpOpponentNo writetext Text_NextUpOpponentNo
@ -57,43 +57,43 @@ Script_BattleRoomLoop: ; 0x9f425
iffalse Script_DontBattleNextOpponent iffalse Script_DontBattleNextOpponent
Script_ContinueAndBattleNextOpponent: ; 0x9f477 Script_ContinueAndBattleNextOpponent: ; 0x9f477
closetext closetext
applymovement PLAYER, MovementData_0x9e5a9 applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent
applymovement $3, MovementData_0x9e5a1 applymovement $3, MovementData_BattleTowerBattleRoomReceptionistWalksAway
jump Script_BattleRoomLoop jump Script_BattleRoomLoop
Script_DontBattleNextOpponent: ; 0x9f483 Script_DontBattleNextOpponent: ; 0x9f483
writetext Text_SaveAndEndTheSession writetext Text_SaveAndEndTheSession
yesorno yesorno
iffalse Script_DontSaveAndEndTheSession iffalse Script_DontSaveAndEndTheSession
writebyte BATTLE_TOWER_ACTION_07 writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
special BattleTowerAction special BattleTowerAction
writebyte BATTLE_TOWER_ACTION_1F writebyte BATTLETOWERACTION_CHOOSEREWARD ; choose reward
special BattleTowerAction special BattleTowerAction
writebyte BATTLE_TOWER_ACTION_03 writebyte BATTLETOWERACTION_03 ; quicksave
special BattleTowerAction special BattleTowerAction
playsound SFX_SAVE playsound SFX_SAVE
waitsfx waitsfx
special RotatePalettesRightPalettes special FadeOutPalettes
special Reset special Reset
Script_DontSaveAndEndTheSession: ; 0x9f4a3 Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge writetext Text_CancelYourBattleRoomChallenge
yesorno yesorno
iffalse Script_ContinueAndBattleNextOpponent iffalse Script_ContinueAndBattleNextOpponent
writebyte BATTLE_TOWER_ACTION_04 writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special BattleTowerAction
writebyte BATTLE_TOWER_ACTION_06 writebyte BATTLETOWERACTION_06
special BattleTowerAction special BattleTowerAction
closetext closetext
special RotatePalettesRightPalettes special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7 warpfacing UP, BATTLE_TOWER_1F, $7, $7
loadfont loadfont
jump UnknownScript_0x9e4b0 jump Script_BattleTowerHopeToServeYouAgain
Script_FailedBattleTowerChallenge: Script_FailedBattleTowerChallenge:
pause 60 pause 60
special Special_BattleTowerFade special Special_BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, $7, $7 warpfacing UP, BATTLE_TOWER_1F, $7, $7
writebyte BATTLE_TOWER_ACTION_04 writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special BattleTowerAction
loadfont loadfont
writetext Text_ThanksForVisiting writetext Text_ThanksForVisiting
@ -105,13 +105,13 @@ Script_BeatenAllTrainers: ; 0x9f4d9
pause 60 pause 60
special Special_BattleTowerFade special Special_BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, $7, $7 warpfacing UP, BATTLE_TOWER_1F, $7, $7
BattleTowerBattleRoomScript_0x9f4e4: Script_BeatenAllTrainers2:
loadfont loadfont
writetext Text_CongratulationsYouveBeatenAllTheTrainers writetext Text_CongratulationsYouveBeatenAllTheTrainers
jump Script_GivePlayerHisPrize jump Script_GivePlayerHisPrize
UnknownScript_0x9f4eb: UnreferencedScript_0x9f4eb:
writebyte BATTLE_TOWER_ACTION_04 writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special BattleTowerAction
loadfont loadfont
writetext Text_TooMuchTimeElapsedNoRegister writetext Text_TooMuchTimeElapsedNoRegister
@ -119,10 +119,10 @@ UnknownScript_0x9f4eb:
closetext closetext
end end
UnknownScript_0x9f4f7: UnreferencedScript_0x9f4f7:
writebyte BATTLE_TOWER_ACTION_04 writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special BattleTowerAction
writebyte BATTLE_TOWER_ACTION_06 writebyte BATTLETOWERACTION_06
special BattleTowerAction special BattleTowerAction
loadfont loadfont
writetext Text_ThanksForVisiting writetext Text_ThanksForVisiting
@ -132,7 +132,7 @@ UnknownScript_0x9f4f7:
end end
UnknownText_0x9f50b: Text_ReturnedAfterSave_Mobile:
text "You'll be returned" text "You'll be returned"
line "after you SAVE." line "after you SAVE."
done done

28
maps/BattleTowerElevator.asm
View File

@ -3,43 +3,43 @@ BattleTowerElevator_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x9f562, 0 dw .Trigger0, 0
dw UnknownScript_0x9f567, 0 dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x9f562: .Trigger0:
priorityjump UnknownScript_0x9f568 priorityjump .RideElevator
dotrigger $1 dotrigger $1
UnknownScript_0x9f567: .Trigger1:
end end
UnknownScript_0x9f568: .RideElevator:
follow $2, PLAYER follow $2, PLAYER
applymovement $2, MovementData_0x9f58f applymovement $2, MovementData_BattleTowerElevatorReceptionistWalksIn
applymovement PLAYER, MovementData_0x9f592 applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
writebyte BATTLE_TOWER_ACTION_0A writebyte BATTLETOWERACTION_0A
special BattleTowerAction special BattleTowerAction
playsound SFX_ELEVATOR playsound SFX_ELEVATOR
earthquake 60 earthquake 60
waitsfx waitsfx
follow $2, PLAYER follow $2, PLAYER
applymovement $2, MovementData_0x9e578 applymovement $2, MovementData_BattleTowerElevatorExitElevator
stopfollow stopfollow
warpsound warpsound
disappear $2 disappear $2
applymovement PLAYER, MovementData_0x9e578 applymovement PLAYER, MovementData_BattleTowerElevatorExitElevator
warpcheck warpcheck
end end
MovementData_0x9f58f: MovementData_BattleTowerElevatorReceptionistWalksIn:
step_right step_right
turn_head_down turn_head_down
step_end step_end
MovementData_0x9f592: MovementData_BattleTowerElevatorPlayerWalksIn:
turn_head_down turn_head_down
step_end step_end
@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_0x9f58f, -1 person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1

12
maps/BattleTowerHallway.asm
View File

@ -47,23 +47,23 @@ BattleTowerHallway_MapScriptHeader:
if_equal 8, .L70L80 if_equal 8, .L70L80
if_equal 9, .L90L100 if_equal 9, .L90L100
if_equal 10, .L90L100 if_equal 10, .L90L100
applymovement $2, MovementData_0x9e57a applymovement $2, MovementData_BattleTowerHallwayWalkTo1020Room
jump .EnterBattleRoom jump .EnterBattleRoom
.L30L40: ; 0x9f603 .L30L40: ; 0x9f603
applymovement $2, MovementData_0x9e57c applymovement $2, MovementData_BattleTowerHallwayWalkTo3040Room
jump .EnterBattleRoom jump .EnterBattleRoom
.L50L60: ; 0x9f60a .L50L60: ; 0x9f60a
applymovement $2, MovementData_0x9e586 applymovement $2, MovementData_BattleTowerHallwayWalkTo5060Room
jump .EnterBattleRoom jump .EnterBattleRoom
.L70L80: ; 0x9f611 .L70L80: ; 0x9f611
applymovement $2, MovementData_0x9e584 applymovement $2, MovementData_BattleTowerHallwayWalkTo7080Room
jump .EnterBattleRoom jump .EnterBattleRoom
.L90L100: ; 0x9f618 .L90L100: ; 0x9f618
applymovement $2, MovementData_0x9e582 applymovement $2, MovementData_BattleTowerHallwayWalkTo90100Room
jump .EnterBattleRoom jump .EnterBattleRoom
.EnterBattleRoom: ; 0x9f61f .EnterBattleRoom: ; 0x9f61f
@ -73,7 +73,7 @@ BattleTowerHallway_MapScriptHeader:
waitbutton waitbutton
closetext closetext
stopfollow stopfollow
applymovement PLAYER, MovementData_0x9e576 applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom
warpcheck warpcheck
end end

4
maps/BluesHouse.asm
View File

@ -30,10 +30,10 @@ UnknownScript_0x19b0de:
writetext UnknownText_0x19b266 writetext UnknownText_0x19b266
waitbutton waitbutton
closetext closetext
special RotatePalettesRightPalettes special FadeOutPalettes
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
pause 60 pause 60
special RotatePalettesLeftPalettes special FadeInPalettes
special RestartMapMusic special RestartMapMusic
loadfont loadfont
writetext UnknownText_0x19b296 writetext UnknownText_0x19b296

2
maps/EcruteakGym.asm
View File

@ -84,7 +84,7 @@ UnknownScript_0x99dc6:
follow PLAYER, $8 follow PLAYER, $8
applymovement PLAYER, MovementData_0x99e5f applymovement PLAYER, MovementData_0x99e5f
stopfollow stopfollow
special RotatePalettesRightPalettes special FadeOutPalettes
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
waitsfx waitsfx
warp ECRUTEAK_CITY, $6, $1b warp ECRUTEAK_CITY, $6, $1b

4
maps/FastShip1F.asm
View File

@ -64,7 +64,7 @@ SailorScript_0x75160:
closetext closetext
scall .LetThePlayerOut scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes special FadeOutPalettes
waitsfx waitsfx
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
domaptrigger VERMILION_PORT, $1 domaptrigger VERMILION_PORT, $1
@ -77,7 +77,7 @@ SailorScript_0x75160:
closetext closetext
scall .LetThePlayerOut scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes special FadeOutPalettes
waitsfx waitsfx
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
domaptrigger OLIVINE_PORT, $1 domaptrigger OLIVINE_PORT, $1

2
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -43,7 +43,7 @@ TwinScript_0x75ebb:
appear $4 appear $4
spriteface PLAYER, UP spriteface PLAYER, UP
spriteface $4, UP spriteface $4, UP
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
spriteface $3, DOWN spriteface $3, DOWN
showemote EMOTE_SHOCK, $3, 15 showemote EMOTE_SHOCK, $3, 15
applymovement $4, MovementData_0x7600c applymovement $4, MovementData_0x7600c

2
maps/FastShipCabins_SW_SSW_NW.asm
View File

@ -70,7 +70,7 @@ FastShipBed:
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
pause 60 pause 60
special RestartMapMusic special RestartMapMusic
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
loadfont loadfont
writetext FastShipBedText2 writetext FastShipBedText2
waitbutton waitbutton

4
maps/GoldenrodPokeCenter1F.asm
View File

@ -9,7 +9,7 @@ NurseScript_0x60f91:
jumpstd pokecenternurse jumpstd pokecenternurse
GoldenrodPokeCenter1F_GSBallTriggerLeft: GoldenrodPokeCenter1F_GSBallTriggerLeft:
writebyte BATTLE_TOWER_ACTION_0B writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
special BattleTowerAction special BattleTowerAction
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end end
@ -41,7 +41,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft:
end end
GoldenrodPokeCenter1F_GSBallTriggerRight: GoldenrodPokeCenter1F_GSBallTriggerRight:
writebyte BATTLE_TOWER_ACTION_0B writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
special BattleTowerAction special BattleTowerAction
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end end

2
maps/IndigoPlateauPokeCenter1F.asm
View File

@ -154,7 +154,7 @@ TeleportGuyScript:
waitbutton waitbutton
closetext closetext
playsound SFX_WARP_TO playsound SFX_WARP_TO
special RotatePalettesRightPalettes special FadeOutPalettes
waitsfx waitsfx
warp NEW_BARK_TOWN, $d, $6 warp NEW_BARK_TOWN, $d, $6
end end

2
maps/LancesRoom.asm
View File

@ -125,7 +125,7 @@ LanceScript_0x180e7b:
pause 30 pause 30
closetext closetext
applymovement $3, MovementData_0x180f5b applymovement $3, MovementData_0x180f5b
special RotatePalettesRightPalettes special FadeOutPalettes
pause 15 pause 15
warpfacing UP, HALL_OF_FAME, $4, $d warpfacing UP, HALL_OF_FAME, $4, $d
end end

4
maps/MobileBattleRoom.asm
View File

@ -35,11 +35,11 @@ MapMobileBattleRoomSignpost0Script:
writetext MobileBattleRoom_HealText writetext MobileBattleRoom_HealText
pause 20 pause 20
closetext closetext
special RotatePalettesRightPalettes special FadeOutPalettes
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
special LoadMapPalettes special LoadMapPalettes
pause 60 pause 60
special RotatePalettesLeftPalettes special FadeInPalettes
special RestartMapMusic special RestartMapMusic
refreshscreen $0 refreshscreen $0
.two_: .two_:

2
maps/MrPokemonsHouse.asm
View File

@ -114,7 +114,7 @@ UnknownScript_0x196ec9:
special Mobile_HealParty special Mobile_HealParty
special HealParty special HealParty
pause 60 pause 60
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
special RestartMapMusic special RestartMapMusic
loadfont loadfont
writetext UnknownText_0x197134 writetext UnknownText_0x197134

12
maps/OlivineLighthouse6F.asm
View File

@ -42,9 +42,9 @@ UnknownScript_0x60bab:
closetext closetext
special RestartMapMusic special RestartMapMusic
cry AMPHAROS cry AMPHAROS
special RotatePalettesRightPalettes special FadeOutPalettes
pause 10 pause 10
special RotatePalettesLeftPalettes special FadeInPalettes
loadfont loadfont
writetext UnknownText_0x60f3d writetext UnknownText_0x60f3d
waitbutton waitbutton
@ -116,10 +116,10 @@ UnknownScript_0x60c51:
cry AMPHAROS cry AMPHAROS
waitbutton waitbutton
closetext closetext
special RotatePalettesRightPalettes special FadeOutPalettes
special RotatePalettesLeftPalettes special FadeInPalettes
special RotatePalettesRightPalettes special FadeOutPalettes
special RotatePalettesLeftPalettes special FadeInPalettes
end end
ItemFragment_0x60c66: ItemFragment_0x60c66:

2
maps/OlivinePort.asm
View File

@ -39,7 +39,7 @@ SailorScript_0x748c0:
waitsfx waitsfx
applymovement PLAYER, MovementData_0x74a30 applymovement PLAYER, MovementData_0x74a30
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes special FadeOutPalettes
waitsfx waitsfx
checkevent EVENT_FAST_SHIP_FIRST_TIME checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7490a iffalse UnknownScript_0x7490a

2
maps/RadioTower5F.asm
View File

@ -95,7 +95,7 @@ UnknownScript_0x6006e:
disappear $3 disappear $3
disappear $4 disappear $4
pause 15 pause 15
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1
setevent EVENT_CLEARED_RADIO_TOWER setevent EVENT_CLEARED_RADIO_TOWER
clearflag ENGINE_ROCKETS_IN_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER

2
maps/Route24.asm
View File

@ -29,7 +29,7 @@ RocketScript_0x1adbfa:
special Special_ReloadSpritesNoPalettes special Special_ReloadSpritesNoPalettes
disappear $2 disappear $2
pause 25 pause 25
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
playmapmusic playmapmusic
end end

2
maps/Route26HealSpeechHouse.asm
View File

@ -17,7 +17,7 @@ TeacherScript_0x7b125:
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
special HealParty special HealParty
pause 60 pause 60
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
special RestartMapMusic special RestartMapMusic
loadfont loadfont
writetext UnknownText_0x7b18b writetext UnknownText_0x7b18b

4
maps/Route35NationalParkgate.asm
View File

@ -75,7 +75,7 @@ Route35NationalParkgate_GoBackIn:
closetext closetext
scall Route35NationalParkgate_EnterContest scall Route35NationalParkgate_EnterContest
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
special RotatePalettesRightPalettes special FadeOutPalettes
waitsfx waitsfx
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
end end
@ -112,7 +112,7 @@ Route35NationalParkgate_OkayToProceed:
special Special_GiveParkBalls special Special_GiveParkBalls
scall Route35NationalParkgate_EnterContest scall Route35NationalParkgate_EnterContest
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
special RotatePalettesRightPalettes special FadeOutPalettes
waitsfx waitsfx
special Special_SelectRandomBugContestContestants special Special_SelectRandomBugContestContestants
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f

6
maps/Route36NationalParkgate.asm
View File

@ -74,7 +74,7 @@ Route36NationalParkgate_MapScriptHeader:
appear $d appear $d
applymovement PLAYER, MovementData_0x6add1 applymovement PLAYER, MovementData_0x6add1
pause 15 pause 15
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
jumpstd bugcontestresults jumpstd bugcontestresults
.GoBackToContest: .GoBackToContest:
@ -83,7 +83,7 @@ Route36NationalParkgate_MapScriptHeader:
closetext closetext
spriteface PLAYER, LEFT spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes special FadeOutPalettes
waitsfx waitsfx
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12
end end
@ -166,7 +166,7 @@ Route36OfficerScriptContest:
special Special_GiveParkBalls special Special_GiveParkBalls
spriteface PLAYER, LEFT spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes special FadeOutPalettes
waitsfx waitsfx
special Special_SelectRandomBugContestContestants special Special_SelectRandomBugContestContestants
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12

2
maps/SilverCaveRoom3.asm
View File

@ -26,7 +26,7 @@ RedScript_0x18c603:
special Special_ReloadSpritesNoPalettes special Special_ReloadSpritesNoPalettes
disappear $2 disappear $2
pause 15 pause 15
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
pause 30 pause 30
special HealParty special HealParty
refreshscreen $0 refreshscreen $0

4
maps/SlowpokeWellB1F.asm
View File

@ -34,7 +34,7 @@ GruntM1Script:
disappear $4 disappear $4
disappear $5 disappear $5
pause 15 pause 15
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
disappear $8 disappear $8
moveperson $8, $b, $6 moveperson $8, $b, $6
appear $8 appear $8
@ -56,7 +56,7 @@ GruntM1Script:
clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_AZALEA_TOWN_SLOWPOKES
clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_SLOWPOKE
clearevent EVENT_KURTS_HOUSE_KURT_1 clearevent EVENT_KURTS_HOUSE_KURT_1
special RotatePalettesRightPalettes special FadeOutPalettes
special HealParty special HealParty
pause 15 pause 15
warp KURTS_HOUSE, $3, $3 warp KURTS_HOUSE, $3, $3

2
maps/SproutTower3F.asm
View File

@ -51,7 +51,7 @@ UnknownScript_0x184947:
special Special_ReloadSpritesNoPalettes special Special_ReloadSpritesNoPalettes
disappear $8 disappear $8
waitsfx waitsfx
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
dotrigger $1 dotrigger $1
special RestartMapMusic special RestartMapMusic
end end

12
maps/TeamRocketBaseB1F.asm
View File

@ -445,9 +445,9 @@ ExplodingTrap22:
end end
VoltorbExplodingTrap: VoltorbExplodingTrap:
special RotatePalettesRightPalettes special FadeOutPalettes
cry VOLTORB cry VOLTORB
special RotatePalettesLeftPalettes special FadeInPalettes
setlasttalked $ff setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
scriptedpokedata VOLTORB, 23 scriptedpokedata VOLTORB, 23
@ -455,9 +455,9 @@ VoltorbExplodingTrap:
end end
GeodudeExplodingTrap: GeodudeExplodingTrap:
special RotatePalettesRightPalettes special FadeOutPalettes
cry GEODUDE cry GEODUDE
special RotatePalettesLeftPalettes special FadeInPalettes
setlasttalked $ff setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
scriptedpokedata GEODUDE, 21 scriptedpokedata GEODUDE, 21
@ -465,9 +465,9 @@ GeodudeExplodingTrap:
end end
KoffingExplodingTrap: KoffingExplodingTrap:
special RotatePalettesRightPalettes special FadeOutPalettes
cry KOFFING cry KOFFING
special RotatePalettesLeftPalettes special FadeInPalettes
setlasttalked $ff setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
scriptedpokedata KOFFING, 21 scriptedpokedata KOFFING, 21

6
maps/TeamRocketBaseB2F.asm
View File

@ -106,7 +106,7 @@ UnknownScript_0x6cfac:
disappear $d disappear $d
disappear $e disappear $e
pause 15 pause 15
special Special_RotatePalettesLeftQuickly special Special_FadeInQuickly
dotrigger $2 dotrigger $2
clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
spriteface $4, DOWN spriteface $4, DOWN
@ -155,11 +155,11 @@ UnknownScript_0x6d091:
writetext UnknownText_0x6da97 writetext UnknownText_0x6da97
waitbutton waitbutton
closetext closetext
special RotatePalettesRightPalettes special FadeOutPalettes
special Mobile_HealParty special Mobile_HealParty
playsound SFX_FULL_HEAL playsound SFX_FULL_HEAL
special HealParty special HealParty
special RotatePalettesLeftPalettes special FadeInPalettes
loadfont loadfont
writetext UnknownText_0x6daf7 writetext UnknownText_0x6daf7
waitbutton waitbutton

2
maps/VermilionPort.asm
View File

@ -51,7 +51,7 @@ SailorScript_0x74dc4:
waitsfx waitsfx
applymovement PLAYER, MovementData_0x74ef1 applymovement PLAYER, MovementData_0x74ef1
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes special FadeOutPalettes
waitsfx waitsfx
setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND

8
maps/WarehouseEntrance.asm
View File

@ -226,10 +226,10 @@ OlderHaircutBrotherScript:
writetext UnknownText_0x7c6b8 writetext UnknownText_0x7c6b8
waitbutton waitbutton
closetext closetext
special RotatePalettesRightPalettes special FadeOutPalettes
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
pause 60 pause 60
special RotatePalettesLeftPalettes special FadeInPalettes
special RestartMapMusic special RestartMapMusic
loadfont loadfont
writetext UnknownText_0x7c6d8 writetext UnknownText_0x7c6d8
@ -309,10 +309,10 @@ YoungerHaircutBrotherScript:
writetext UnknownText_0x7c80e writetext UnknownText_0x7c80e
waitbutton waitbutton
closetext closetext
special RotatePalettesRightPalettes special FadeOutPalettes
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
pause 60 pause 60
special RotatePalettesLeftPalettes special FadeInPalettes
special RestartMapMusic special RestartMapMusic
loadfont loadfont
writetext UnknownText_0x7c82a writetext UnknownText_0x7c82a

118
misc/battle_tower_5c.asm
View File

@ -627,7 +627,7 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; 1704a2
ld a, BANK(sBattleTowerChallengeState) ld a, BANK(sBattleTowerChallengeState)
call GetSRAMBank call GetSRAMBank
ld a, $2 ld a, BATTLETOWER_CHALLENGE_IN_PROGESS
ld [sBattleTowerChallengeState], a ld [sBattleTowerChallengeState], a
ld hl, sNrOfBeatenBattleTowerTrainers ld hl, sNrOfBeatenBattleTowerTrainers
inc [hl] inc [hl]
@ -960,13 +960,13 @@ endr
dw Function17075f ; 0x00 dw Function17075f ; 0x00
dw Function170788 ; 0x01 dw Function170788 ; 0x01
dw Function170778 ; 0x02 dw Function170778 ; 0x02
dw Function170799 ; 0x03 dw BattleTowerAction_SetByteToQuickSaveChallenge ; 0x03
dw Function17079d ; 0x04 dw BattleTowerAction_SetByteToCancelChallenge ; 0x04
dw Function1707ac ; 0x05 dw Function1707ac ; 0x05
dw Function1707f4 ; 0x06 dw Function1707f4 ; 0x06
dw Function170868 ; 0x07 dw SaveBattleTowerLevelGroup ; 0x07
dw Function170881 ; 0x08 dw LoadBattleTowerLevelGroup ; 0x08
dw Function17089a ; 0x09 dw BattleTower_CheckSaveFileExistsAndIsYours ; 0x09
dw Function1708b1 ; 0x0a dw Function1708b1 ; 0x0a
dw CheckMobileEventIndex ; 0x0b dw CheckMobileEventIndex ; 0x0b
dw Function1708c8 ; 0x0c dw Function1708c8 ; 0x0c
@ -987,7 +987,7 @@ endr
dw Function1706ee ; 0x1b dw Function1706ee ; 0x1b
dw Function17071b ; 0x1c dw Function17071b ; 0x1c
dw Function170729 ; 0x1d dw Function170729 ; 0x1d
dw Function17073e ; 0x1e dw BattleTower_RandomlyChooseReward ; 0x1e
dw Function170737 ; 0x1f dw Function170737 ; 0x1f
@ -1040,7 +1040,7 @@ Function1706ee: ; 1706ee (5c:46ee) BattleTowerAction $1b
Function17071b: ; 17071b (5c:471b) BattleTowerAction $1c Function17071b: ; 17071b (5c:471b) BattleTowerAction $1c
ld a, BANK(sBattleTowerChallengeState) ld a, BANK(sBattleTowerChallengeState)
call GetSRAMBank call GetSRAMBank
ld a, $3 ld a, BATTLETOWER_WON_CHALLENGE
ld [sBattleTowerChallengeState], a ld [sBattleTowerChallengeState], a
call CloseSRAM call CloseSRAM
ret ret
@ -1048,7 +1048,7 @@ Function17071b: ; 17071b (5c:471b) BattleTowerAction $1c
Function170729: ; 170729 (5c:4729) BattleTowerAction $1d Function170729: ; 170729 (5c:4729) BattleTowerAction $1d
ld a, BANK(sBattleTowerChallengeState) ld a, BANK(sBattleTowerChallengeState)
call GetSRAMBank call GetSRAMBank
ld a, $4 ld a, BATTLETOWER_RECEIVED_REWARD
ld [sBattleTowerChallengeState], a ld [sBattleTowerChallengeState], a
call CloseSRAM call CloseSRAM
ret ret
@ -1057,7 +1057,7 @@ Function170737: ; 170737 (5c:4737) BattleTowerAction $1e
callba SaveOptions callba SaveOptions
ret ret
Function17073e: ; 17073e (5c:473e) BattleTowerAction $1f BattleTower_RandomlyChooseReward: ; 17073e (5c:473e) BattleTowerAction $1f
; Generate a random stat boosting item. ; Generate a random stat boosting item.
.loop .loop
call Random call Random
@ -1079,7 +1079,7 @@ Function17073e: ; 17073e (5c:473e) BattleTowerAction $1f
ret ret
Function17075f: ; 17075f (5c:475f) BattleTowerAction $00 Function17075f: ; 17075f (5c:475f) BattleTowerAction $00
call Function17089a call BattleTower_CheckSaveFileExistsAndIsYours
ld a, [ScriptVar] ld a, [ScriptVar]
and a and a
ret z ret z
@ -1110,12 +1110,12 @@ Function170788: ; 170788 (5c:4788) BattleTowerAction $01
call CloseSRAM call CloseSRAM
ret ret
Function170799: ; 170799 (5c:4799) BattleTowerAction $03 BattleTowerAction_SetByteToQuickSaveChallenge: ; 170799 (5c:4799) BattleTowerAction $03
ld c, $1 ld c, BATTLETOWER_SAVED_AND_LEFT
jr asm_17079f jr asm_17079f
Function17079d: ; 17079d (5c:479d) BattleTowerAction $04 BattleTowerAction_SetByteToCancelChallenge: ; 17079d (5c:479d) BattleTowerAction $04
ld c, $0 ld c, BATTLETOWER_NO_CHALLENGE
asm_17079f: ; 17079f (5c:479f) asm_17079f: ; 17079f (5c:479f)
ld a, BANK(sBattleTowerChallengeState) ld a, BANK(sBattleTowerChallengeState)
call GetSRAMBank call GetSRAMBank
@ -1210,9 +1210,10 @@ Function17081d: ; 17081d (5c:481d) BattleTowerAction $17
and a and a
jr nz, .asm_170853 jr nz, .asm_170853
ret ret
.asm_170849 .asm_170849
ld hl, CurDay ld hl, CurDay
ld a, $8c ld a, 140
sub c sub c
add [hl] add [hl]
cp $b cp $b
@ -1228,39 +1229,39 @@ Function17081d: ; 17081d (5c:481d) BattleTowerAction $17
call CloseSRAM call CloseSRAM
ret ret
Function170868: ; 170868 (5c:4868) BattleTowerAction $07 SaveBattleTowerLevelGroup: ; 170868 (5c:4868) BattleTowerAction $07
ld a, BANK(sbe47) ld a, BANK(sBTChoiceOfLevelGroup)
call GetSRAMBank call GetSRAMBank
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $3 ld a, $3
ld [rSVBK], a ld [rSVBK], a
ld a, [wd000 + $800] ld a, [wBTChoiceOfLvlGroup]
ld [sbe47], a ld [sBTChoiceOfLevelGroup], a
pop af pop af
ld [rSVBK], a ld [rSVBK], a
call CloseSRAM call CloseSRAM
ret ret
Function170881: ; 170881 (5c:4881) BattleTowerAction $08 LoadBattleTowerLevelGroup: ; 170881 (5c:4881) BattleTowerAction $08 ; Load level group choice
ld a, BANK(sbe47) ld a, BANK(sBTChoiceOfLevelGroup)
call GetSRAMBank call GetSRAMBank
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $3 ld a, $3
ld [rSVBK], a ld [rSVBK], a
ld a, [sbe47] ld a, [sBTChoiceOfLevelGroup]
ld [wd000 + $800], a ld [wBTChoiceOfLvlGroup], a
pop af pop af
ld [rSVBK], a ld [rSVBK], a
call CloseSRAM call CloseSRAM
ret ret
Function17089a: ; 17089a BattleTowerAction $09 BattleTower_CheckSaveFileExistsAndIsYours: ; 17089a BattleTowerAction $09
ld a, [wSaveFileExists] ld a, [wSaveFileExists]
and a and a
jr z, .nope jr z, .nope
callba Function14bcb callba CompareLoadedAndSavedPlayerID
jr z, .yes jr z, .yes
xor a xor a
jr .nope jr .nope
@ -1366,7 +1367,7 @@ Function17093c: ; 17093c (5c:493c) BattleTowerAction $0e
jr nz, .not_egg jr nz, .not_egg
push hl push hl
ld hl, PartyMonOT ; wddff (aliases: PartyMonOT) ld hl, PartyMonOT ; wddff (aliases: PartyMonOT)
ld de, $6 ld de, $6 ; NAME_LENGTH
ld a, b ld a, b
and a and a
jr z, .skip jr z, .skip
@ -1376,38 +1377,38 @@ Function17093c: ; 17093c (5c:493c) BattleTowerAction $0e
jr nz, .loop2 jr nz, .loop2
.skip .skip
ld de, String_1709a4 ld de, String_1709a4
ld a, $6 ld a, $6 ; NAME_LENGTH
.asm_17096e .compare_loop
push af push af
ld a, [de] ld a, [de]
inc de inc de
cp [hl] cp [hl]
inc hl inc hl
jr nz, .asm_17099d jr nz, .different
pop af pop af
dec a dec a
jr nz, .asm_17096e jr nz, .compare_loop
rept 4 rept 4
dec hl dec hl
endr endr
ld a, $50 ld a, "@"
rept 2 rept 2
ld [hli], a ld [hli], a
endr endr
pop hl pop hl
ld a, EGG_TICKET ld a, EGG_TICKET
ld [CurItem], a ld [CurItem], a
ld a, $1 ld a, 1
ld [wItemQuantityChangeBuffer], a ld [wItemQuantityChangeBuffer], a
ld a, $ff ld a, -1
ld [wd107], a ld [ItemCountBuffer], a
ld hl, NumItems ld hl, NumItems
call TossItem call TossItem
ld a, $1 ld a, $1
ld [ScriptVar], a ld [ScriptVar], a
ret ret
.asm_17099d .different
pop af pop af
pop hl pop hl
.not_egg .not_egg
@ -1461,26 +1462,26 @@ endr
; 1709e7 (5c:49e7) ; 1709e7 (5c:49e7)
Jumptable_1709e7: ; 1709e7 Jumptable_1709e7: ; 1709e7
dw Function170a00 dw .NoAction
dw Function170a00 dw .NoAction
dw Function1709f3 dw .DoAction1
dw Function1709f3 dw .DoAction1
dw Function170a01 dw .Action4
dw Function170a33 dw .Action5
; 1709f3 ; 1709f3
Function1709f3: ; 1709f3 .DoAction1: ; 1709f3
ld a, $5 ld a, $5
call GetSRAMBank call GetSRAMBank
ld a, $1 ld a, $1
ld [$a800], a ld [$a800], a
call CloseSRAM call CloseSRAM
Function170a00: ; 170a00 .NoAction: ; 170a00
ret ret
; 170a01 ; 170a01
Function170a01: ; 170a01 .Action4: ; 170a01
ld a, $5 ld a, $5
call GetSRAMBank call GetSRAMBank
ld hl, $b023 ld hl, $b023
@ -1499,7 +1500,7 @@ Function170a01: ; 170a01
ret ret
; 170a33 ; 170a33
Function170a33: ; 170a33 .Action5: ; 170a33
ld a, $0 ld a, $0
call GetSRAMBank call GetSRAMBank
ld hl, wRTC ld hl, wRTC
@ -1512,14 +1513,14 @@ Function170a33: ; 170a33
ld hl, $b08c ld hl, $b08c
ld de, wMisc ld de, wMisc
ld c, $4 ld c, $4
.asm_170a54 .compare_loop
ld a, [de] ld a, [de]
inc de inc de
cp [hl] cp [hl]
jr nz, .asm_170a78 jr nz, .different
inc hl inc hl
dec c dec c
jr nz, .asm_170a54 jr nz, .compare_loop
call CloseSRAM call CloseSRAM
ld a, [MapGroup] ld a, [MapGroup]
ld b, a ld b, a
@ -1528,17 +1529,17 @@ Function170a33: ; 170a33
call GetMapTrigger call GetMapTrigger
ld a, d ld a, d
or e or e
jr z, .asm_170a72 jr z, .no_trigger
ld a, [de] ld a, [de]
and a and a
ret nz ret nz
.asm_170a72 .no_trigger
ld a, $1 ld a, $1
ld [ScriptVar], a ld [ScriptVar], a
ret ret
.asm_170a78 .different
call CloseSRAM call CloseSRAM
ld a, $5 ld a, $5
call GetSRAMBank call GetSRAMBank
@ -1553,11 +1554,11 @@ Function170a33: ; 170a33
call GetMapTrigger call GetMapTrigger
ld a, d ld a, d
or e or e
jr z, .asm_170a9b jr z, .no_trigger_2
xor a xor a
ld [de], a ld [de], a
.asm_170a9b .no_trigger_2
ret ret
; 170a9c ; 170a9c
@ -1584,10 +1585,11 @@ Function170aaf: ; 170aaf (5c:4aaf) BattleTowerAction $13
ret ret
Function170abe: ; 170abe (5c:4abe) BattleTowerAction $14 Function170abe: ; 170abe (5c:4abe) BattleTowerAction $14
call Function17089a call BattleTower_CheckSaveFileExistsAndIsYours
ld a, [ScriptVar] ld a, [ScriptVar]
and a and a
ret z ret z
ld a, BANK(sbe4f) ld a, BANK(sbe4f)
call GetSRAMBank call GetSRAMBank
ld a, [sbe4f] ld a, [sbe4f]
@ -1610,13 +1612,13 @@ Function170ae8: ; 170ae8 (5c:4ae8) BattleTowerAction $18
call GetSRAMBank call GetSRAMBank
ld a, [$b2fb] ld a, [$b2fb]
call CloseSRAM call CloseSRAM
ld c, $a ld c, 10
call SimpleDivide call SimpleDivide
ld a, b ld a, b
ld [wcd4f], a ld [wcd4f], a
xor a xor a
ld [ScriptVar], a ld [ScriptVar], a
callba Function119d93 callba Function119d93 ; level check
ret nc ret nc
ld a, $5 ld a, $5
call GetSRAMBank call GetSRAMBank
@ -1636,7 +1638,7 @@ Function170b16: ; 170b16 (5c:4b16) BattleTowerAction $19
ld [wcd4f], a ld [wcd4f], a
xor a xor a
ld [ScriptVar], a ld [ScriptVar], a
callba Function119dd1 callba Function119dd1 ; ubers check
ret nc ret nc
ld a, $5 ld a, $5
call GetSRAMBank call GetSRAMBank

2
misc/mobile_40.asm
View File

@ -313,7 +313,7 @@ Function10016f: ; 10016f
Function10020b: ; 10020b Function10020b: ; 10020b
xor a xor a
ld [wc303], a ld [wc303], a
callba RotatePalettesRightPalettes callba FadeOutPalettes
callba Function106464 callba Function106464
call HideSprites call HideSprites
call DelayFrame call DelayFrame

40
misc/mobile_46.asm
View File

@ -4108,7 +4108,7 @@ Function119d93: ; 119d93 (46:5d93)
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
ld de, PartyMon1Level ld de, PartyMon1Level
ld a, [PartyCount] ld a, [PartyCount]
.asm_119daf .party_loop
push af push af
ld a, [de] ld a, [de]
push hl push hl
@ -4119,17 +4119,18 @@ Function119d93: ; 119d93 (46:5d93)
pop de pop de
pop hl pop hl
cp [hl] cp [hl]
jr z, .asm_119dbd jr z, .equal
jr nc, .asm_119dc6 jr nc, .exceeds
.asm_119dbd .equal
pop af pop af
dec a dec a
jr nz, .asm_119daf jr nz, .party_loop
pop af pop af
ld [rSVBK], a ld [rSVBK], a
and a and a
ret ret
.asm_119dc6
.exceeds
pop af pop af
ld a, $4 ld a, $4
ld [wcf66], a ld [wcf66], a
@ -4143,40 +4144,41 @@ Function119dd1: ; 119dd1 (46:5dd1)
push af push af
ld a, [wcd4f] ld a, [wcd4f]
cp 70 / 10 cp 70 / 10
jr nc, .asm_119e08 jr nc, .level_70_or_more
ld a, $1 ld a, $1
ld [rSVBK], a ld [rSVBK], a
ld hl, PartyMon1Level ld hl, PartyMon1Level
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
ld de, PartySpecies ld de, PartySpecies
ld a, [PartyCount] ld a, [PartyCount]
.asm_119deb .loop
push af push af
ld a, [de] ld a, [de]
cp MEWTWO cp MEWTWO
jr z, .asm_119dfd jr z, .uber
cp MEW cp MEW
jr z, .asm_119dfd jr z, .uber
cp LUGIA cp LUGIA
jr c, .asm_119e02 jr c, .next
cp NUM_POKEMON + 1 cp NUM_POKEMON + 1
jr nc, .asm_119e02 jr nc, .next
.asm_119dfd .uber
ld a, [hl] ld a, [hl]
cp 70 cp 70
jr c, .asm_119e0d jr c, .uber_under_70
.asm_119e02 .next
add hl, bc add hl, bc
inc de inc de
pop af pop af
dec a dec a
jr nz, .asm_119deb jr nz, .loop
.asm_119e08 .level_70_or_more
pop af pop af
ld [rSVBK], a ld [rSVBK], a
and a and a
ret ret
.asm_119e0d
.uber_under_70
pop af pop af
ld a, [de] ld a, [de]
ld [wd265], a ld [wd265], a
@ -7707,7 +7709,7 @@ Function11b7e5: ; 11b7e5
; 11b879 ; 11b879
Function11b879: ; 11b879 Function11b879: ; 11b879
callba Function17089a callba BattleTower_CheckSaveFileExistsAndIsYours
ld a, [ScriptVar] ld a, [ScriptVar]
and a and a
ret z ret z

33
sram.asm
View File

@ -135,7 +135,36 @@ s1_b277::
sLinkBattleStatsEnd:: sLinkBattleStatsEnd::
sHallOfFame:: ; b2c0 sHallOfFame:: ; b2c0
ds HOF_LENGTH * NUM_HOF_TEAMS sHallOfFame01:: hall_of_fame sHallOfFame01
sHallOfFame02:: hall_of_fame sHallOfFame02
sHallOfFame03:: hall_of_fame sHallOfFame03
sHallOfFame04:: hall_of_fame sHallOfFame04
sHallOfFame05:: hall_of_fame sHallOfFame05
sHallOfFame06:: hall_of_fame sHallOfFame06
sHallOfFame07:: hall_of_fame sHallOfFame07
sHallOfFame08:: hall_of_fame sHallOfFame08
sHallOfFame09:: hall_of_fame sHallOfFame09
sHallOfFame10:: hall_of_fame sHallOfFame10
sHallOfFame11:: hall_of_fame sHallOfFame11
sHallOfFame12:: hall_of_fame sHallOfFame12
sHallOfFame13:: hall_of_fame sHallOfFame13
sHallOfFame14:: hall_of_fame sHallOfFame14
sHallOfFame15:: hall_of_fame sHallOfFame15
sHallOfFame16:: hall_of_fame sHallOfFame16
sHallOfFame17:: hall_of_fame sHallOfFame17
sHallOfFame18:: hall_of_fame sHallOfFame18
sHallOfFame19:: hall_of_fame sHallOfFame19
sHallOfFame20:: hall_of_fame sHallOfFame20
sHallOfFame21:: hall_of_fame sHallOfFame21
sHallOfFame22:: hall_of_fame sHallOfFame22
sHallOfFame23:: hall_of_fame sHallOfFame23
sHallOfFame24:: hall_of_fame sHallOfFame24
sHallOfFame25:: hall_of_fame sHallOfFame25
sHallOfFame26:: hall_of_fame sHallOfFame26
sHallOfFame27:: hall_of_fame sHallOfFame27
sHallOfFame28:: hall_of_fame sHallOfFame28
sHallOfFame29:: hall_of_fame sHallOfFame29
sHallOfFame30:: hall_of_fame sHallOfFame30
sHallOfFameEnd:: sHallOfFameEnd::
sMobileEventIndex:: ds 1 sMobileEventIndex:: ds 1
@ -152,7 +181,7 @@ sBattleTowerChallengeState:: ds 1
sBattleTower:: ; be46 sBattleTower:: ; be46
sNrOfBeatenBattleTowerTrainers:: ds 1 sNrOfBeatenBattleTowerTrainers:: ds 1
sbe47:: ds 1 sBTChoiceOfLevelGroup:: ds 1
; The 7 trainers of the BattleTower are saved here, so nobody appears more than once ; The 7 trainers of the BattleTower are saved here, so nobody appears more than once
sBTTrainers:: ; sbe48 sBTTrainers:: ; sbe48
ds 7 ds 7

22
wram.asm
View File

@ -156,6 +156,25 @@ mailmsg: MACRO
\1End:: \1End::
endm endm
hof_mon: MACRO
\1Species:: ds 1
\1ID:: ds 2
\1DVs:: ds 2
\1Level:: ds 1
\1Nickname:: ds PKMN_NAME_LENGTH +- 1
\1End::
endm
hall_of_fame: MACRO
\1WinCount:: ds 1
\1Mon1:: hof_mon \1Mon1
\1Mon2:: hof_mon \1Mon2
\1Mon3:: hof_mon \1Mon3
\1Mon4:: hof_mon \1Mon4
\1Mon5:: hof_mon \1Mon5
\1Mon6:: hof_mon \1Mon6
\1End:: ds 1
ENDM
INCLUDE "vram.asm" INCLUDE "vram.asm"
@ -520,6 +539,9 @@ wOddEggOTName:: ds PKMN_NAME_LENGTH
wBT_OTTemp:: battle_tower_struct wBT_OTTemp wBT_OTTemp:: battle_tower_struct wBT_OTTemp
ds wBT_OTTemp - @ ds wBT_OTTemp - @
wHallOfFameTemp:: hall_of_fame wHallOfFameTemp
ds wHallOfFameTemp - @
wMisc:: ; ds $28 * 6 wMisc:: ; ds $28 * 6
wBattle:: wBattle::
wc608:: wc608::