pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move effects; no more reloadmapmusic, returnafterbattle

Browse Source
This commit is contained in:
PikalaxALT 2015-12-26 18:11:55 -05:00
parent f485a45cda
commit 2bd45ca574
96 changed files with 1281 additions and 1078 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
battle/ai/items.asm
View File

@ -663,7 +663,7 @@ EnemyPotionFinish: ; 38436
call PrintText_UsedItemOn
hlcoord 2, 2
xor a
ld [wd10a], a
ld [wWhichHPBar], a
call AIUsedItemSound
predef AnimateHPBar
jp AIUpdateHUD

24
battle/core.asm
View File

@ -2098,7 +2098,7 @@ UpdateHPBar: ; 3cd3c
xor a
.ok
push bc
ld [wd10a], a
ld [wWhichHPBar], a
predef AnimateHPBar
pop bc
ret
@ -2494,7 +2494,7 @@ WinTrainerBattle: ; 3cfa4
jr nz, .skip_heal
predef HealParty
.skip_heal
ld a, [wc2cc]
ld a, [wMonStatusFlags]
bit 0, a
jr nz, .skip_win_loss_text
call PrintWinLossText
@ -2888,7 +2888,7 @@ AskUseNextPokemon: ; 3d1f8
ForcePlayerMonChoice: ; 3d227
call EmptyBattleTextBox
call LoadStandardMenuDataHeader
call Function3d2f7
call SetUpBattlePartyMenu_NoLoop
call ForcePickPartyMonInBattle
ld a, [wLinkMode]
and a
@ -2992,12 +2992,12 @@ IsMobileBattle: ; 3d2f1
ret
; 3d2f7
Function3d2f7: ; 3d2f7
SetUpBattlePartyMenu_NoLoop: ; 3d2f7
call ClearBGPalettes
Function3d2fa: ; switch to fullscreen menu?
SetUpBattlePartyMenu: ; switch to fullscreen menu?
callba LoadPartyMenuGFX
callba InitPartyMenuWithCancel
callba Function8e85
callba InitBattlePartyMenuPals
callba InitPartyMenuGFX
ret
; 3d313
@ -3113,7 +3113,7 @@ LostBattle: ; 3d38e
ld c, 40
call DelayFrames
ld a, [wc2cc]
ld a, [wMonStatusFlags]
bit 0, a
jr nz, .skip_win_loss_text
call PrintWinLossText
@ -3701,7 +3701,7 @@ OfferSwitch: ; 3d74b
ld a, [wMenuCursorY]
dec a
jr nz, .said_no
call Function3d2f7
call SetUpBattlePartyMenu_NoLoop
call PickSwitchMonInBattle
jr c, .canceled_switch
ld a, [CurBattleMon]
@ -4563,14 +4563,14 @@ HandleHPHealingItem: ; 3dd2f
ld a, [Buffer5]
ld [de], a
ld a, [hBattleTurn]
ld [wd10a], a
ld [wWhichHPBar], a
and a
hlcoord 2, 2
jr z, .got_hp_bar_coords
hlcoord 10, 9
.got_hp_bar_coords
ld [wd10a], a
ld [wWhichHPBar], a
predef AnimateHPBar
UseOpponentItem:
call RefreshBattleHuds
@ -5113,7 +5113,7 @@ DrawEnemyHUD: ; 3e043
.draw_bar
xor a
ld [wd10a], a
ld [wWhichHPBar], a
hlcoord 2, 2
ld b, 0
call DrawBattleHPBar
@ -5332,7 +5332,7 @@ Function3e290:
call LoadStandardMenuDataHeader
call ClearBGPalettes
BattleMenuPKMN_Loop:
call Function3d2fa
call SetUpBattlePartyMenu
xor a
ld [PartyMenuActionText], a
call Function3d313

1034
battle/effect_commands.asm
View File

File diff suppressed because it is too large Load Diff

12
engine/anim_hp_bar.asm
View File

@ -202,7 +202,7 @@ Functiond6f5: ; d6f5
Functiond730: ; d730
call Functiond784
ld d, $6
ld a, [wd10a]
ld a, [wWhichHPBar]
and $1
ld b, a
ld a, [wd1f1]
@ -228,7 +228,7 @@ Functiond749: ; d749
call ComputeHPBarPixels
ld c, e
ld d, $6
ld a, [wd10a]
ld a, [wWhichHPBar]
and $1
ld b, a
push de
@ -239,7 +239,7 @@ Functiond749: ; d749
; d771
Functiond771: ; d771
ld a, [wd10a]
ld a, [wWhichHPBar]
cp $2
jr nz, .skip
ld a, $28
@ -254,7 +254,7 @@ Functiond771: ; d771
; d784
Functiond784: ; d784
ld a, [wd10a]
ld a, [wWhichHPBar]
and a
ret z
cp $1
@ -292,7 +292,7 @@ Functiond7b4: ; d7b4
call SetHPPal
ld a, [wd1f0]
ld c, a
callba Function8c43
callba ApplyHPBarPals
ret
; d7c9
@ -305,7 +305,7 @@ Functiond7c9: ; d7c9
ret
.cgb
ld a, [wd10a]
ld a, [wWhichHPBar]
and a
jr z, .load_0
cp $1

46
engine/color.asm
View File

@ -324,21 +324,21 @@ Function8bec: ; 8bec
ret
; 8c1d
Function8c1d: ; 8c1d
ApplyMonOrTrainerPals: ; 8c1d
call CheckCGB
ret z
ld a, e
and a
jr z, .asm_8c2d
jr z, .get_trainer
ld a, [CurPartySpecies]
call GetMonPalettePointer_
jr .asm_8c33
jr .load_palettes
.asm_8c2d
.get_trainer
ld a, [TrainerClass]
call GetTrainerPalettePointer
.asm_8c33
.load_palettes
ld de, UnknBGPals
call LoadPalette_White_Col1_Col2_Black
call WipeAttrMap
@ -347,24 +347,24 @@ Function8c1d: ; 8c1d
ret
; 8c43
Function8c43: ; 8c43
ld a, [wd10a]
ApplyHPBarPals: ; 8c43
ld a, [wWhichHPBar]
and a
jr z, .asm_8c52
jr z, .Enemy
cp $1
jr z, .asm_8c57
jr z, .Player
cp $2
jr z, .asm_8c70
jr z, .PartyMenu
ret
.asm_8c52
.Enemy
ld de, BGPals + 2 palettes + 2
jr .asm_8c5a
jr .okay
.asm_8c57
.Player
ld de, BGPals + 3 palettes + 2
.asm_8c5a
.okay
ld l, c
ld h, $0
rept 2
@ -372,27 +372,27 @@ rept 2
endr
ld bc, Palettes_a8be
add hl, bc
ld bc, $4
ld bc, 4
ld a, $5
call FarCopyWRAM
ld a, $1
ld [hCGBPalUpdate], a
ret
.asm_8c70
.PartyMenu
ld e, c
inc e
hlcoord 11, 1, AttrMap
ld bc, $28
ld bc, 2 * SCREEN_WIDTH
ld a, [CurPartyMon]
.asm_8c7b
.loop
and a
jr z, .asm_8c82
jr z, .done
add hl, bc
dec a
jr .asm_8c7b
jr .loop
.asm_8c82
.done
lb bc, 2, 8
ld a, e
call FillBoxCGB
@ -2088,7 +2088,7 @@ TilesetColors4: ; b289
db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f
; b309
Palette_b309: ; b309
Palette_b309: ; b309 mobile
RGB 31, 31, 31
RGB 31, 19, 24
RGB 30, 10, 06
@ -2096,7 +2096,7 @@ Palette_b309: ; b309
; b311
Palette_b311: ; b311
Palette_b311: ; b311 not mobile
RGB 31, 31, 31
RGB 17, 19, 31
RGB 14, 16, 31

2
engine/events_2.asm
View File

@ -144,7 +144,7 @@ RandomEncounter:: ; 97cc0
WildBattleScript: ; 97cf9
randomwildmon
startbattle
returnafterbattle
reloadmapafterbattle
end
; 97cfd

71
engine/intro_menu.asm
View File

@ -68,7 +68,7 @@ OptionsMenu: ; 5b64
NewGame: ; 5b6b
xor a
ld [wc2cc], a
ld [wMonStatusFlags], a
call ResetWRAM
call NewGame_ClearTileMapEtc
call AreYouABoyOrAreYouAGirl
@ -86,7 +86,7 @@ NewGame: ; 5b6b
; 5b8f
AreYouABoyOrAreYouAGirl: ; 5b8f
callba Function10632f ; some mobile stuff
callba Mobile_AlwaysReturnNotCarry ; some mobile stuff
jr c, .ok
callba InitGender
ret
@ -211,9 +211,9 @@ ENDC
ld [Money + 2], a
xor a
ld [wdc17], a
ld [wWhichMomItem], a
ld hl, wdc19
ld hl, MomItemTriggerBalance
ld [hl], 2300 / $10000
inc hl
ld [hl], 2300 / $100 % $100
@ -385,7 +385,7 @@ Continue: ; 5d65
ld c, 20
call DelayFrames
callba JumpRoamMons
callba Function105091 ; Mystery Gift
callba MysteryGift_CopyReceivedDecosToPC ; Mystery Gift
callba Function140ae ; time-related
ld a, [wSpawnAfterChampion]
cp SPAWN_LANCE
@ -399,14 +399,14 @@ Continue: ; 5d65
.SpawnAfterE4
ld a, SPAWN_NEW_BARK
ld [wd001], a
ld [DefaultSpawnpoint], a
call PostCreditsSpawn
jp FinishContinueFunction
; 5de2
SpawnAfterRed: ; 5de2
ld a, SPAWN_MT_SILVER
ld [wd001], a
ld [DefaultSpawnpoint], a
; 5de7
PostCreditsSpawn: ; 5de7
@ -418,8 +418,11 @@ PostCreditsSpawn: ; 5de7
; 5df0
Continue_MobileAdapterMenu: ; 5df0
callba Function10632f ; mobile check
callba Mobile_AlwaysReturnNotCarry ; mobile check
ret nc
; the rest of this stuff is never reached because
; the previous function returns with carry not set
ld hl, wd479
bit 1, [hl]
ret nz
@ -480,7 +483,7 @@ Continue_CheckRTC_RestartClock: ; 5e48
FinishContinueFunction: ; 5e5d
.loop
xor a
ld [wc2c1], a
ld [wDontPlayMapMusicOnReload], a
ld [wLinkMode], a
ld hl, GameTimerPause
set 0, [hl]
@ -641,7 +644,7 @@ Continue_DisplayBadgeCount: ; 5f58
Continue_DisplayPokedexNumCaught: ; 5f6b
ld a, [StatusFlags]
bit 0, a
bit 0, a ; Pokedex
ret z
push hl
ld hl, PokedexCaught
@ -787,7 +790,7 @@ NamePlayer: ; 0x6074
dec a
jr z, .NewName
call StorePlayerName
callba Function8c1d
callba ApplyMonOrTrainerPals
callba MovePlayerPicLeft
ret
@ -1024,7 +1027,7 @@ StartTitleScreen: ; 6219
call .TitleScreen
call DelayFrame
.loop
call Function627b
call RunTitleScreen
jr nc, .loop
call ClearSprites
@ -1079,7 +1082,7 @@ endr
ret
; 627b
Function627b: ; 627b
RunTitleScreen: ; 627b
ld a, [wJumptableIndex]
bit 7, a
jr nz, .done_title
@ -1126,7 +1129,7 @@ endr
dw TitleScreenEnd
; 62b7
Function62b7: ; Unreferenced
.NextScene ; Unreferenced
ld hl, wJumptableIndex
inc [hl]
ret
@ -1152,7 +1155,7 @@ TitleScreenEntrance: ; 62bc
; Reversed signage for every other line's position.
; This is responsible for the interlaced effect.
ld a, e
xor -1
xor $ff
inc a
ld b, 8 * 10 / 2 ; logo height / 2
@ -1191,7 +1194,7 @@ TitleScreenTimer: ; 62f6
; Start a timer
ld hl, wcf65
ld de, $1140 ; 73.6 seconds
ld de, 73 * 60 + 36
ld [hl], e
inc hl
ld [hl], d
@ -1225,7 +1228,7 @@ TitleScreenMain: ; 6304
; To bring up the clock reset dialog:
; Hold Down + B + Select to initiate the sequence.
ld a, [$ffeb]
ld a, [hClockResetTrigger]
cp $34
jr z, .check_clock_reset
@ -1235,17 +1238,17 @@ TitleScreenMain: ; 6304
jr nz, .check_start
ld a, $34
ld [$ffeb], a
ld [hClockResetTrigger], a
jr .check_start
; Keep Select pressed, and hold Left + Up.
; Then let go of Select.
.check_clock_reset
bit 2, [hl] ; SELECT
bit SELECT_F, [hl]
jr nz, .check_start
xor a
ld [$ffeb], a
ld [hClockResetTrigger], a
ld a, [hl]
and D_LEFT + D_UP
@ -1368,12 +1371,12 @@ endr
Data63ca: ; 63ca
; frame 0 y, x; frame 1 y, x
db $5c, $50, $00, $00
db $5c, $68, $5c, $58
db $5c, $68, $5c, $78
db $5c, $88, $5c, $78
db $00, $00, $5c, $78
db $00, $00, $5c, $58
db 11 * 8 + 4, 10 * 8, 0 * 8, 0 * 8
db 11 * 8 + 4, 13 * 8, 11 * 8 + 4, 11 * 8
db 11 * 8 + 4, 13 * 8, 11 * 8 + 4, 15 * 8
db 11 * 8 + 4, 17 * 8, 11 * 8 + 4, 15 * 8
db 0 * 8, 0 * 8, 11 * 8 + 4, 15 * 8
db 0 * 8, 0 * 8, 11 * 8 + 4, 11 * 8
; 63e2
Copyright: ; 63e2
@ -1390,20 +1393,16 @@ Copyright: ; 63e2
CopyrightString: ; 63fd
; ©1995-2001 Nintendo
db $60, $61, $62, $63, $64, $65, $66
db $67, $68, $69, $6a, $6b, $6c
db $4e
db $60, $61, $62, $63, $64, $65, $66
db $67, $68, $69, $6a, $6b, $6c
; ©1995-2001 Creatures inc.
db $60, $61, $62, $63, $64, $65, $66, $6d
db $6e, $6f, $70, $71, $72, $7a, $7b, $7c
db $4e
next $60, $61, $62, $63, $64, $65, $66
db $6d, $6e, $6f, $70, $71, $72, $7a, $7b, $7c
; ©1995-2001 GAME FREAK inc.
db $60, $61, $62, $63, $64, $65, $66, $73, $74
db $75, $76, $77, $78, $79, $7a, $7b, $7c
next $60, $61, $62, $63, $64, $65, $66
db $73, $74, $75, $76, $77, $78, $79, $7a, $7b, $7c
db "@"
; 642e

10
engine/move_mon.asm
View File

@ -16,7 +16,7 @@ TryAddMonToParty: ; d88c
; Increase the party count
ld [de], a
ld a, [de] ; Why are we doing this?
ld [$ffae], a ; HRAM backup
ld [hMoveMon], a ; HRAM backup
add e
ld e, a
jr nc, .loadspecies
@ -39,7 +39,7 @@ TryAddMonToParty: ; d88c
ld hl, OTPartyMonOT
.loadOTname
ld a, [$ffae] ; Restore index from backup
ld a, [hMoveMon] ; Restore index from backup
dec a
call SkipNames
ld d, h
@ -54,7 +54,7 @@ TryAddMonToParty: ; d88c
ld [wd265], a
call GetPokemonName
ld hl, PartyMonNicknames
ld a, [$ffae]
ld a, [hMoveMon]
dec a
call SkipNames
ld d, h
@ -71,7 +71,7 @@ TryAddMonToParty: ; d88c
ld hl, OTPartyMon1Species
.initializeStats
ld a, [$ffae]
ld a, [hMoveMon]
dec a
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
@ -1168,7 +1168,7 @@ GiveEgg:: ; df8c
ld hl, PartyMon1Happiness
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
ld a, [wc2cc]
ld a, [wMonStatusFlags]
bit 1, a
ld a, 1
jr nz, .got_init_happiness

98
engine/mysterygift.asm
View File

@ -51,7 +51,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
ld a, [wMysteryGiftPlayerBackupItem]
and a
jp nz, .GiftWaiting
ld a, [wc912]
ld a, [wMysteryGiftPartnerBackupItem]
and a
jp nz, .FriendNotReady
ld a, [wc900]
@ -73,7 +73,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
ld c, a
callba MysteryGiftGetDecoration
push bc
call Function105069
call MysteryGift_CheckAndSetDecorationAlreadyReceived
pop bc
jr nz, .item
callab GetDecorationName_c
@ -680,24 +680,24 @@ Function104db7: ; 104db7 (41:4db7)
Function104dc5: ; 104dc5 (41:4dc5)
ld a, $c1
ld [$ff00+c], a
.asm_104dc8
.wait
dec d
ret z
xor a
ld [rIF], a
halt
jr .asm_104dc8
jr .wait
Function104dd1: ; 104dd1 (41:4dd1)
ld a, $c0
ld [$ff00+c], a
.asm_104dd4
.wait
dec d
ret z
xor a
ld [rIF], a
halt
jr .asm_104dd4
jr .wait
Function104ddd: ; 104ddd (41:4ddd)
ld d, $0
@ -763,7 +763,7 @@ asm_104e3a: ; 104e3a (41:4e3a)
Function104e46: ; 104e46 (41:4e46)
ld a, $2
ld [hPrintNum9], a
ld c, $56
ld c, rRP % $100
ld d, $0
ld e, d
ld d, $3d
@ -800,14 +800,14 @@ Function104e8c: ; 104e8c (41:4e8c)
Function104e93: ; 104e93 (41:4e93)
xor a
ld [hDivisor], a
ld [hMathBuffer], a
ld [hPrintNum5], a
ld [hPrintNum6], a
push hl
push bc
ld c, $56
ld c, rRP % $100
ld d, $3d
call Function104dd1
ld hl, hQuotient ; $ffb4 (aliases: hMultiplicand)
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld a, $5a
ld [hli], a
ld [hl], b
@ -817,26 +817,26 @@ Function104e93: ; 104e93 (41:4e93)
pop bc
pop hl
call Function104ed6
ld a, [hDivisor]
ld [hQuotient], a
ld a, [hMathBuffer]
ld [$ffb5], a
ld a, [hPrintNum5]
ld [hPrintNum2], a
ld a, [hPrintNum6]
ld [hPrintNum3], a
push hl
ld hl, hQuotient ; $ffb4 (aliases: hMultiplicand)
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld b, $2
call Function104ed6
ld hl, hPrintNum10
ld b, $1
call Function104faf
ld a, [hQuotient]
ld [hDivisor], a
ld a, [$ffb5]
ld [hMathBuffer], a
ld a, [hPrintNum2]
ld [hPrintNum5], a
ld a, [hPrintNum3]
ld [hPrintNum6], a
pop hl
ret
Function104ed6: ; 104ed6 (41:4ed6)
ld c, $56
ld c, rRP % $100
ld d, $5
call Function104dd1
ld d, $5
@ -852,15 +852,15 @@ Function104ed6: ; 104ed6 (41:4ed6)
inc b
jr z, .asm_104f2e
ld a, $8
ld [$ffb6], a
ld [hPrintNum4], a
ld a, [hli]
ld e, a
ld a, [hDivisor]
ld a, [hPrintNum5]
add e
ld [hDivisor], a
ld a, [hMathBuffer]
ld [hPrintNum5], a
ld a, [hPrintNum6]
adc $0
ld [hMathBuffer], a
ld [hPrintNum6], a
.asm_104f02
xor a
ld [rIF], a
@ -885,10 +885,10 @@ Function104ed6: ; 104ed6 (41:4ed6)
ld [rIF], a
halt
.asm_104f25
ld a, [$ffb6]
ld a, [hPrintNum4]
dec a
jr z, .asm_104eee
ld [$ffb6], a
ld [hPrintNum4], a
jr .asm_104f02
.asm_104f2e
ld a, $fe
@ -922,35 +922,35 @@ Function104f50: ; 104f50 (41:4f50)
Function104f57: ; 104f57 (41:4f57)
xor a
ld [hDivisor], a
ld [hMathBuffer], a
ld [hPrintNum5], a
ld [hPrintNum6], a
push bc
push hl
ld hl, hQuotient ; $ffb4 (aliases: hMultiplicand)
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld b, $2
call Function104faf
ld a, [$ffb5]
ld [$ffba], a
ld a, [hPrintNum3]
ld [hPrintNum8], a
ld b, a
pop hl
pop af
cp b
jp c, Function104f50
ld a, [hQuotient]
ld a, [hPrintNum2]
cp $5a
jp nz, Function104f50
call Function104faf
ld a, [hDivisor]
ld a, [hPrintNum5]
ld d, a
ld a, [hMathBuffer]
ld a, [hPrintNum6]
ld e, a
push hl
push de
ld hl, hQuotient ; $ffb4 (aliases: hMultiplicand)
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld b, $2
call Function104faf
pop de
ld hl, hQuotient ; $ffb4 (aliases: hMultiplicand)
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld a, [hli]
xor d
ld b, a
@ -967,9 +967,9 @@ Function104f57: ; 104f57 (41:4f57)
pop de
pop hl
ld a, d
ld [hDivisor], a
ld [hPrintNum5], a
ld a, e
ld [hMathBuffer], a
ld [hPrintNum6], a
ret
Function104faf: ; 104faf (41:4faf)
@ -993,7 +993,7 @@ Function104faf: ; 104faf (41:4faf)
inc b
jr z, .asm_10501a
ld a, $8
ld [$ffb6], a
ld [hPrintNum4], a
.asm_104fd9
ld d, $0
.asm_104fdb
@ -1022,9 +1022,9 @@ Function104faf: ; 104faf (41:4faf)
.asm_104ffd
res 0, e
.asm_104fff
ld a, [$ffb6]
ld a, [hPrintNum4]
dec a
ld [$ffb6], a
ld [hPrintNum4], a
jr z, .asm_10500b
ld a, e
rlca
@ -1033,12 +1033,12 @@ Function104faf: ; 104faf (41:4faf)
.asm_10500b
ld a, e
ld [hli], a
ld a, [hDivisor]
ld a, [hPrintNum5]
add e
ld [hDivisor], a
ld a, [hMathBuffer]
ld [hPrintNum5], a
ld a, [hPrintNum6]
adc $0
ld [hMathBuffer], a
ld [hPrintNum6], a
jr .asm_104fd2
.asm_10501a
call Function104d74
@ -1088,7 +1088,7 @@ endr
ld [rJOYP], a
ret
Function105069: ; 105069 (41:5069)
MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
call GetMysteryGiftBank
ld d, $0
ld b, CHECK_FLAG
@ -1110,7 +1110,7 @@ Function105069: ; 105069 (41:5069)
xor a
ret
Function105091: ; 105091 (41:5091)
MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091)
call GetMysteryGiftBank
ld c, $0
.loop

10
engine/scripting.asm
View File

@ -168,7 +168,7 @@ ENDC
dw Script_loadwildmon ; 5d
dw Script_loadtrainer ; 5e
dw Script_startbattle ; 5f
dw Script_returnafterbattle ; 60
dw Script_reloadmapafterbattle ; 60
dw Script_catchtutorial ; 61
dw Script_trainertext ; 62
dw Script_trainerflagaction ; 63
@ -203,7 +203,7 @@ ENDC
dw Script_encountermusic ; 80
dw Script_musicfadeout ; 81
dw Script_playmapmusic ; 82
dw Script_reloadmapmusic ; 83
dw Script_dontrestartmapmusic ; 83
dw Script_cry ; 84
dw Script_playsound ; 85
dw Script_waitsfx ; 86
@ -1555,7 +1555,7 @@ Script_catchtutorial: ; 97447
jp Script_reloadmap
; 97459
Script_returnafterbattle: ; 97459
Script_reloadmapafterbattle: ; 97459
; script command 0x60
ld hl, wBattleScriptFlags
@ -2905,11 +2905,11 @@ Script_blackoutmod: ; 97a78
ret
; 97a85
Script_reloadmapmusic: ; 97a85
Script_dontrestartmapmusic: ; 97a85
; script command 0x83
ld a, 1
ld [wc2c1], a
ld [wDontPlayMapMusicOnReload], a
ret
; 97a8b

12
engine/sprite_anims.asm
View File

@ -94,13 +94,13 @@ endr
add hl, bc
ld a, d
and $10 ; bit 4
jr z, .load_Null
jr z, .load_zero
ld a, e
and a
jr z, .load_minus_two
cp $1
jr z, .load_minus_one
.load_Null
.load_zero
xor a
ld [hl], a
ret
@ -140,11 +140,11 @@ endr
; 8d306 (23:5306)
; Anonymous jumptable (see .anonymous_jumptable)
dw .four_Null
dw .four_zero
dw .four_one
; 8d30a
.four_Null: ; 8d30a
.four_zero: ; 8d30a
call .IncrementSpriteAnimStruct0B
ld hl, SPRITEANIMSTRUCT_INDEX
@ -425,7 +425,7 @@ endr
; 8d487 (23:5487)
; Anonymous jumptable (see .anonymous_jumptable)
dw .sixteen_Null
dw .sixteen_zero
dw .sixteen_one
dw .sixteen_two
dw .sixteen_three
@ -433,7 +433,7 @@ endr
dw .sixteen_five
; 8d493
.sixteen_Null: ; 8d493
.sixteen_zero: ; 8d493
ld a, $14
call _ReinitSpriteAnimFrame

25
event/mom_phone.asm
View File

@ -6,7 +6,7 @@ MomTriesToBuySomething:: ; fcfec
and a
ret nz
xor a
ld [wdc18], a
ld [wWhichMomItemSet], a
call CheckBalance_MomItem2
ret nc
call Mom_GiveItemOrDoll
@ -26,10 +26,10 @@ MomTriesToBuySomething:: ; fcfec
.ASMFunction: ; fd017
call MomBuysItem_DeductFunds
call Mom_GetScriptPointer
ld a, [wdc18]
ld a, [wWhichMomItemSet]
and a
jr nz, .ok
ld hl, wdc17
ld hl, wWhichMomItem
inc [hl]
.ok
ld a, PHONE_MOM
@ -52,7 +52,7 @@ MomTriesToBuySomething:: ; fcfec
; fd044
CheckBalance_MomItem2: ; fd044
ld a, [wdc17]
ld a, [wWhichMomItem]
cp 10
jr nc, .nope
call GetItemFromMom
@ -82,12 +82,12 @@ CheckBalance_MomItem2: ; fd044
inc hl
ld [hl], (2300 % $100) ; $fc
.loop
ld de, wdc19
ld de, MomItemTriggerBalance
ld bc, wMomsMoney
callba CompareMoney
jr z, .exact
jr nc, .less_than
call Functionfd099
call .AddMoney
jr .loop
.less_than
@ -95,17 +95,16 @@ CheckBalance_MomItem2: ; fd044
ret
.exact
call Functionfd099
call .AddMoney
ld a, 5
call RandomRange
inc a
ld [wdc18], a
ld [wWhichMomItemSet], a
scf
ret
; fd099
Functionfd099: ; fd099
ld de, wdc19
.AddMoney
ld de, MomItemTriggerBalance
ld bc, hMoneyTemp
callba AddMoney
ret
@ -183,7 +182,7 @@ Mom_GetScriptPointer: ; fd0eb (3f:50eb)
GetItemFromMom: ; fd117
ld a, [wdc18]
ld a, [wWhichMomItemSet]
and a
jr z, .zero
dec a
@ -191,7 +190,7 @@ GetItemFromMom: ; fd117
jr .GetFromList1
.zero
ld a, [wdc17]
ld a, [wWhichMomItem]
cp 10 ; length of MomItems_2
jr c, .ok
xor a

2
event/sweet_scent.asm
View File

@ -18,7 +18,7 @@ UnknownScript_0x506c8: ; 0x506c8
iftrue UnknownScript_0x506e5
randomwildmon
startbattle
returnafterbattle
reloadmapafterbattle
end
; 0x506e5

82
home.asm
View File

@ -3,18 +3,15 @@ INCLUDE "includes.asm"
SECTION "NULL", ROM0[0]
NULL::
INCLUDE "rst.asm"
INCLUDE "interrupts.asm"
SECTION "Header", ROM0[$100]
Start::
nop
jp _Start
SECTION "Home", ROM0[$150]
INCLUDE "home/init.asm"
@ -40,7 +37,6 @@ INCLUDE "home/handshake.asm"
INCLUDE "home/game_time.asm"
INCLUDE "home/map.asm"
Function2d43:: ; 2d43
; Inexplicably empty.
; Seen in PredefPointers.
@ -50,29 +46,26 @@ Function2d43:: ; 2d43
ret
; 2d54
INCLUDE "home/farcall.asm"
INCLUDE "home/predef.asm"
INCLUDE "home/window.asm"
Function2e4e:: ; 2e4e
; Unreferenced.
scf
ret
; 2e50
INCLUDE "home/flag.asm"
Function2ebb:: ; 2ebb
ld a, [wc2cc]
; unreferenced
ld a, [wMonStatusFlags]
bit 1, a
ret z
ld a, [hJoyDown]
bit 1, a ; B_BUTTON
bit B_BUTTON_F, a
ret
; 2ec6
@ -88,14 +81,14 @@ xor_a_dec_a:: ; 2ec8
; 2ecb
Function2ecb:: ; 2ecb
; unreferenced
push hl
ld hl, wc2cc
ld hl, wMonStatusFlags
bit 1, [hl]
pop hl
ret
; 2ed3
DisableSpriteUpdates:: ; 0x2ed3
; disables overworld sprite updating?
xor a
@ -119,10 +112,8 @@ EnableSpriteUpdates:: ; 2ee4
ret
; 2ef6
INCLUDE "home/string.asm"
IsInJohto:: ; 2f17
; Return 0 if the player is in Johto, and 1 in Kanto.
@ -157,17 +148,14 @@ IsInJohto:: ; 2f17
ret
; 2f3e
ret_2f3e:: ; 2f3e
ret
; 2f3f
INCLUDE "home/item.asm"
INCLUDE "home/random.asm"
INCLUDE "home/sram.asm"
; Register aliases
_hl_:: ; 2fec
@ -179,10 +167,8 @@ _de_:: ; 2fed
ret
; 2fef
INCLUDE "home/double_speed.asm"
ClearSprites:: ; 300b
; Erase OAM data
ld hl, Sprites
@ -209,10 +195,8 @@ HideSprites:: ; 3016
ret
; 3026
INCLUDE "home/copy2.asm"
LoadTileMapToTempTileMap:: ; 309d
; Load TileMap into TempTileMap
ld a, [rSVBK]
@ -252,7 +236,6 @@ LoadTempTileMapToTileMap:: ; 30bf
ret
; 30d6
CopyName1:: ; 30d6
; Copies the name from de to StringBuffer2
ld hl, StringBuffer2
@ -305,10 +288,8 @@ SkipNames:: ; 0x30f4
ret
; 0x30fe
INCLUDE "home/math.asm"
PrintLetterDelay:: ; 313d
; Wait before printing the next letter.
@ -392,7 +373,6 @@ PrintLetterDelay:: ; 313d
ret
; 318c
CopyDataUntil:: ; 318c
; Copy [hl .. bc) to de.
@ -412,7 +392,6 @@ CopyDataUntil:: ; 318c
ret
; 0x3198
PrintNum:: ; 3198
ld a, [hROMBank]
push af
@ -426,7 +405,6 @@ PrintNum:: ; 3198
ret
; 31a4
MobilePrintNum:: ; 31a4
ld a, [hROMBank]
push af
@ -440,7 +418,6 @@ MobilePrintNum:: ; 31a4
ret
; 31b0
FarPrintText:: ; 31b0
ld [hBuffer], a
ld a, [hROMBank]
@ -455,7 +432,6 @@ FarPrintText:: ; 31b0
ret
; 31be
CallPointerAt:: ; 31be
ld a, [hROMBank]
push af
@ -474,7 +450,6 @@ CallPointerAt:: ; 31be
ret
; 31cd
QueueScript:: ; 31cd
; Push pointer hl in the current bank to wQueuedScriptBank.
ld a, [hROMBank]
@ -489,7 +464,6 @@ FarQueueScript:: ; 31cf
ret
; 31db
StringCmp:: ; 31db
; Compare c bytes at de and hl.
; Return z if they all match.
@ -504,7 +478,6 @@ StringCmp:: ; 31db
ret
; 0x31e4
CompareLong:: ; 31e4
; Compare bc bytes at de and hl.
; Return carry if they all match.
@ -529,7 +502,6 @@ CompareLong:: ; 31e4
ret
; 31f3
ClearBGPalettes:: ; 31f3
call ClearPalettes
WaitBGMap:: ; 31f6
@ -560,14 +532,12 @@ WaitBGMap2:: ; 0x3200
ret
; 0x3218
IsCGB:: ; 3218
ld a, [hCGB]
and a
ret
; 321c
ApplyTilemap:: ; 321c
ld a, [hCGB]
and a
@ -685,7 +655,6 @@ endr
ret
; 32f9
SetPalettes:: ; 32f9
; Inits the Palettes
; depending on the system the monochromes palettes or color palettes
@ -709,7 +678,6 @@ SetPalettes:: ; 32f9
ret
; 3317
ClearPalettes:: ; 3317
; Make all palettes white
@ -747,7 +715,6 @@ ClearPalettes:: ; 3317
ret
; 333e
GetMemSGBLayout:: ; 333e
ld b, SCGB_RAM
GetSGBLayout:: ; 3340
@ -765,7 +732,6 @@ GetSGBLayout:: ; 3340
predef_jump Predef_LoadSGBLayout ; LoadSGBLayout
; 334e
SetHPPal:: ; 334e
; Set palette for hp bar pixel length e at hl.
call GetHPPal
@ -773,7 +739,6 @@ SetHPPal:: ; 334e
ret
; 3353
GetHPPal:: ; 3353
; Get palette for hp bar pixel length e in d.
@ -788,7 +753,6 @@ GetHPPal:: ; 3353
ret
; 335f
CountSetBits:: ; 0x335f
; Count the number of set bits in b bytes starting from hl.
; Return in a, c and [wd265].
@ -815,7 +779,6 @@ CountSetBits:: ; 0x335f
ret
; 0x3376
GetWeekday:: ; 3376
ld a, [CurDay]
.mod
@ -825,10 +788,8 @@ GetWeekday:: ; 3376
ret
; 3380
INCLUDE "home/pokedex_flags.asm"
NamesPointers:: ; 33ab
dba PokemonNames
dba MoveNames
@ -904,7 +865,6 @@ endr
ret
; 3411
GetNthString:: ; 3411
; Return the address of the
; ath string starting from hl.
@ -925,7 +885,6 @@ GetNthString:: ; 3411
ret
; 3420
GetBasePokemonName:: ; 3420
; Discards gender (Nidoran).
@ -951,7 +910,6 @@ GetBasePokemonName:: ; 3420
; 343b
GetPokemonName:: ; 343b
; Get Pokemon name wd265.
@ -991,7 +949,6 @@ endr
ret
; 3468
GetItemName:: ; 3468
; Get item name wd265.
@ -1016,7 +973,6 @@ GetItemName:: ; 3468
ret
; 3487
GetTMHMName:: ; 3487
; Get TM/HM name by item id wd265.
@ -1100,7 +1056,6 @@ GetTMHMName:: ; 3487
db "@"
; 34df
IsHM:: ; 34df
cp HM01
jr c, .NotHM
@ -1111,7 +1066,6 @@ IsHM:: ; 34df
ret
; 34e7
IsHMMove:: ; 34e7
ld hl, .HMMoves
ld de, 1
@ -1128,7 +1082,6 @@ IsHMMove:: ; 34e7
db -1
; 34f8
GetMoveName:: ; 34f8
push hl
@ -1145,7 +1098,6 @@ GetMoveName:: ; 34f8
ret
; 350c
ScrollingMenu:: ; 350c
call CopyMenuData2
ld a, [hROMBank]
@ -1212,7 +1164,6 @@ Function354b:: ; 354b joypad
ret
; 3567
HandleStoneQueue:: ; 3567
ld a, [hROMBank]
push af
@ -1358,7 +1309,6 @@ endr
ret
; 3600
CheckTrainerBattle2:: ; 3600
ld a, [hROMBank]
@ -1373,7 +1323,6 @@ CheckTrainerBattle2:: ; 3600
ret
; 360d
CheckTrainerBattle:: ; 360d
; Check if any trainer on the map sees the player and wants to battle.
@ -1493,7 +1442,6 @@ LoadTrainer_continue:: ; 367e
ret
; 36a5
FacingPlayerDistance_bc:: ; 36a5
push de
@ -1504,7 +1452,6 @@ FacingPlayerDistance_bc:: ; 36a5
ret
; 36ad
FacingPlayerDistance:: ; 36ad
; Return carry if the sprite at bc is facing the player,
; and its distance in d.
@ -1575,7 +1522,6 @@ FacingPlayerDistance:: ; 36ad
ret
; 36f5
CheckTrainerFlag:: ; 36f5
push bc
ld hl, OBJECT_MAP_OBJECT_INDEX
@ -1601,7 +1547,6 @@ CheckTrainerFlag:: ; 36f5
ret
; 3718
PrintWinLossText:: ; 3718
ld a, [BattleType]
cp BATTLETYPE_CANLOSE
@ -1629,8 +1574,6 @@ PrintWinLossText:: ; 3718
ret
; 3741
IsAPokemon:: ; 3741
; Return carry if species a is not a Pokemon.
and a
@ -1649,7 +1592,6 @@ IsAPokemon:: ; 3741
ret
; 3750
DrawBattleHPBar:: ; 3750
; Draw an HP bar d tiles long at hl
; Fill it up to e pixels
@ -1711,7 +1653,6 @@ DrawBattleHPBar:: ; 3750
ret
; 3786
PrepMonFrontpic:: ; 3786
ld a, $1
ld [wBoxAlignment], a
@ -1741,10 +1682,8 @@ _PrepMonFrontpic:: ; 378b
ret
; 37b6
INCLUDE "home/cry.asm"
PrintLevel:: ; 382d
; Print TempMonLevel at hl
@ -1777,7 +1716,6 @@ Function3842:: ; 3842
jp PrintNum
; 384d
Function384d:: ; 384d
ld hl, wListMoves_MoveIndicesBuffer
ld c, a
@ -1787,7 +1725,6 @@ Function384d:: ; 384d
ret
; 3856
GetBaseData:: ; 3856
push bc
push de
@ -1845,7 +1782,6 @@ GetBaseData:: ; 3856
ret
; 389c
GetCurNick:: ; 389c
ld a, [CurPartyMon]
ld hl, PartyMonNicknames
@ -1871,7 +1807,6 @@ GetNick:: ; 38a2
ret
; 38bb
PrintBCDNumber:: ; 38bb
; function to print a BCD (Binary-coded decimal) number
; de = address of BCD number
@ -1973,7 +1908,6 @@ GetPartyLocation:: ; 3927
jp AddNTimes
; 392d
Function392d:: ; 392d
push hl
ld a, b
@ -1991,7 +1925,6 @@ Function392d:: ; 392d
ret
; 3945
INCLUDE "home/battle.asm"
Function3b0c:: ; 3b0c
@ -2015,8 +1948,6 @@ Function3b0c:: ; 3b0c
ret
; 3b2a
_InitSpriteAnimStruct:: ; 3b2a
ld [wSpriteAnimIDBuffer], a
@ -2035,7 +1966,6 @@ _InitSpriteAnimStruct:: ; 3b2a
ret
; 3b3c
ReinitSpriteAnimFrame:: ; 3b3c
ld [wSpriteAnimIDBuffer], a
@ -2054,11 +1984,9 @@ ReinitSpriteAnimFrame:: ; 3b3c
ret
; 3b4e
INCLUDE "home/audio.asm"
INCLUDE "home/mobile.asm"
Function3eea:: ; 3eea
push hl
push bc

6
home/audio.asm
View File

@ -397,7 +397,7 @@ EnterMapMusic:: ; 3d03
push af
xor a
ld [wc2c1], a
ld [wDontPlayMapMusicOnReload], a
ld de, MUSIC_BICYCLE
ld a, [PlayerState]
cp PLAYER_BIKE
@ -422,7 +422,7 @@ EnterMapMusic:: ; 3d03
; 3d2f
TryRestartMapMusic:: ; 3d2f
ld a, [wc2c1]
ld a, [wDontPlayMapMusicOnReload]
and a
jr z, RestartMapMusic
xor a
@ -431,7 +431,7 @@ TryRestartMapMusic:: ; 3d2f
call PlayMusic
call DelayFrame
xor a
ld [wc2c1], a
ld [wDontPlayMapMusicOnReload], a
ret
; 3d47

26
home/init.asm
View File

@ -22,17 +22,17 @@ Reset:: ; 150
_Start:: ; 16e
cp $11
jr z, .asm_175
jr z, .cgb
xor a
jr .asm_177
jr .load
.asm_175
.cgb
ld a, $1
.asm_177
.load
ld [hCGB], a
ld a, $1
ld [$ffea], a
ld [hFFEA], a
; 17d
@ -69,29 +69,29 @@ Init:: ; 17d
ld [rLCDC], a
; Clear WRAM bank 0
ld hl, $c000
ld bc, $d000 - $c000
.asm_1b1
ld hl, wc000
ld bc, wd000 - wc000
.ByteFill
ld [hl], 0
inc hl
dec bc
ld a, b
or c
jr nz, .asm_1b1
jr nz, .ByteFill
ld sp, Stack
; Clear HRAM
ld a, [hCGB]
push af
ld a, [$ffea]
ld a, [hFFEA]
push af
xor a
ld hl, $ff80
ld bc, $ffff - $ff80
ld hl, HRAM_START
ld bc, HRAM_END - HRAM_START
call ByteFill
pop af
ld [$ffea], a
ld [hFFEA], a
pop af
ld [hCGB], a

8
home/video.asm
View File

@ -20,10 +20,10 @@ DMATransfer:: ; 15d8
UpdateBGMapBuffer:: ; 15e3
; Copy [$ffdc] 16x8 tiles from BGMapBuffer
; Copy [hFFDC] 16x8 tiles from BGMapBuffer
; to bg map addresses in BGMapBufferPtrs.
; [$ffdc] must be even since this is done in pairs.
; [hFFDC] must be even since this is done in pairs.
; Return carry on success.
@ -76,11 +76,11 @@ rept 2
endr
; We've done 2 16x8 blocks
ld a, [$ffdc]
ld a, [hFFDC]
rept 2
dec a
endr
ld [$ffdc], a
ld [hFFDC], a
jr nz, .next

9
hram.asm
View File

@ -1,8 +1,9 @@
HRAM_START EQU $ff80
hPushOAM EQU $ff80
hROMBankBackup EQU $ff8a
hBuffer EQU $ff8b
hFF8C EQU $ff8c
hRTCDayHi EQU $ff8d
hRTCDayLo EQU $ff8e
hRTCHours EQU $ff8f
@ -34,7 +35,7 @@ hInMenu EQU $ffaa
hPrinter EQU $ffac
hFillBox EQU $ffad
hMoveMon EQU $ffae
hMapObjectIndexBuffer EQU $ffaf
hObjectStructIndexBuffer EQU $ffb0
@ -114,3 +115,7 @@ hCGB EQU $ffe6
hSGB EQU $ffe7
hDMATransfer EQU $ffe8
hMobile EQU $ffe9
hFFEA EQU $ffea
hClockResetTrigger EQU $ffeb
HRAM_END EQU $ffff

2
items/item_effects.asm
View File

@ -1842,7 +1842,7 @@ HealHP_SFX_GFX: ; f1db (3:71db)
ld bc, SCREEN_WIDTH * 2
call AddNTimes
ld a, $2
ld [wd10a], a
ld [wWhichHPBar], a
predef_jump AnimateHPBar
UseItem_SelectMon: ; f1f9 (3:71f9)

12
macros/event.asm
View File

@ -618,9 +618,9 @@ startbattle: macro
db startbattle_command
endm
enum returnafterbattle_command
returnafterbattle: macro
db returnafterbattle_command
enum reloadmapafterbattle_command
reloadmapafterbattle: macro
db reloadmapafterbattle_command
endm
enum catchtutorial_command
@ -833,9 +833,9 @@ playmapmusic: macro
db playmapmusic_command
endm
enum reloadmapmusic_command
reloadmapmusic: macro
db reloadmapmusic_command
enum dontrestartmapmusic_command
dontrestartmapmusic: macro
db dontrestartmapmusic_command
endm
enum cry_command

20
main.asm
View File

@ -1922,7 +1922,7 @@ _PrintNum:: ; c4c7
ld a, [hPrintNum5]
ld b, a
ld a, [hPrintNum2]
ld [$ffba], a
ld [hPrintNum8], a
cp b
jr c, .skip1
sub b
@ -1970,7 +1970,7 @@ _PrintNum:: ; c4c7
ld a, [hPrintNum9]
ld [hPrintNum3], a
.skip3
ld a, [$ffba]
ld a, [hPrintNum8]
ld [hPrintNum2], a
.skip1
ld a, [hPrintNum1]
@ -1981,7 +1981,7 @@ _PrintNum:: ; c4c7
jr nz, .done
bit 5, d
jr z, .done
ld a, $f0
ld a, "¥"
ld [hli], a
res 5, d
.done
@ -1993,7 +1993,7 @@ _PrintNum:: ; c4c7
dec e
ret nz
inc hl
ld [hl], $f2
ld [hl], "·"
ret
.PrintLeadingZero: ; c644
@ -3598,7 +3598,7 @@ HeadbuttScript: ; 0xceab
closetext
randomwildmon
startbattle
returnafterbattle
reloadmapafterbattle
end
.no_battle
@ -3706,7 +3706,7 @@ RockSmashScript: ; cf32
iffalse .done
randomwildmon
startbattle
returnafterbattle
reloadmapafterbattle
.done
end
; 0xcf55
@ -3894,7 +3894,7 @@ Script_GotABite: ; 0xd035
closetext
randomwildmon
startbattle
returnafterbattle
reloadmapafterbattle
end
; 0xd05c
@ -5472,7 +5472,7 @@ BugCatchingContestBattleScript:: ; 0x135eb
writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST
randomwildmon
startbattle
returnafterbattle
reloadmapafterbattle
copybytetovar wParkBallsRemaining
iffalse BugCatchingContestOutOfBallsScript
end
@ -9979,7 +9979,7 @@ DrawEnemyHP: ; 50b0e
ld a, $2
DrawHP: ; 50b10
ld [wd10a], a
ld [wWhichHPBar], a
push hl
push bc
ld a, [MonType]
@ -12814,7 +12814,7 @@ StartBattleWithMapTrainerScript: ; 0xbe68a
closetext
loadmemtrainer
startbattle
returnafterbattle
reloadmapafterbattle
trainerflagaction SET_FLAG
loadvar wRunningTrainerBattleScript, -1

2
maps/AzaleaGym.asm
View File

@ -25,7 +25,7 @@ BugsyScript:
winlosstext BugsyText_ResearchIncomplete, 0
loadtrainer BUGSY, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_BUGSY
opentext
writetext Text_ReceivedHiveBadge

12
maps/AzaleaTown.asm
View File

@ -74,8 +74,8 @@ AzaleaTownRivalBattleScript:
setlasttalked AZALEATOWN_SILVER
loadtrainer RIVAL1, RIVAL1_6
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .AfterBattle
.Totodile:
@ -83,8 +83,8 @@ AzaleaTownRivalBattleScript:
setlasttalked AZALEATOWN_SILVER
loadtrainer RIVAL1, RIVAL1_4
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .AfterBattle
.Chikorita:
@ -92,8 +92,8 @@ AzaleaTownRivalBattleScript:
setlasttalked AZALEATOWN_SILVER
loadtrainer RIVAL1, RIVAL1_5
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .AfterBattle
.AfterBattle:

2
maps/BlackthornGym1F.asm
View File

@ -43,7 +43,7 @@ BlackthornGymClairScript:
winlosstext ClairWinText, 0
loadtrainer CLAIR, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_CLAIR
opentext
writetext ClairText_GoToDragonsDen

2
maps/BrunosRoom.asm
View File

@ -58,7 +58,7 @@ BrunoScript_0x1809c5:
winlosstext UnknownText_0x180b23, 0
loadtrainer BRUNO, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_ELITE_4_BRUNO
opentext
writetext UnknownText_0x180b3c

12
maps/BurnedTower1F.asm
View File

@ -75,8 +75,8 @@ BurnedTowerRivalBattleScript:
setlasttalked BURNEDTOWER1F_SILVER
loadtrainer RIVAL1, RIVAL1_9
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .returnfrombattle
.totodile:
@ -84,8 +84,8 @@ BurnedTowerRivalBattleScript:
setlasttalked BURNEDTOWER1F_SILVER
loadtrainer RIVAL1, RIVAL1_7
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .returnfrombattle
.chikorita:
@ -93,8 +93,8 @@ BurnedTowerRivalBattleScript:
setlasttalked BURNEDTOWER1F_SILVER
loadtrainer RIVAL1, RIVAL1_8
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .returnfrombattle
.returnfrombattle:

2
maps/CeladonGym.asm
View File

@ -24,7 +24,7 @@ ErikaScript_0x72a6a:
winlosstext UnknownText_0x72c3e, 0
loadtrainer ERIKA, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_ERIKA
setevent EVENT_BEAT_LASS_MICHELLE
setevent EVENT_BEAT_PICNICKER_TANYA

2
maps/CeruleanGym.asm
View File

@ -71,7 +71,7 @@ MistyScript_0x188432:
winlosstext UnknownText_0x18870c, 0
loadtrainer MISTY, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_MISTY
setevent EVENT_BEAT_SWIMMERF_DIANA
setevent EVENT_BEAT_SWIMMERF_BRIANA

6
maps/CherrygroveCity.asm
View File

@ -128,7 +128,7 @@ CherrygroveSilverTriggerNorth:
loadtrainer RIVAL1, RIVAL1_3
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
reloadmapmusic
dontrestartmapmusic
reloadmap
iftrue .AfterVictorious
jump .AfterYourDefeat
@ -139,7 +139,7 @@ CherrygroveSilverTriggerNorth:
loadtrainer RIVAL1, RIVAL1_1
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
reloadmapmusic
dontrestartmapmusic
reloadmap
iftrue .AfterVictorious
jump .AfterYourDefeat
@ -150,7 +150,7 @@ CherrygroveSilverTriggerNorth:
loadtrainer RIVAL1, RIVAL1_2
writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
reloadmapmusic
dontrestartmapmusic
reloadmap
iftrue .AfterVictorious
jump .AfterYourDefeat

4
maps/CianwoodCity.asm
View File

@ -70,8 +70,8 @@ UnknownScript_0x1a001e:
setlasttalked CIANWOODCITY_EUSINE
loadtrainer MYSTICALMAN, EUSINE
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
playmusic MUSIC_MYSTICALMAN_ENCOUNTER
opentext
writetext UnknownText_0x1a05c3

2
maps/CianwoodGym.asm
View File

@ -42,7 +42,7 @@ ChuckScript_0x9d60f:
winlosstext UnknownText_0x9d7f6, 0
loadtrainer CHUCK, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_CHUCK
opentext
writetext UnknownText_0x9d835

2
maps/EcruteakGym.asm
View File

@ -36,7 +36,7 @@ MortyScript_0x99d58:
winlosstext UnknownText_0x9a00a, 0
loadtrainer MORTY, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_MORTY
opentext
writetext UnknownText_0x9a043

18
maps/FuchsiaGym.asm
View File

@ -25,7 +25,7 @@ JanineScript_0x195db9:
winlosstext UnknownText_0x195fa1, 0
loadtrainer JANINE, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_JANINE
setevent EVENT_BEAT_LASS_ALICE
setevent EVENT_BEAT_LASS_LINDA
@ -78,13 +78,13 @@ UnknownScript_0x195e2c:
loadtrainer LASS, ALICE
startbattle
iftrue UnknownScript_0x195e4a
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_LASS_ALICE
end
UnknownScript_0x195e4a:
variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_JANINE
returnafterbattle
reloadmapafterbattle
end
UnknownScript_0x195e4f:
@ -112,13 +112,13 @@ UnknownScript_0x195e66:
loadtrainer LASS, LINDA
startbattle
iftrue UnknownScript_0x195e84
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_LASS_LINDA
end
UnknownScript_0x195e84:
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_JANINE
returnafterbattle
reloadmapafterbattle
end
UnknownScript_0x195e89:
@ -146,13 +146,13 @@ UnknownScript_0x195ea0:
loadtrainer PICNICKER, CINDY
startbattle
iftrue UnknownScript_0x195ebe
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_PICNICKER_CINDY
end
UnknownScript_0x195ebe:
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_JANINE
returnafterbattle
reloadmapafterbattle
end
UnknownScript_0x195ec3:
@ -180,13 +180,13 @@ UnknownScript_0x195eda:
loadtrainer CAMPER, BARRY
startbattle
iftrue UnknownScript_0x195ef8
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_CAMPER_BARRY
end
UnknownScript_0x195ef8:
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_JANINE
returnafterbattle
reloadmapafterbattle
end
UnknownScript_0x195efd:

2
maps/GoldenrodGym.asm
View File

@ -34,7 +34,7 @@ WhitneyScript_0x5400c:
winlosstext UnknownText_0x541a5, 0
loadtrainer WHITNEY, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_WHITNEY
setevent EVENT_MADE_WHITNEY_CRY
dotrigger $1

2
maps/IlexForest.asm
View File

@ -473,7 +473,7 @@ MapIlexForestSignpost4Script:
special Special_CelebiShrineEvent
loadwildmon CELEBI, 30
startbattle
returnafterbattle
reloadmapafterbattle
pause 20
special CheckCaughtCelebi
iffalse .DidntCatchCelebi

12
maps/IndigoPlateauPokeCenter1F.asm
View File

@ -103,8 +103,8 @@ UnknownScript_0x1800ce:
setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER
loadtrainer RIVAL2, 6
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump UnknownScript_0x180113
UnknownScript_0x1800f3:
@ -112,8 +112,8 @@ UnknownScript_0x1800f3:
setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER
loadtrainer RIVAL2, 4
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump UnknownScript_0x180113
UnknownScript_0x180103:
@ -121,8 +121,8 @@ UnknownScript_0x180103:
setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER
loadtrainer RIVAL2, 5
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump UnknownScript_0x180113
UnknownScript_0x180113:

2
maps/KarensRoom.asm
View File

@ -58,7 +58,7 @@ KarenScript_0x180bee:
winlosstext UnknownText_0x180cf8, 0
loadtrainer KAREN, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_ELITE_4_KAREN
opentext
writetext UnknownText_0x180d29

2
maps/KogasRoom.asm
View File

@ -58,7 +58,7 @@ KogaScript_0x18075a:
winlosstext UnknownText_0x1808a9, 0
loadtrainer KOGA, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_ELITE_4_KOGA
opentext
writetext UnknownText_0x1808ca

15
maps/KrissHouse2F.asm
View File

@ -40,22 +40,21 @@ KrissHouse2F_MapScriptHeader:
Doll1:
describedecoration $1
describedecoration 1
Doll2:
describedecoration $2
describedecoration 2
BigDoll:
describedecoration $3
describedecoration 3
GameConsole:
describedecoration $4
describedecoration 4
KrissHousePoster:
dw EVENT_KRISS_ROOM_POSTER ; event
dw .Script
dw EVENT_KRISS_ROOM_POSTER, .Script
.Script
describedecoration $0
describedecoration 0
KrissHouseRadio:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
@ -70,7 +69,7 @@ KrissHouseRadio:
pause 45
writetext KrisRadioText3
pause 45
musicfadeout MUSIC_NEW_BARK_TOWN, $10
musicfadeout MUSIC_NEW_BARK_TOWN, 16
writetext KrisRadioText4
pause 45
closetext

2
maps/LakeofRage.asm
View File

@ -97,7 +97,7 @@ GyaradosScript_0x70063:
if_equal $1, UnknownScript_0x7007a
disappear LAKEOFRAGE_GYARADOS
UnknownScript_0x7007a:
returnafterbattle
reloadmapafterbattle
opentext
giveitem RED_SCALE
waitsfx

4
maps/LancesRoom.asm
View File

@ -66,8 +66,8 @@ LanceScript_0x180e7b:
setlasttalked LANCESROOM_LANCE
loadtrainer CHAMPION, LANCE
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
setevent EVENT_BEAT_CHAMPION_LANCE
opentext
writetext UnknownText_0x181132

2
maps/MahoganyGym.asm
View File

@ -25,7 +25,7 @@ PryceScript_0x199a9e:
winlosstext UnknownText_0x199cb3, 0
loadtrainer PRYCE, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_PRYCE
opentext
writetext UnknownText_0x199d3b

12
maps/MountMoon.asm
View File

@ -38,8 +38,8 @@ MountMoon_MapScriptHeader:
setlasttalked MOUNTMOON_SILVER
loadtrainer RIVAL2, 3
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishBattle
.Totodile:
@ -47,8 +47,8 @@ MountMoon_MapScriptHeader:
setlasttalked MOUNTMOON_SILVER
loadtrainer RIVAL2, 1
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishBattle
.Chikorita:
@ -56,8 +56,8 @@ MountMoon_MapScriptHeader:
setlasttalked MOUNTMOON_SILVER
loadtrainer RIVAL2, 2
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishBattle
.FinishBattle:

2
maps/MountMortarB1F.asm
View File

@ -27,7 +27,7 @@ BlackBeltScript_0x7e1f6:
winlosstext UnknownText_0x7e2a9, 0
loadtrainer BLACKBELT_T, KIYO
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_BLACKBELT_KIYO
opentext
UnknownScript_0x7e217:

10
maps/NationalPark.asm
View File

@ -124,7 +124,7 @@ UnknownScript_0x5c088:
.LoadFight0
loadtrainer SCHOOLBOY, JACK1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wJackFightCount, 1
clearflag ENGINE_JACK
end
@ -132,7 +132,7 @@ UnknownScript_0x5c088:
.LoadFight1
loadtrainer SCHOOLBOY, JACK2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wJackFightCount, 2
clearflag ENGINE_JACK
end
@ -140,7 +140,7 @@ UnknownScript_0x5c088:
.LoadFight2
loadtrainer SCHOOLBOY, JACK3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wJackFightCount, 3
clearflag ENGINE_JACK
end
@ -148,7 +148,7 @@ UnknownScript_0x5c088:
.LoadFight3
loadtrainer SCHOOLBOY, JACK4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wJackFightCount, 4
clearflag ENGINE_JACK
end
@ -156,7 +156,7 @@ UnknownScript_0x5c088:
.LoadFight4
loadtrainer SCHOOLBOY, JACK5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_JACK
end

2
maps/OlivineGym.asm
View File

@ -20,7 +20,7 @@ JasmineScript_0x9c12f:
winlosstext UnknownText_0x9c2bb, 0
loadtrainer JASMINE, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_JASMINE
opentext
writetext UnknownText_0x9c33a

8
maps/OlivineLighthouse2F.asm
View File

@ -67,7 +67,7 @@ UnknownScript_0x5afc7:
.LoadFight0
loadtrainer SAILOR, HUEY1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wHueyFightCount, 1
clearflag ENGINE_HUEY
end
@ -75,7 +75,7 @@ UnknownScript_0x5afc7:
.LoadFight1
loadtrainer SAILOR, HUEY2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wHueyFightCount, 2
clearflag ENGINE_HUEY
end
@ -83,7 +83,7 @@ UnknownScript_0x5afc7:
.LoadFight2
loadtrainer SAILOR, HUEY3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wHueyFightCount, 3
clearflag ENGINE_HUEY
end
@ -91,7 +91,7 @@ UnknownScript_0x5afc7:
.LoadFight3
loadtrainer SAILOR, HUEY4
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_HUEY
checkevent EVENT_HUEY_PROTEIN
iftrue UnknownScript_0x5b03f

2
maps/PewterGym.asm
View File

@ -21,7 +21,7 @@ BrockScript_0x1a2864:
winlosstext UnknownText_0x1a29bb, 0
loadtrainer BROCK, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_BROCK
setevent EVENT_BEAT_CAMPER_JERRY
opentext

4
maps/RadioTower5F.asm
View File

@ -43,7 +43,7 @@ FakeDirectorScript:
setlasttalked RADIOTOWER5F_DIRECTOR
loadtrainer EXECUTIVEM, 3
startbattle
returnafterbattle
reloadmapafterbattle
opentext
writetext FakeDirectorTextAfter
buttonsound
@ -92,7 +92,7 @@ RadioTower5FRocketBossTrigger:
setlasttalked RADIOTOWER5F_ROCKET
loadtrainer EXECUTIVEM, 1
startbattle
returnafterbattle
reloadmapafterbattle
opentext
writetext RadioTower5FRocketBossAfterText
waitbutton

4
maps/Route24.asm
View File

@ -18,8 +18,8 @@ RocketScript_0x1adbfa:
winlosstext UnknownText_0x1add67, -1
loadtrainer GRUNTM, 31
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
playmusic MUSIC_ROCKET_ENCOUNTER
opentext
writetext UnknownText_0x1addc0

2
maps/Route25.asm
View File

@ -176,7 +176,7 @@ UnknownScript_0x19efc7:
winlosstext UnknownText_0x19f4fd, 0
loadtrainer COOLTRAINERM, KEVIN
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_COOLTRAINERM_KEVIN
opentext
UnknownScript_0x19efda:

12
maps/Route26.asm
View File

@ -71,7 +71,7 @@ UnknownScript_0x1a4d79:
.LoadFight0
loadtrainer COOLTRAINERM, GAVEN3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wGavenFightCount, 1
clearflag ENGINE_GAVEN
end
@ -79,7 +79,7 @@ UnknownScript_0x1a4d79:
.LoadFight1
loadtrainer COOLTRAINERM, GAVEN1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wGavenFightCount, 2
clearflag ENGINE_GAVEN
end
@ -87,7 +87,7 @@ UnknownScript_0x1a4d79:
.LoadFight2
loadtrainer COOLTRAINERM, GAVEN2
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_GAVEN
end
@ -175,7 +175,7 @@ UnknownScript_0x1a4e35:
.LoadFight0
loadtrainer COOLTRAINERF, BETH1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wBethFightCount, 1
clearflag ENGINE_BETH
end
@ -183,7 +183,7 @@ UnknownScript_0x1a4e35:
.LoadFight1
loadtrainer COOLTRAINERF, BETH2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wBethFightCount, 2
clearflag ENGINE_BETH
end
@ -191,7 +191,7 @@ UnknownScript_0x1a4e35:
.LoadFight2
loadtrainer COOLTRAINERF, BETH3
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_BETH
end

12
maps/Route27.asm
View File

@ -108,7 +108,7 @@ UnknownScript_0x1a08ff:
.LoadFight0
loadtrainer BIRD_KEEPER, JOSE2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wJoseFightCount, 1
clearflag ENGINE_JOSE
end
@ -116,7 +116,7 @@ UnknownScript_0x1a08ff:
.LoadFight1
loadtrainer BIRD_KEEPER, JOSE1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wJoseFightCount, 2
clearflag ENGINE_JOSE
end
@ -124,7 +124,7 @@ UnknownScript_0x1a08ff:
.LoadFight2
loadtrainer BIRD_KEEPER, JOSE3
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_JOSE
end
@ -241,7 +241,7 @@ UnknownScript_0x1a09e9:
.LoadFight0
loadtrainer COOLTRAINERF, REENA1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wReenaFightCount, 1
clearflag ENGINE_REENA
end
@ -249,7 +249,7 @@ UnknownScript_0x1a09e9:
.LoadFight1
loadtrainer COOLTRAINERF, REENA2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wReenaFightCount, 2
clearflag ENGINE_REENA
end
@ -257,7 +257,7 @@ UnknownScript_0x1a09e9:
.LoadFight2
loadtrainer COOLTRAINERF, REENA3
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_REENA
end

10
maps/Route30.asm
View File

@ -91,7 +91,7 @@ TrainerYoungsterJoey:
.LoadFight0
loadtrainer YOUNGSTER, JOEY1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wJoeyFightCount, 1
clearflag ENGINE_JOEY
end
@ -99,7 +99,7 @@ TrainerYoungsterJoey:
.LoadFight1
loadtrainer YOUNGSTER, JOEY2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wJoeyFightCount, 2
clearflag ENGINE_JOEY
end
@ -107,7 +107,7 @@ TrainerYoungsterJoey:
.LoadFight2
loadtrainer YOUNGSTER, JOEY3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wJoeyFightCount, 3
clearflag ENGINE_JOEY
end
@ -115,7 +115,7 @@ TrainerYoungsterJoey:
.LoadFight3
loadtrainer YOUNGSTER, JOEY4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wJoeyFightCount, 4
clearflag ENGINE_JOEY
end
@ -123,7 +123,7 @@ TrainerYoungsterJoey:
.LoadFight4
loadtrainer YOUNGSTER, JOEY5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_JOEY
checkevent EVENT_JOEY_HP_UP
iftrue .GiveHPUp

10
maps/Route31.asm
View File

@ -82,7 +82,7 @@ TrainerBug_catcherWade1:
.LoadFight0
loadtrainer BUG_CATCHER, WADE1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wWadeFightCount, 1
clearflag ENGINE_WADE
end
@ -90,7 +90,7 @@ TrainerBug_catcherWade1:
.LoadFight1
loadtrainer BUG_CATCHER, WADE2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wWadeFightCount, 2
clearflag ENGINE_WADE
end
@ -98,7 +98,7 @@ TrainerBug_catcherWade1:
.LoadFight2
loadtrainer BUG_CATCHER, WADE3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wWadeFightCount, 3
clearflag ENGINE_WADE
end
@ -106,7 +106,7 @@ TrainerBug_catcherWade1:
.LoadFight3
loadtrainer BUG_CATCHER, WADE4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wWadeFightCount, 4
clearflag ENGINE_WADE
end
@ -114,7 +114,7 @@ TrainerBug_catcherWade1:
.LoadFight4
loadtrainer BUG_CATCHER, WADE5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_WADE
end

20
maps/Route32.asm
View File

@ -225,7 +225,7 @@ TrainerFisherRalph1:
.LoadFight0
loadtrainer FISHER, RALPH1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wRalphFightCount, 1
clearflag ENGINE_RALPH
end
@ -233,7 +233,7 @@ TrainerFisherRalph1:
.LoadFight1
loadtrainer FISHER, RALPH2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wRalphFightCount, 2
clearflag ENGINE_RALPH
end
@ -241,7 +241,7 @@ TrainerFisherRalph1:
.LoadFight2
loadtrainer FISHER, RALPH3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wRalphFightCount, 3
clearflag ENGINE_RALPH
end
@ -249,7 +249,7 @@ TrainerFisherRalph1:
.LoadFight3
loadtrainer FISHER, RALPH4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wRalphFightCount, 4
clearflag ENGINE_RALPH
end
@ -257,7 +257,7 @@ TrainerFisherRalph1:
.LoadFight4
loadtrainer FISHER, RALPH5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_RALPH
end
@ -359,7 +359,7 @@ TrainerPicnickerLiz1:
.LoadFight0
loadtrainer PICNICKER, LIZ1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wLizFightCount, 1
clearflag ENGINE_LIZ
end
@ -367,7 +367,7 @@ TrainerPicnickerLiz1:
.LoadFight1
loadtrainer PICNICKER, LIZ2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wLizFightCount, 2
clearflag ENGINE_LIZ
end
@ -375,7 +375,7 @@ TrainerPicnickerLiz1:
.LoadFight2
loadtrainer PICNICKER, LIZ3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wLizFightCount, 3
clearflag ENGINE_LIZ
end
@ -383,7 +383,7 @@ TrainerPicnickerLiz1:
.LoadFight3
loadtrainer PICNICKER, LIZ4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wLizFightCount, 4
clearflag ENGINE_LIZ
end
@ -391,7 +391,7 @@ TrainerPicnickerLiz1:
.LoadFight4
loadtrainer PICNICKER, LIZ5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_LIZ
end

10
maps/Route33.asm
View File

@ -68,7 +68,7 @@ TrainerHikerAnthony:
.LoadFight0
loadtrainer HIKER, ANTHONY2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wAnthonyFightCount, 1
clearflag ENGINE_ANTHONY
end
@ -76,7 +76,7 @@ TrainerHikerAnthony:
.LoadFight1
loadtrainer HIKER, ANTHONY1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wAnthonyFightCount, 2
clearflag ENGINE_ANTHONY
end
@ -84,7 +84,7 @@ TrainerHikerAnthony:
.LoadFight2
loadtrainer HIKER, ANTHONY3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wAnthonyFightCount, 3
clearflag ENGINE_ANTHONY
end
@ -92,7 +92,7 @@ TrainerHikerAnthony:
.LoadFight3
loadtrainer HIKER, ANTHONY4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wAnthonyFightCount, 4
clearflag ENGINE_ANTHONY
end
@ -100,7 +100,7 @@ TrainerHikerAnthony:
.LoadFight4
loadtrainer HIKER, ANTHONY5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_ANTHONY
end

22
maps/Route34.asm
View File

@ -145,7 +145,7 @@ TrainerCamperTodd1:
.LoadFight0
loadtrainer CAMPER, TODD1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wToddFightCount, 1
clearflag ENGINE_TODD
end
@ -153,7 +153,7 @@ TrainerCamperTodd1:
.LoadFight1
loadtrainer CAMPER, TODD2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wToddFightCount, 2
clearflag ENGINE_TODD
end
@ -161,7 +161,7 @@ TrainerCamperTodd1:
.LoadFight2
loadtrainer CAMPER, TODD3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wToddFightCount, 3
clearflag ENGINE_TODD
end
@ -169,7 +169,7 @@ TrainerCamperTodd1:
.LoadFight3
loadtrainer CAMPER, TODD4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wToddFightCount, 4
clearflag ENGINE_TODD
end
@ -177,7 +177,7 @@ TrainerCamperTodd1:
.LoadFight4
loadtrainer CAMPER, TODD5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_TODD
end
@ -270,7 +270,7 @@ TrainerPicnickerGina1:
.LoadFight0
loadtrainer PICNICKER, GINA1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wGinaFightCount, 1
clearflag ENGINE_GINA
end
@ -278,7 +278,7 @@ TrainerPicnickerGina1:
.LoadFight1
loadtrainer PICNICKER, GINA2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wGinaFightCount, 2
clearflag ENGINE_GINA
end
@ -286,7 +286,7 @@ TrainerPicnickerGina1:
.LoadFight2
loadtrainer PICNICKER, GINA3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wGinaFightCount, 3
clearflag ENGINE_GINA
end
@ -294,7 +294,7 @@ TrainerPicnickerGina1:
.LoadFight3
loadtrainer PICNICKER, GINA4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wGinaFightCount, 4
clearflag ENGINE_GINA
end
@ -302,7 +302,7 @@ TrainerPicnickerGina1:
.LoadFight4
loadtrainer PICNICKER, GINA5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_GINA
end
@ -367,7 +367,7 @@ OfficerKeithScript:
winlosstext OfficerKeithWinText, 0
loadtrainer OFFICER, KEITH
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_OFFICER_KEITH
closetext
end

12
maps/Route35.asm
View File

@ -183,7 +183,7 @@ UnknownScript_0x19c9bb:
.LoadFight0
loadtrainer BUG_CATCHER, ARNIE1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wArnieFightCount, 1
clearflag ENGINE_ARNIE
end
@ -191,7 +191,7 @@ UnknownScript_0x19c9bb:
.LoadFight1
loadtrainer BUG_CATCHER, ARNIE2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wArnieFightCount, 2
clearflag ENGINE_ARNIE
end
@ -199,7 +199,7 @@ UnknownScript_0x19c9bb:
.LoadFight2
loadtrainer BUG_CATCHER, ARNIE3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wArnieFightCount, 3
clearflag ENGINE_ARNIE
end
@ -207,7 +207,7 @@ UnknownScript_0x19c9bb:
.LoadFight3
loadtrainer BUG_CATCHER, ARNIE4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wArnieFightCount, 4
clearflag ENGINE_ARNIE
end
@ -215,7 +215,7 @@ UnknownScript_0x19c9bb:
.LoadFight4
loadtrainer BUG_CATCHER, ARNIE5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_ARNIE
end
@ -250,7 +250,7 @@ OfficerScript_0x19ca49:
winlosstext UnknownText_0x19cf06, 0
loadtrainer OFFICER, DIRK
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_OFFICER_DIRK
closetext
end

14
maps/Route36.asm
View File

@ -88,7 +88,7 @@ WateredWeirdTreeScript::
if_equal $2, UnknownScript_0x19407b
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
returnafterbattle
reloadmapafterbattle
end
UnknownScript_0x194079:
@ -96,7 +96,7 @@ UnknownScript_0x194079:
end
UnknownScript_0x19407b:
returnafterbattle
reloadmapafterbattle
applymovement ROUTE36_WEIRD_TREE, MovementData_0x19424b
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
@ -227,7 +227,7 @@ UnknownScript_0x194140:
.LoadFight0
loadtrainer SCHOOLBOY, ALAN1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wAlanFightCount, 1
clearflag ENGINE_ALAN
end
@ -235,7 +235,7 @@ UnknownScript_0x194140:
.LoadFight1
loadtrainer SCHOOLBOY, ALAN2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wAlanFightCount, 2
clearflag ENGINE_ALAN
end
@ -243,7 +243,7 @@ UnknownScript_0x194140:
.LoadFight2
loadtrainer SCHOOLBOY, ALAN3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wAlanFightCount, 3
clearflag ENGINE_ALAN
end
@ -251,7 +251,7 @@ UnknownScript_0x194140:
.LoadFight3
loadtrainer SCHOOLBOY, ALAN4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wAlanFightCount, 4
clearflag ENGINE_ALAN
end
@ -259,7 +259,7 @@ UnknownScript_0x194140:
.LoadFight4
loadtrainer SCHOOLBOY, ALAN5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_ALAN
end

20
maps/Route38.asm
View File

@ -91,7 +91,7 @@ TrainerLassDana1:
.LoadFight0
loadtrainer LASS, DANA1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wDanaFightCount, 1
clearflag ENGINE_DANA
end
@ -99,7 +99,7 @@ TrainerLassDana1:
.LoadFight1
loadtrainer LASS, DANA2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wDanaFightCount, 2
clearflag ENGINE_DANA
end
@ -107,7 +107,7 @@ TrainerLassDana1:
.LoadFight2
loadtrainer LASS, DANA3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wDanaFightCount, 3
clearflag ENGINE_DANA
end
@ -115,7 +115,7 @@ TrainerLassDana1:
.LoadFight3
loadtrainer LASS, DANA4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wDanaFightCount, 4
clearflag ENGINE_DANA
end
@ -123,7 +123,7 @@ TrainerLassDana1:
.LoadFight4
loadtrainer LASS, DANA5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_DANA
end
@ -227,7 +227,7 @@ TrainerSchoolboyChad1:
.LoadFight0
loadtrainer SCHOOLBOY, CHAD1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wChadFightCount, 1
clearflag ENGINE_CHAD
end
@ -235,7 +235,7 @@ TrainerSchoolboyChad1:
.LoadFight1
loadtrainer SCHOOLBOY, CHAD2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wChadFightCount, 2
clearflag ENGINE_CHAD
end
@ -243,7 +243,7 @@ TrainerSchoolboyChad1:
.LoadFight2
loadtrainer SCHOOLBOY, CHAD3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wChadFightCount, 3
clearflag ENGINE_CHAD
end
@ -251,7 +251,7 @@ TrainerSchoolboyChad1:
.LoadFight3
loadtrainer SCHOOLBOY, CHAD4
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wChadFightCount, 4
clearflag ENGINE_CHAD
end
@ -259,7 +259,7 @@ TrainerSchoolboyChad1:
.LoadFight4
loadtrainer SCHOOLBOY, CHAD5
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_CHAD
end

2
maps/Route39.asm
View File

@ -150,7 +150,7 @@ PokefanFScript_0x1a5bbe:
winlosstext UnknownText_0x1a5f17, 0
loadtrainer POKEFANF, JAIME
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_POKEFANF_JAIME
closetext
end

8
maps/Route42.asm
View File

@ -89,7 +89,7 @@ UnknownScript_0x1a927f:
.LoadFight0
loadtrainer FISHER, TULLY1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wTullyFightCount, 1
clearflag ENGINE_TULLY
end
@ -97,7 +97,7 @@ UnknownScript_0x1a927f:
.LoadFight1
loadtrainer FISHER, TULLY2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wTullyFightCount, 2
clearflag ENGINE_TULLY
end
@ -105,7 +105,7 @@ UnknownScript_0x1a927f:
.LoadFight2
loadtrainer FISHER, TULLY3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wTullyFightCount, 3
clearflag ENGINE_TULLY
end
@ -113,7 +113,7 @@ UnknownScript_0x1a927f:
.LoadFight3
loadtrainer FISHER, TULLY4
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_TULLY
end

16
maps/Route43.asm
View File

@ -100,7 +100,7 @@ UnknownScript_0x19d0cf:
.LoadFight0
loadtrainer POKEMANIAC, BRENT1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wBrentFightCount, 1
clearflag ENGINE_BRENT
end
@ -108,7 +108,7 @@ UnknownScript_0x19d0cf:
.LoadFight1
loadtrainer POKEMANIAC, BRENT2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wBrentFightCount, 2
clearflag ENGINE_BRENT
end
@ -116,7 +116,7 @@ UnknownScript_0x19d0cf:
.LoadFight2
loadtrainer POKEMANIAC, BRENT3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wBrentFightCount, 3
clearflag ENGINE_BRENT
end
@ -124,7 +124,7 @@ UnknownScript_0x19d0cf:
.LoadFight3
loadtrainer POKEMANIAC, BRENT4
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_BRENT
end
@ -231,7 +231,7 @@ UnknownScript_0x19d1c1:
.LoadFight0
loadtrainer PICNICKER, TIFFANY3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wTiffanyFightCount, 1
clearflag ENGINE_TIFFANY
end
@ -239,7 +239,7 @@ UnknownScript_0x19d1c1:
.LoadFight1
loadtrainer PICNICKER, TIFFANY1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wTiffanyFightCount, 2
clearflag ENGINE_TIFFANY
end
@ -247,7 +247,7 @@ UnknownScript_0x19d1c1:
.LoadFight2
loadtrainer PICNICKER, TIFFANY2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wTiffanyFightCount, 3
clearflag ENGINE_TIFFANY
end
@ -255,7 +255,7 @@ UnknownScript_0x19d1c1:
.LoadFight3
loadtrainer PICNICKER, TIFFANY4
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_TIFFANY
end

12
maps/Route44.asm
View File

@ -63,7 +63,7 @@ UnknownScript_0x19d86a:
.LoadFight0
loadtrainer BIRD_KEEPER, VANCE1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wVanceFightCount, 1
clearflag ENGINE_VANCE
end
@ -71,7 +71,7 @@ UnknownScript_0x19d86a:
.LoadFight1
loadtrainer BIRD_KEEPER, VANCE2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wVanceFightCount, 2
clearflag ENGINE_VANCE
end
@ -79,7 +79,7 @@ UnknownScript_0x19d86a:
.LoadFight2
loadtrainer BIRD_KEEPER, VANCE3
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_VANCE
checkevent EVENT_VANCE_CARBOS
iftrue UnknownScript_0x19d8cb
@ -207,7 +207,7 @@ UnknownScript_0x19d96e:
.LoadFight0
loadtrainer FISHER, WILTON1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wWiltonFightCount, 1
clearflag ENGINE_WILTON
end
@ -215,7 +215,7 @@ UnknownScript_0x19d96e:
.LoadFight1
loadtrainer FISHER, WILTON2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wWiltonFightCount, 2
clearflag ENGINE_WILTON
end
@ -223,7 +223,7 @@ UnknownScript_0x19d96e:
.LoadFight2
loadtrainer FISHER, WILTON3
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_WILTON
end

8
maps/Route45.asm
View File

@ -191,7 +191,7 @@ UnknownScript_0x19e1b8:
.LoadFight0
loadtrainer HIKER, PARRY3
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wParryFightCount, 1
clearflag ENGINE_PARRY
end
@ -199,7 +199,7 @@ UnknownScript_0x19e1b8:
.LoadFight1
loadtrainer HIKER, PARRY1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wParryFightCount, 2
clearflag ENGINE_PARRY
end
@ -207,7 +207,7 @@ UnknownScript_0x19e1b8:
.LoadFight2
loadtrainer HIKER, PARRY2
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_PARRY
checkevent EVENT_PARRY_IRON
iftrue UnknownScript_0x19e219
@ -276,7 +276,7 @@ YoungsterScript_0x19e269:
winlosstext UnknownText_0x19e899, 0
loadtrainer CAMPER, QUENTIN
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_CAMPER_QUENTIN
closetext
end

6
maps/Route46.asm
View File

@ -69,7 +69,7 @@ UnknownScript_0x1a96da:
.LoadFight0
loadtrainer PICNICKER, ERIN1
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wErinFightCount, 1
clearflag ENGINE_ERIN
end
@ -77,7 +77,7 @@ UnknownScript_0x1a96da:
.LoadFight1
loadtrainer PICNICKER, ERIN2
startbattle
returnafterbattle
reloadmapafterbattle
loadvar wErinFightCount, 2
clearflag ENGINE_ERIN
end
@ -85,7 +85,7 @@ UnknownScript_0x1a96da:
.LoadFight2
loadtrainer PICNICKER, ERIN3
startbattle
returnafterbattle
reloadmapafterbattle
clearflag ENGINE_ERIN
checkevent EVENT_ERIN_CALCIUM
iftrue UnknownScript_0x1a973b

2
maps/SaffronGym.asm
View File

@ -24,7 +24,7 @@ SabrinaScript_0x189c2e:
winlosstext UnknownText_0x189df4, 0
loadtrainer SABRINA, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_SABRINA
setevent EVENT_BEAT_MEDIUM_REBECCA
setevent EVENT_BEAT_MEDIUM_DORIS

2
maps/SeafoamGym.asm
View File

@ -29,7 +29,7 @@ BlaineScript_0x1ab4fb:
iftrue .ReturnAfterBattle
appear SEAFOAMGYM_GYM_GUY
.ReturnAfterBattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_BLAINE
opentext
writetext UnknownText_0x1ab683

4
maps/SilverCaveRoom3.asm
View File

@ -18,8 +18,8 @@ RedScript_0x18c603:
winlosstext UnknownText_0x18c63c, UnknownText_0x18c63c
loadtrainer RED, 1
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
special Special_FadeOutMusic
opentext
writetext UnknownText_0x18c63f

2
maps/SproutTower3F.asm
View File

@ -76,7 +76,7 @@ SageLiScript:
winlosstext SageLiBeatenText, 0
loadtrainer SAGE, LI
startbattle
returnafterbattle
reloadmapafterbattle
opentext
writetext UnknownText_0x184cc2
buttonsound

48
maps/TeamRocketBaseB1F.asm
View File

@ -246,7 +246,7 @@ TrainerCameraGrunt1:
loadtrainer GRUNTM, 20
startbattle
disappear TEAMROCKETBASEB1F_ROCKET1
returnafterbattle
reloadmapafterbattle
end
TrainerCameraGrunt2:
@ -259,7 +259,7 @@ TrainerCameraGrunt2:
loadtrainer GRUNTM, 21
startbattle
disappear TEAMROCKETBASEB1F_ROCKET1
returnafterbattle
reloadmapafterbattle
end
PlaySecurityCameraSounds:
@ -280,7 +280,7 @@ ExplodingTrap1:
checkevent EVENT_EXPLODING_TRAP_1
iftrue NoExplodingTrap
scall KoffingExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_1
end
@ -288,7 +288,7 @@ ExplodingTrap2:
checkevent EVENT_EXPLODING_TRAP_2
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_2
end
@ -296,7 +296,7 @@ ExplodingTrap3:
checkevent EVENT_EXPLODING_TRAP_3
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_3
end
@ -304,7 +304,7 @@ ExplodingTrap4:
checkevent EVENT_EXPLODING_TRAP_4
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_4
end
@ -312,7 +312,7 @@ ExplodingTrap5:
checkevent EVENT_EXPLODING_TRAP_5
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_5
end
@ -320,7 +320,7 @@ ExplodingTrap6:
checkevent EVENT_EXPLODING_TRAP_6
iftrue NoExplodingTrap
scall KoffingExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_6
end
@ -328,7 +328,7 @@ ExplodingTrap7:
checkevent EVENT_EXPLODING_TRAP_7
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_7
end
@ -336,7 +336,7 @@ ExplodingTrap8:
checkevent EVENT_EXPLODING_TRAP_8
iftrue NoExplodingTrap
scall KoffingExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_8
end
@ -344,7 +344,7 @@ ExplodingTrap9:
checkevent EVENT_EXPLODING_TRAP_9
iftrue NoExplodingTrap
scall KoffingExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_9
end
@ -352,7 +352,7 @@ ExplodingTrap10:
checkevent EVENT_EXPLODING_TRAP_10
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_10
end
@ -360,7 +360,7 @@ ExplodingTrap11:
checkevent EVENT_EXPLODING_TRAP_11
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_11
end
@ -368,7 +368,7 @@ ExplodingTrap12:
checkevent EVENT_EXPLODING_TRAP_12
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_12
end
@ -376,7 +376,7 @@ ExplodingTrap13:
checkevent EVENT_EXPLODING_TRAP_13
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_13
end
@ -384,7 +384,7 @@ ExplodingTrap14:
checkevent EVENT_EXPLODING_TRAP_14
iftrue NoExplodingTrap
scall KoffingExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_14
end
@ -392,7 +392,7 @@ ExplodingTrap15:
checkevent EVENT_EXPLODING_TRAP_15
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_15
end
@ -400,7 +400,7 @@ ExplodingTrap16:
checkevent EVENT_EXPLODING_TRAP_16
iftrue NoExplodingTrap
scall KoffingExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_16
end
@ -408,7 +408,7 @@ ExplodingTrap17:
checkevent EVENT_EXPLODING_TRAP_17
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_17
end
@ -416,7 +416,7 @@ ExplodingTrap18:
checkevent EVENT_EXPLODING_TRAP_18
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_18
end
@ -424,7 +424,7 @@ ExplodingTrap19:
checkevent EVENT_EXPLODING_TRAP_19
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_19
end
@ -432,7 +432,7 @@ ExplodingTrap20:
checkevent EVENT_EXPLODING_TRAP_20
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_20
end
@ -440,7 +440,7 @@ ExplodingTrap21:
checkevent EVENT_EXPLODING_TRAP_21
iftrue NoExplodingTrap
scall KoffingExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_21
end
@ -448,7 +448,7 @@ ExplodingTrap22:
checkevent EVENT_EXPLODING_TRAP_22
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
returnafterbattle
reloadmapafterbattle
setevent EVENT_EXPLODING_TRAP_22
end

10
maps/TeamRocketBaseB2F.asm
View File

@ -108,7 +108,7 @@ UnknownScript_0x6cfac:
setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
setevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2
opentext
writetext UnknownText_0x6d4c6
@ -239,7 +239,7 @@ VoltorbScript_0x6d101:
iffalse UnknownScript_0x6d182
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
iffalse UnknownScript_0x6d182
returnafterbattle
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d28c
jump UnknownScript_0x6d184
@ -257,7 +257,7 @@ VoltorbScript_0x6d12c:
iffalse UnknownScript_0x6d182
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
iffalse UnknownScript_0x6d182
returnafterbattle
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d299
jump UnknownScript_0x6d184
@ -275,13 +275,13 @@ VoltorbScript_0x6d157:
iffalse UnknownScript_0x6d182
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
iffalse UnknownScript_0x6d182
returnafterbattle
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d2a4
jump UnknownScript_0x6d184
UnknownScript_0x6d182:
returnafterbattle
reloadmapafterbattle
end
UnknownScript_0x6d184:

2
maps/TeamRocketBaseB3F.asm
View File

@ -111,7 +111,7 @@ UnknownScript_0x6e056:
setlasttalked TEAMROCKETBASEB3F_ROCKET1
loadtrainer EXECUTIVEM, 4
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4
opentext
writetext UnknownText_0x6e548

4
maps/TinTower1F.asm
View File

@ -127,7 +127,7 @@ UnknownScript_0x1850d7:
loadwildmon SUICUNE, 40
writecode VAR_BATTLETYPE, BATTLETYPE_SUICUNE
startbattle
reloadmapmusic
dontrestartmapmusic
disappear TINTOWER1F_SUICUNE
setevent EVENT_FOUGHT_SUICUNE
setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
@ -138,7 +138,7 @@ UnknownScript_0x1850d7:
domaptrigger CIANWOOD_CITY, $0
dotrigger $1
clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
returnafterbattle
reloadmapafterbattle
pause 20
spriteface PLAYER, DOWN
playmusic MUSIC_MYSTICALMAN_ENCOUNTER

2
maps/TinTowerRoof.asm
View File

@ -39,7 +39,7 @@ HoOhScript_0x77244:
loadwildmon HO_OH, 60
startbattle
disappear TINTOWERROOF_HO_OH
returnafterbattle
reloadmapafterbattle
setevent EVENT_SET_WHEN_FOUGHT_HO_OH
end

4
maps/TrainerHouseB1F.asm
View File

@ -50,14 +50,14 @@ TrainerHouseReceptionistScript:
setlasttalked TRAINERHOUSEB1F_CHRIS
loadtrainer CAL, CAL2
startbattle
returnafterbattle
reloadmapafterbattle
iffalse .End
.NoSpecialBattle:
winlosstext TrainerHouseB1FCalBeatenText, 0
setlasttalked TRAINERHOUSEB1F_CHRIS
loadtrainer CAL, CAL3
startbattle
returnafterbattle
reloadmapafterbattle
.End:
applymovement PLAYER, Movement_ExitTrainerHouseBattleRoom
end

12
maps/UndergroundPathSwitchRoomEntrances.asm
View File

@ -180,8 +180,8 @@ UndergroundSilverBattleScript:
setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
loadtrainer RIVAL1, RIVAL1_12
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishRivalBattle
.Totodile:
@ -189,8 +189,8 @@ UndergroundSilverBattleScript:
setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
loadtrainer RIVAL1, RIVAL1_10
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishRivalBattle
.Chikorita:
@ -198,8 +198,8 @@ UndergroundSilverBattleScript:
setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
loadtrainer RIVAL1, RIVAL1_11
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump .FinishRivalBattle
.FinishRivalBattle:

2
maps/UnionCaveB2F.asm
View File

@ -37,7 +37,7 @@ SurfScript_0x5a31f:
startbattle
disappear UNIONCAVEB2F_SURF
setflag ENGINE_UNION_CAVE_LAPRAS
returnafterbattle
reloadmapafterbattle
end
TrainerCooltrainermNick:

2
maps/VermilionCity.asm
View File

@ -61,7 +61,7 @@ UnknownScript_0x1aa9ab:
startbattle
disappear VERMILIONCITY_BIG_SNORLAX
setevent EVENT_FOUGHT_SNORLAX
returnafterbattle
reloadmapafterbattle
end
VermilionGymBadgeGuy:

2
maps/VermilionGym.asm
View File

@ -23,7 +23,7 @@ SurgeScript_0x1920a5:
winlosstext UnknownText_0x192238, 0
loadtrainer LT_SURGE, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_LTSURGE
setevent EVENT_BEAT_GENTLEMAN_GREGORY
setevent EVENT_BEAT_GUITARIST_VINCENT

12
maps/VictoryRoad.asm
View File

@ -68,8 +68,8 @@ UnknownScript_0x744d4:
setlasttalked VICTORYROAD_SILVER
loadtrainer RIVAL1, RIVAL1_15
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump UnknownScript_0x7451f
UnknownScript_0x744ff:
@ -77,8 +77,8 @@ UnknownScript_0x744ff:
setlasttalked VICTORYROAD_SILVER
loadtrainer RIVAL1, RIVAL1_13
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump UnknownScript_0x7451f
UnknownScript_0x7450f:
@ -86,8 +86,8 @@ UnknownScript_0x7450f:
setlasttalked VICTORYROAD_SILVER
loadtrainer RIVAL1, RIVAL1_14
startbattle
reloadmapmusic
returnafterbattle
dontrestartmapmusic
reloadmapafterbattle
jump UnknownScript_0x7451f
UnknownScript_0x7451f:

2
maps/VioletGym.asm
View File

@ -22,7 +22,7 @@ FalknerScript_0x683c2:
winlosstext UnknownText_0x6854a, 0
loadtrainer FALKNER, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_FALKNER
opentext
writetext UnknownText_0x685af

2
maps/ViridianGym.asm
View File

@ -20,7 +20,7 @@ BlueScript_0x9aa26:
winlosstext UnknownText_0x9abae, 0
loadtrainer BLUE, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_BLUE
opentext
writetext UnknownText_0x9ac0f

2
maps/WhirlIslandLugiaChamber.asm
View File

@ -39,7 +39,7 @@ LugiaScript_0x18c518:
loadwildmon LUGIA, 60
startbattle
disappear WHIRLISLANDLUGIACHAMBER_LUGIA
returnafterbattle
reloadmapafterbattle
end
UnknownText_0x18c531:

2
maps/WillsRoom.asm
View File

@ -58,7 +58,7 @@ WillScript_0x1804f8:
winlosstext UnknownText_0x18062c, 0
loadtrainer WILL, 1
startbattle
returnafterbattle
reloadmapafterbattle
setevent EVENT_BEAT_ELITE_4_WILL
opentext
writetext UnknownText_0x180644

20
misc/fixed_words.asm
View File

@ -1281,7 +1281,7 @@ Function11c86e: ; 11c86e (47:486e)
and a
jr z, .asm_11c88a
hlcoord 2, 17
ld de, String_11c8f0
ld de, MobileString_Prev
call PlaceString
hlcoord 6, 17
ld c, $3
@ -1308,7 +1308,7 @@ Function11c86e: ; 11c86e (47:486e)
cp [hl]
jr nc, .asm_11c8b7
hlcoord 16, 17
ld de, String_11c8f3
ld de, MobileString_Next
call PlaceString
hlcoord 11, 17
ld a, $3
@ -1332,7 +1332,7 @@ Function11c86e: ; 11c86e (47:486e)
ret
; 11c8c7 (47:48c7)
Function11c8c7: ; 11c8c7
BCD2String: ; 11c8c7
inc a
push af
and $f
@ -1340,30 +1340,30 @@ Function11c8c7: ; 11c8c7
pop af
and $f0
swap a
ld [hQuotient], a
ld [hDividend + 1], a
xor a
ld [$ffb5], a
ld [hDividend + 2], a
push hl
callba Function11a80c
pop hl
ld a, [wcd63]
add $f6
add "0"
ld [hli], a
ld a, [wcd62]
add $f6
add "0"
ld [hli], a
ret
; 11c8ec
String_11c8ec: ; 11c8ec
MobileString_Page: ; 11c8ec
db "ぺージ@"
; 11c8f0
String_11c8f0: ; 11c8f0
MobileString_Prev: ; 11c8f0
db "まえ@"
; 11c8f3
String_11c8f3: ; 11c8f3
MobileString_Next: ; 11c8f3
db "つぎ@"
; 11c8f6

4
misc/mobile_12.asm
View File

@ -49,8 +49,8 @@ InitMobileProfile: ; 4802f (12:402f)
call GetMysteryGift_MobileAdapterLayout
call ClearBGPalettes
hlcoord 0, 0
ld b, $2
ld c, $14
ld b, 2
ld c, 20
call ClearBox
hlcoord 0, 1
ld a, $c

2
misc/mobile_22_2.asm
View File

@ -48,7 +48,7 @@ Function8b35d: ; 8b35d
Function8b363: ; 8b363
push bc
callba Function10632f
callba Mobile_AlwaysReturnNotCarry
pop bc
ret
; 8b36c

20
misc/mobile_40.asm
View File

@ -1808,7 +1808,7 @@ Function100b12: ; 100b12
ld [wMenuCursorBuffer], a
call Function100e72
call Function100b45
callba Function8e85
callba InitBattlePartyMenuPals
call Function100ed4
ld a, [wMenuCursorBuffer]
ld [wd0d2], a
@ -1866,7 +1866,7 @@ MobileMoveSelectionScreen: ; 100b9f
call Function100e72
call Function100bc2
push af
callba Function8e85
callba InitBattlePartyMenuPals
call Function100ed4
pop af
ret
@ -2159,14 +2159,14 @@ Function100db0: ; 100db0
Function100dc0: ; 100dc0
ld a, [wLinkMode]
cp LINK_MOBILE
jr nz, .asm_100dd0
jr nz, .mobile
ld hl, wcd2a
bit 3, [hl]
jr z, .asm_100dd0
jr z, .mobile
scf
ret
.asm_100dd0
.mobile
xor a
ret
; 100dd2
@ -2597,7 +2597,7 @@ Function10107d: ; 10107d
ld bc, NAME_LENGTH
call .CopyAllFromOT
ld hl, OTPartyMonOT
ld de, wc656 + 1
ld de, OTName + 1
ld bc, NAME_LENGTH
call .CopyAllFromOT
ld hl, OTPartyMon1Species
@ -7784,7 +7784,7 @@ MenuData2_103648: ; 103648
; 103654
Function103654: ; 103654
callba Function10632f
callba Mobile_AlwaysReturnNotCarry
bit 7, c
jr nz, .asm_103666
ld hl, wcd2a
@ -7800,7 +7800,7 @@ Function103654: ; 103654
; 10366e
Mobile_SelectThreeMons: ; 10366e
callba Function10632f
callba Mobile_AlwaysReturnNotCarry
bit 7, c
jr z, .asm_10369b
ld hl, UnknownText_0x10375d
@ -8074,7 +8074,7 @@ UnknownText_0x10381e: ; 0x10381e
; 0x103823
Function103823: ; 103823
callba Function10632f
callba Mobile_AlwaysReturnNotCarry
bit 7, c
jr nz, .asm_103838
callba Function1008a6
@ -8126,7 +8126,7 @@ UnknownText_0x103876: ; 0x103876
; 0x10387b
Function10387b: ; 10387b
callba Function10632f
callba Mobile_AlwaysReturnNotCarry
bit 7, c
ret nz
callba Function1008a6

6
misc/mobile_41.asm
View File

@ -766,7 +766,7 @@ MobileFn_106314: mobile ; 106314
ret
; 10632f
Function10632f: ; 10632f
Mobile_AlwaysReturnNotCarry: ; 10632f
or a
ret
@ -851,7 +851,7 @@ Function106392: ; 106392
ret
.asm_1063a2
call Function10632f
call Mobile_AlwaysReturnNotCarry
ld a, c
and a
jr nz, .asm_1063b4
@ -937,7 +937,7 @@ Function106403: ; 106403
ret
.asm_106426
call Function10632f
call Mobile_AlwaysReturnNotCarry
ld a, c
and a
jr z, .asm_106435

260
misc/mobile_45.asm
View File

@ -78,45 +78,45 @@ Jumptable_114165: ; 114165
; 11417f
Unknown_11417f: ; 11417f
dw String_114199
dw String_11419f
dw String_1141a7
dw String_1141b1
dw String_1141b5
dw String_1141b9
dw String_1141c2
dw String_1141c8
dw String_1141d6
dw String_1141e4
dw String_1141ee
dw String_1141fc
dw String_114209
dw .From
dw .Sender
dw .ReplyTo
dw .To
dw .CC
dw .Subject
dw .Date
dw .ContentType
dw .MimeVersion
dw .XMailer
dw .XGameTitle
dw .XGameCode
dw .XGBMailType
String_114199: ; 114199
.From: ; 114199
db "FROM:", 0
String_11419f: ; 11419f
.Sender: ; 11419f
db "SENDER:", 0
String_1141a7: ; 1141a7
.ReplyTo: ; 1141a7
db "REPLY-TO:", 0
String_1141b1: ; 1141b1
.To: ; 1141b1
db "TO:", 0
String_1141b5: ; 1141b5
.CC: ; 1141b5
db "CC:", 0
String_1141b9: ; 1141b9
.Subject: ; 1141b9
db "SUBJECT:", 0
String_1141c2: ; 1141c2
.Date: ; 1141c2
db "DATE:", 0
String_1141c8: ; 1141c8
.ContentType: ; 1141c8
db "CONTENT-TYPE:", 0
String_1141d6: ; 1141d6
.MimeVersion: ; 1141d6
db "MIME-VERSION:", 0
String_1141e4: ; 1141e4
.XMailer: ; 1141e4
db "X-MAILER:", 0
String_1141ee: ; 1141ee
.XGameTitle: ; 1141ee
db "X-GAME-TITLE:", 0
String_1141fc: ; 1141fc
.XGameCode: ; 1141fc
db "X-GAME-CODE:", 0
String_114209: ; 114209
.XGBMailType: ; 114209
db "X-GBMAIL-TYPE:", 0
; 114218
@ -131,10 +131,10 @@ String_114232: ; 114232
; 114243
Function114243:: ; 114243
ld a, $a
ld a, SRAM_ENABLE
ld [MBC3SRamEnable], a
ld a, [$ff8c]
push af
ld a, [hFF8C]
push af ; if [wdc02] == 0, this is popped to pc.
push de
ld a, [wdc02]
add a
@ -153,9 +153,9 @@ Function11425c: ; 11425c
ld [wdc02], a
pop af
rept 2
ld [$ff8c], a
ld [hFF8C], a
endr
ld [$4000], a
ld [MBC3SRamBank], a
ret
; 114268
@ -171,8 +171,8 @@ Function114269: ; 114269
ld [wdc03], a
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -370,8 +370,8 @@ Function11433c: ; 11433c
pop bc
ld a, [wdc03]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
call Function114c0b
ld hl, String_114004
.asm_114394
@ -429,8 +429,8 @@ Function1143b7: ; 1143b7
push af
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, [hli]
ld h, [hl]
ld l, a
@ -473,7 +473,7 @@ Function1143f3: ; 1143f3
jr nc, .asm_114400
.asm_114407
ld bc, VBlank5
lb bc, $4, $0
ld a, $2
ret
@ -486,8 +486,8 @@ Function1143f3: ; 1143f3
Function114412: ; 114412
ld a, c
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld hl, Unknown_11417f
ld a, b
add a
@ -506,17 +506,17 @@ Function114412: ; 114412
jp z, .asm_1144c2
inc e
call z, Function1144c8
cp $d
cp $d ; CR
jr nz, .asm_11442b
ld a, [de]
inc e
call z, Function1144c8
cp $a
cp $a ; NL
jr nz, .asm_11442b
ld a, [de]
cp $2e
cp $2e ; .
jr z, .asm_1144ae
cp $d
cp $d ; CR
jr z, .asm_1144b8
.asm_11444a
@ -527,9 +527,9 @@ Function114412: ; 114412
jr z, .asm_1144c2
inc e
call z, Function1144c8
cp $61
cp $61 ; "a"
jr c, .asm_114462
cp $7b
cp $7b ; "z" + 1
jr nc, .asm_114462
sub $20
@ -553,10 +553,10 @@ Function114412: ; 114412
jr .asm_11446e
.asm_114476
ld a, $20
ld a, $20 ; " "
cp b
jr z, .asm_114481
ld a, $a
ld a, $a ; NL
cp b
jr z, .asm_114481
dec de
@ -572,18 +572,18 @@ Function114412: ; 114412
inc bc
inc e
call z, Function1144c8
cp $d
cp $d ; CR
jr nz, .asm_114486
ld a, [de]
inc bc
inc e
call z, Function1144c8
cp $a
cp $a ; NL
jr nz, .asm_114486
ld a, [de]
cp $20
cp $20 ; " "
jr z, .asm_114486
cp $9
cp $9 ; TAB
jr z, .asm_114486
ld d, h
ld e, l
@ -596,14 +596,14 @@ Function114412: ; 114412
inc e
call z, Function1144c8
ld a, [de]
cp $d
cp $d ; CR
jp nz, .asm_11442b
.asm_1144b8
inc e
call z, Function1144c8
ld a, [de]
cp $a
cp $a ; NL
jp nz, .asm_11442b
.asm_1144c2
@ -676,8 +676,8 @@ endr
pop hl
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -693,8 +693,8 @@ endr
ld hl, wdc06
ld a, [hl]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld hl, wdc09
ld e, [hl]
inc hl
@ -753,8 +753,8 @@ Function114576: ; 114576
jr nz, .asm_1145b4
ld a, h
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
push hl
push de
push bc
@ -771,8 +771,8 @@ Function114576: ; 114576
jr nz, .asm_1145ba
ld a, h
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld hl, String_114218
call Function114acf
@ -945,8 +945,8 @@ Function11463c: ; 11463c
pop de
pop af
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
xor a
ld [Carpet], a
ld a, $1
@ -968,8 +968,8 @@ Function1146a4: ; 1146a4
ld hl, wdc03
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -982,8 +982,8 @@ Function1146a4: ; 1146a4
ld hl, wdc03
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -1027,8 +1027,8 @@ Function1146fa: ; 1146fa
ld hl, wdc03
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -1041,8 +1041,8 @@ Function1146fa: ; 1146fa
ld a, $1
ld [wdc0e], a
ld a, [wdc00]
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, $1
ld [RightOrnament], a
call Function1147cd
@ -1068,8 +1068,8 @@ Function1146fa: ; 1146fa
ld hl, wdc03
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -1123,8 +1123,8 @@ endr
ld hl, wdc03
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
call Function114a7a
and a
jr z, .asm_1147cb
@ -1236,8 +1236,8 @@ Function114843: ; 114843
ld a, [wdc00]
push af
push de
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
call Function114a18
and a
jr nz, .asm_11485f
@ -1260,8 +1260,8 @@ Function114867: ; 114867
ld hl, wdc06
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -1327,8 +1327,8 @@ Function1148c2: ; 1148c2
ld hl, wdc06
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -1427,8 +1427,8 @@ Function11494d: ; 11494d
ld hl, wdc06
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -1519,8 +1519,8 @@ Function1149cc: ; 1149cc
ld hl, wdc06
ld a, [hl]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
push de
ld hl, wdc09
ld e, [hl]
@ -1874,8 +1874,8 @@ endr
ld hl, wdc06
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -1913,8 +1913,8 @@ Function114bbc: ; 114bbc
jr nz, .asm_114bff
ld a, h
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
call Function114c0b
ld hl, wdc24
call Function114c5e
@ -1924,8 +1924,8 @@ Function114bbc: ; 114bbc
pop hl
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, [hli]
ld e, a
ld d, [hl]
@ -2136,8 +2136,8 @@ Function114cd9: ; 114cd9
ld [wdc04], a
ld a, h
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld hl, wdc24
call Function114d39
ld hl, wdc24
@ -2155,8 +2155,8 @@ endr
pop hl
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, [hli]
ld e, a
ld a, [hli]
@ -2460,8 +2460,8 @@ Function114ea0: ; 114ea0
ld hl, wdc06
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, [hli]
ld e, a
ld a, [hli]
@ -2666,8 +2666,8 @@ Function114f59: ; 114f59
inc hl
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -2745,8 +2745,8 @@ Function115020: ; 115020
ld hl, wdc06
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, [hli]
ld e, a
ld a, [hli]
@ -2804,8 +2804,8 @@ Function115062: ; 115062
ld c, a
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -2958,8 +2958,8 @@ Function115136: ; 115136
ld hl, wdc06
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, [hli]
ld e, a
ld a, [hli]
@ -3013,8 +3013,8 @@ Function115179: ; 115179
ld hl, wdc06
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, [hli]
ld e, a
ld a, [hli]
@ -3133,8 +3133,8 @@ Function115217: ; 115217
ld hl, wdc06
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, [hli]
ld e, a
ld a, [hli]
@ -3228,8 +3228,8 @@ Function11528f: ; 11528f
inc hl
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, [hli]
ld e, a
ld a, [hli]
@ -3483,8 +3483,8 @@ Function1153d2: ; 1153d2
.asm_1153f5
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -3617,8 +3617,8 @@ Function1153d2: ; 1153d2
ld hl, RightOrnament
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -3854,8 +3854,8 @@ Function11560a: ; 11560a
ld [wCurrentMapSignpostCount], a
ld a, [wdc17]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld hl, wdc1a
ld c, [hl]
inc hl
@ -3927,8 +3927,8 @@ Function11560a: ; 11560a
ld [hl], d
pop bc
ld a, [wCurrentMapSignpostCount]
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld hl, wCurrMapTriggerCount
ld e, [hl]
inc hl
@ -4238,8 +4238,8 @@ Function11581e: ; 11581e
ld hl, wdc02
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -4292,8 +4292,8 @@ Function11581e: ; 11581e
ld hl, wCurrMapTriggerCount
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -4767,8 +4767,8 @@ Function115b00: ; 115b00
ld hl, wdc02
ld a, [hli]
ld [wdc00], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -4856,8 +4856,8 @@ endr
ld hl, wCurrMapTriggerCount
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld e, [hl]
inc hl
ld d, [hl]
@ -5258,8 +5258,8 @@ Function115d80: ; 115d80
ld a, [bc]
inc a
ld [bc], a
ld [$ff8c], a
ld [$4000], a
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, e
ld d, $a0
ld e, $0

14
misc/mobile_46.asm
View File

@ -5453,7 +5453,7 @@ Function11a80c: ; 11a80c
ld bc, hQuotient
ld hl, Unknown_11a8ba
call Function11a88c
ld bc, $ffb5
ld bc, hPrintNum3
ld hl, Unknown_11a8da
call Function11a88c
xor a
@ -5461,11 +5461,11 @@ Function11a80c: ; 11a80c
ld a, [hDivisor]
and $f
ld e, a
ld a, [$ffb9]
ld a, [hPrintNum7]
and $f
call Function11a884
ld e, a
ld a, [$ffbb]
ld a, [hPrintNum9]
and $f
call Function11a884
ld [wcd62], a
@ -5477,12 +5477,12 @@ Function11a80c: ; 11a80c
swap a
call Function11a884
ld e, a
ld a, [$ffb9]
ld a, [hPrintNum7]
and $f0
swap a
call Function11a884
ld e, a
ld a, [$ffbb]
ld a, [hPrintNum9]
and $f0
swap a
call Function11a884
@ -5494,11 +5494,11 @@ Function11a80c: ; 11a80c
and $f
call Function11a884
ld e, a
ld a, [$ffba]
ld a, [hPrintNum8]
and $f
call Function11a884
ld e, a
ld a, [$ffbc]
ld a, [hPrintNum10]
and $f
call Function11a884
ld [wcd64], a

4
misc/mobile_5b.asm
View File

@ -2,7 +2,7 @@ Function16c000: ; 16c000
ld a, [hCGB]
and a
ret z
ld a, [$ffea]
ld a, [hFFEA]
and a
ret z
ld a, [wcfbe]
@ -15,7 +15,7 @@ Function16c000: ; 16c000
call Function16c031
callba Function1000a4
xor a
ld [$ffea], a
ld [hFFEA], a
pop af
ld [wcfbe], a
ret

18
predef/cgb.asm
View File

@ -118,7 +118,7 @@ endr
ld [SGBPredef], a
call ApplyPals
Function8e23: ; 8e23
call Function8e85
call InitBattlePartyMenuPals
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $2
@ -157,15 +157,15 @@ Function8e23: ; 8e23
; 8e85
Function8e85: ; 8e85
InitBattlePartyMenuPals: ; 8e85
callba Function100dc0
Function8e8b: ; 8e8b
ld hl, Palette_b311
jr nc, .asm_8e93
jr nc, .not_mobile
ld hl, Palette_b309
.asm_8e93
.not_mobile
ld de, UnknBGPals + 8 * 7
ld bc, $8
ld bc, 1 palettes
ld a, $5
call FarCopyWRAM
ret
@ -174,11 +174,11 @@ Function8e8b: ; 8e8b
Function8e9f: ; 8e9f
callba Function100dc0
ld hl, Palette_b311
jr nc, .asm_8ead
jr nc, .not_mobile
ld hl, Palette_b309
.asm_8ead
.not_mobile
ld de, UnknBGPals
ld bc, $8
ld bc, 1 palettes
ld a, $5
call FarCopyWRAM
ret
@ -596,7 +596,7 @@ _CGB0a: ; 91d1
ld hl, PalPacket_9c56 + 1
call CopyFourPalettes
call Function8e9f
call Function8e85
call InitBattlePartyMenuPals
call Function971a
call ApplyAttrMap
ret

31
wram.asm
View File

@ -343,7 +343,7 @@ CurSFX:: ; c2bf
wMapMusic:: ; c2c0
ds 1
wc2c1:: ds 1
wDontPlayMapMusicOnReload:: ds 1
SECTION "WRAM", WRAM0
@ -363,7 +363,7 @@ AutoInputBank:: ; c2ca
AutoInputLength:: ; c2cb
ds 1
wc2cc:: ds 1
wMonStatusFlags:: ds 1
wc2cd:: ds 1
wSpriteUpdatesEnabled:: ds 1
wc2cf:: ds 1
@ -609,12 +609,10 @@ wEnemyTrainerItem1:: ds 1
wEnemyTrainerItem2:: ds 1
wEnemyTrainerBaseReward:: ds 1
wEnemyTrainerAIFlags:: ds 3
wc656::
OTName:: ds NAME_LENGTH ; c656
ds 2
wc663::
CurOTMon:: ; c663
ds 1
@ -634,7 +632,9 @@ TypeModifier:: ; c665
ds 1
CriticalHit:: ; c666
; nonzero for a critical hit
; 0 if not critical
; 1 for a critical hit
; 2 for a OHKO
ds 1
AttackMissed:: ; c667
@ -1064,8 +1064,8 @@ wEnemyFutureSightCount:: ds 1
wc71f:: ds 1
wc720:: ds 4 ; copy from/to EnemyMonBaseStats, length=7
wc724:: ds 3
wc727:: ds 2
wc729:: ds 2
wPlayerFutureSightDamage:: ds 2
wEnemyFutureSightDamage:: ds 2
wPlayerRageCounter:: ds 1
wEnemyRageCounter:: ds 1
wc72d:: ds 1 ; if 0 then PrintButItFailed
@ -1092,8 +1092,7 @@ wLinkPlayer1Name:: ds NAME_LENGTH
wLinkPlayer2Name:: ds NAME_LENGTH
ds wLinkPlayer1Name - @
wc736:: ds 3
wWildMonPP::
wc739:: ds 4
wWildMonPP:: ds NUM_MOVES
wAmuletCoin:: ds 1
wc73e:: ds 1
wPlayerJustGotFrozen:: ds 1
@ -1246,7 +1245,7 @@ wc90f::
wMysteryGiftPartnerSentDeco:: ds 1
wMysteryGiftPartnerWhichItem:: ds 1
wMysteryGiftPartnerWhichDeco:: ds 1
wc912:: ds 2
wMysteryGiftPartnerBackupItem:: ds 2
wMysteryGiftPartnerDataEnd::
ds 12
wc920:: ds 16
@ -2044,7 +2043,10 @@ CurPartyMon:: ; d109
; 0-5
ds 1
wd10a:: ds 1
wWhichHPBar::
; 0: Enemy
; 1: Player
ds 1
wPokemonWithdrawDepositParameter::
; 0: Take from PC
; 1: Put into PC
@ -2982,11 +2984,16 @@ RightOrnament:: ; dc15
BigDoll:: ; dc16
ds 1
; Items bought from Mom
wWhichMomItem::
wdc17:: ds 1
wdc18:: ds 1
wWhichMomItemSet::
ds 1
MomItemTriggerBalance::
wdc19:: ds 1
wdc1a:: ds 1
wdc1b:: ds 1
wDailyResetTimer:: ds 2
DailyFlags:: ds 1
WeeklyFlags:: ds 1