pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Contest battle type and comment the battle menu.

Browse Source
This commit is contained in:
yenatch
2014-06-17 11:58:11 -07:00
parent 541a9c7347
commit c2dba43188
8 changed files with 147 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
battle/core.asm
View File

@@ -57,9 +57,9 @@ Function3c000: ; 3c000
call Function30b4 call Function30b4
ld a, [BattleType] ld a, [BattleType]
cp $2 cp $2
jp z, Function3c0e2 jp z, .asm_3c0e2
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jp z, Function3c0e2 jp z, .asm_3c0e2
xor a xor a
ld [CurPartyMon], a ld [CurPartyMon], a
.asm_3c06b .asm_3c06b
@@ -114,10 +114,9 @@ Function3c000: ; 3c000
.asm_3c0df .asm_3c0df
jp Function3c12f jp Function3c12f
; 3c0e2
Function3c0e2: ; 3c0e2 .asm_3c0e2
jp Function3e139 jp BattleMenu
; 3c0e5 ; 3c0e5
@@ -162,9 +161,11 @@ Function3c0e5: ; 3c0e5
; 3c12f ; 3c12f
Function3c12f: ; 3c12f Function3c12f: ; 3c12f
.loop
call Function3c1bf call Function3c1bf
call Function3c3f5 call Function3c3f5
jp c, .asm_3c1be jp c, .quit
xor a xor a
ld [wPlayerIsSwitching], a ld [wPlayerIsSwitching], a
ld [wEnemyIsSwitching], a ld [wEnemyIsSwitching], a
@@ -173,58 +174,62 @@ Function3c12f: ; 3c12f
ld [$c740], a ld [$c740], a
ld [CurDamage], a ld [CurDamage], a
ld [CurDamage + 1], a ld [CurDamage + 1], a
call Function3c27c call Function3c27c
call UpdateBattleMonInParty call UpdateBattleMonInParty
callba AIChooseMove callba AIChooseMove
call Function3d2f1
jr nz, .asm_3c174 call IsMobileBattle
jr nz, .not_disconnected
callba Function100da5 callba Function100da5
callba Function100641 callba Function100641
callba Function100dd8 callba Function100dd8
jp c, .asm_3c1be jp c, .quit
.not_disconnected
.asm_3c174
call Function3c410 call Function3c410
jr c, .asm_3c18a jr c, .asm_3c18a
.asm_3c179 .asm_3c179
call Function3e139 call BattleMenu
jr c, .asm_3c1be jr c, .quit
ld a, [BattleEnded] ld a, [BattleEnded]
and a and a
jr nz, .asm_3c1be jr nz, .quit
ld a, [$d232] ld a, [$d232] ; roared/whirlwinded/teleported
and a and a
jr nz, .asm_3c1be jr nz, .quit
.asm_3c18a .asm_3c18a
call Function3c434 call Function3c434
jr nz, .asm_3c179 jr nz, .asm_3c179
call Function3c300 call Function3c300
jr c, .asm_3c1be jr c, .quit
call Function3c314 call Function3c314
jr c, .asm_3c19e jr c, .asm_3c19e
call Function3c5fe call Function3c5fe
jr .asm_3c1a1 jr .asm_3c1a1
.asm_3c19e .asm_3c19e
call Function3c664 call Function3c664
.asm_3c1a1 .asm_3c1a1
call Function3d2e0 call Function3d2e0
jr c, .asm_3c1be jr c, .quit
ld a, [$d232] ld a, [$d232]
and a and a
jr nz, .asm_3c1be jr nz, .quit
ld a, [BattleEnded] ld a, [BattleEnded]
and a and a
jr nz, .asm_3c1be jr nz, .quit
call Function3c1d6 call Function3c1d6
ld a, [BattleEnded] ld a, [BattleEnded]
and a and a
jr nz, .asm_3c1be jr nz, .quit
jp Function3c12f jp .loop
.asm_3c1be .quit
ret ret
; 3c1bf ; 3c1bf
@@ -570,7 +575,7 @@ Function3c3f3: ; 3c3f3
Function3c3f5: ; 3c3f5 Function3c3f5: ; 3c3f5
ld a, [BattleType] ld a, [BattleType]
cp $6 cp BATTLETYPE_CONTEST
jr nz, .asm_3c40e jr nz, .asm_3c40e
ld a, [$dc79] ld a, [$dc79]
and a and a
@@ -591,16 +596,20 @@ Function3c410: ; 3c410
ld a, [PlayerSubStatus4] ld a, [PlayerSubStatus4]
and 1 << SUBSTATUS_RECHARGE and 1 << SUBSTATUS_RECHARGE
jp nz, .quit jp nz, .quit
ld hl, EnemySubStatus3 ld hl, EnemySubStatus3
res SUBSTATUS_FLINCHED, [hl] res SUBSTATUS_FLINCHED, [hl]
ld hl, PlayerSubStatus3 ld hl, PlayerSubStatus3
res SUBSTATUS_FLINCHED, [hl] res SUBSTATUS_FLINCHED, [hl]
ld a, [hl] ld a, [hl]
and 1 << SUBSTATUS_CHARGED | 1 << SUBSTATUS_ROLLOUT and 1 << SUBSTATUS_CHARGED | 1 << SUBSTATUS_ROLLOUT
jp nz, .quit jp nz, .quit
ld hl, PlayerSubStatus1 ld hl, PlayerSubStatus1
bit SUBSTATUS_ENCORED, [hl] bit SUBSTATUS_ENCORED, [hl]
jp nz, .quit jp nz, .quit
and a and a
ret ret
@@ -2445,7 +2454,7 @@ Function3cfa4: ; 3cfa4
callab Function39939 callab Function39939
ld hl, BattleText_0x809da ld hl, BattleText_0x809da
call StdBattleTextBox call StdBattleTextBox
call Function3d2f1 call IsMobileBattle
jr z, .asm_3cff5 jr z, .asm_3cff5
ld a, [InLinkBattle] ld a, [InLinkBattle]
and a and a
@@ -2945,7 +2954,7 @@ Function3d2e0: ; 3d2e0
ret ret
; 3d2f1 ; 3d2f1
Function3d2f1: ; 3d2f1 IsMobileBattle: ; 3d2f1
ld a, [InLinkBattle] ld a, [InLinkBattle]
cp $4 cp $4
ret ret
@@ -2971,25 +2980,25 @@ Function3d313: ; 3d313
; 3d329 ; 3d329
Function3d329: ; 3d329 Function3d329: ; 3d329
call Function3d2f1 call IsMobileBattle
jr z, .asm_3d335 jr z, .mobile
callba PartyMenuSelect callba PartyMenuSelect
ret ret
.asm_3d335 .mobile
callba Function100cb5 callba Function100cb5
ret ret
; 3d33c ; 3d33c
PickPartyMonInBattle: ; 3d33c PickPartyMonInBattle: ; 3d33c
.asm_3d33c .loop
ld a, $2 ; Which PKMN? ld a, $2 ; Which PKMN?
ld [PartyMenuActionText], a ld [PartyMenuActionText], a
call Function3d313 call Function3d313
call Function3d329 call Function3d329
ret c ret c
call Function3d887 call Function3d887
jr z, .asm_3d33c jr z, .loop
xor a xor a
ret ret
; 3d34f ; 3d34f
@@ -3121,7 +3130,7 @@ LostBattle: ; 3d38e
.asm_3d40a .asm_3d40a
ld hl, LostAgainstText ld hl, LostAgainstText
call Function3d2f1 call IsMobileBattle
jr z, .asm_3d417 jr z, .asm_3d417
.asm_3d412 .asm_3d412
@@ -3830,7 +3839,7 @@ Function3d8b3: ; 3d8b3
ld a, [BattleType] ld a, [BattleType]
cp $2 cp $2
jp z, .asm_3d9a2 jp z, .asm_3d9a2
cp $6 cp BATTLETYPE_CONTEST
jp z, .asm_3d9a2 jp z, .asm_3d9a2
cp BATTLETYPE_TRAP cp BATTLETYPE_TRAP
jp z, .asm_3d98d jp z, .asm_3d98d
@@ -5075,54 +5084,56 @@ Function3e138: ; 3e138
ret ret
; 3e139 ; 3e139
Function3e139: ; 3e139 BattleMenu: ; 3e139
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function30bf call Function30bf
ld a, [BattleType] ld a, [BattleType]
cp $2 cp $2
jr z, .asm_3e156 jr z, .ok
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .asm_3e156 jr z, .ok
call EmptyBattleTextBox call EmptyBattleTextBox
call UpdateBattleHuds call UpdateBattleHuds
call EmptyBattleTextBox call EmptyBattleTextBox
call Function309d call Function309d
.asm_3e156 .ok
.loop
ld a, [BattleType] ld a, [BattleType]
cp $6 cp BATTLETYPE_CONTEST
jr nz, .asm_3e165 jr nz, .not_contest
callba Function24f13 callba ContestBattleMenu
jr .asm_3e175 jr .next
.asm_3e165 .not_contest
; Auto input: choose "ITEM"
ld a, [InputType] ld a, [InputType]
or a or a
jr z, .asm_3e171 jr z, .asm_3e171
callba Function1de294 callba Function1de294
.asm_3e171 .asm_3e171
call Function3e19b call LoadBattleMenu2
ret c ret c
.asm_3e175 .next
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ld a, [$d0d2] ld a, [$d0d2]
cp $1 cp $1
jp z, Function3e192 jp z, BattleMenu_Fight
cp $3 cp $3
jp z, Function3e1c7 jp z, BattleMenu_Pack
cp $2 cp $2
jp z, Function3e28d jp z, BattleMenu_PKMN
cp $4 cp $4
jp z, Function3e489 jp z, BattleMenu_Run
jr .asm_3e156 jr .loop
; 3e192 ; 3e192
Function3e192: ; 3e192 BattleMenu_Fight: ; 3e192
xor a xor a
ld [$d267], a ld [$d267], a
call Function30b4 call Function30b4
@@ -5130,15 +5141,15 @@ Function3e192: ; 3e192
ret ret
; 3e19b ; 3e19b
Function3e19b: ; 3e19b LoadBattleMenu2: ; 3e19b
call Function3d2f1 call IsMobileBattle
jr z, .asm_3e1a8 jr z, .mobile
callba LoadBattleMenuDataHeader callba LoadBattleMenu
and a and a
ret ret
.asm_3e1a8 .mobile
callba Function100b12 callba Function100b12
ld a, [$cd2b] ld a, [$cd2b]
and a and a
@@ -5146,44 +5157,47 @@ Function3e19b: ; 3e19b
ld hl, $cd2a ld hl, $cd2a
bit 4, [hl] bit 4, [hl]
jr nz, .asm_3e1c5 jr nz, .error
ld hl, BattleText_0x81863 ld hl, BattleText_0x81863
call StdBattleTextBox call StdBattleTextBox
ld c, 60 ld c, 60
call DelayFrames call DelayFrames
.asm_3e1c5 .error
scf scf
ret ret
; 3e1c7 ; 3e1c7
Function3e1c7: ; 3e1c7 BattleMenu_Pack: ; 3e1c7
ld a, [InLinkBattle] ld a, [InLinkBattle]
and a and a
jp nz, Function3e22b jp nz, ItemsCantBeUsed
ld a, [$cfc0] ld a, [$cfc0]
and a and a
jp nz, Function3e22b jp nz, ItemsCantBeUsed
call Function1d6e call Function1d6e
ld a, [BattleType] ld a, [BattleType]
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .asm_3e1f1 jr z, .tutorial
cp $6 cp BATTLETYPE_CONTEST
jr z, .asm_3e201 jr z, .contest
callba Function10493
callba BattlePack
ld a, [$d0ec] ld a, [$d0ec]
and a and a
jr z, .asm_3e20d jr z, .asm_3e20d
jr .asm_3e209 jr .asm_3e209
.asm_3e1f1 .tutorial
callba Function107bb callba Function107bb
ld a, POKE_BALL ld a, POKE_BALL
ld [CurItem], a ld [CurItem], a
call DoItemEffect call DoItemEffect
jr .asm_3e209 jr .asm_3e209
.asm_3e201 .contest
ld a, PARK_BALL ld a, PARK_BALL
ld [CurItem], a ld [CurItem], a
call DoItemEffect call DoItemEffect
@@ -5202,13 +5216,13 @@ Function3e1c7: ; 3e1c7
call WaitBGMap call WaitBGMap
call Function3ee27 call Function3ee27
call Function309d call Function309d
jp Function3e139 jp BattleMenu
; 3e22b ; 3e22b
Function3e22b: ; 3e22b ItemsCantBeUsed: ; 3e22b
ld hl, BattleText_0x80bf3 ld hl, BattleText_0x80bf3
call StdBattleTextBox call StdBattleTextBox
jp Function3e139 jp BattleMenu
; 3e234 ; 3e234
Function3e234: ; 3e234 Function3e234: ; 3e234
@@ -5256,7 +5270,7 @@ Function3e234: ; 3e234
ret ret
; 3e28d ; 3e28d
Function3e28d: ; 3e28d BattleMenu_PKMN: ; 3e28d
call Function1d6e call Function1d6e
Function3e290: Function3e290:
call Function1c07 call Function1c07
@@ -5303,11 +5317,11 @@ Function3e299:
call Function309d call Function309d
call ClearSGB call ClearSGB
call Function32f9 call Function32f9
jp Function3e139 jp BattleMenu
; 3e2f5 ; 3e2f5
Function3e2f5: ; 3e2f5 Function3e2f5: ; 3e2f5
call Function3d2f1 call IsMobileBattle
jr z, .asm_3e301 jr z, .asm_3e301
callba Function24e99 callba Function24e99
ret ret
@@ -5506,8 +5520,7 @@ PassedBattleMonEntrance: ; 3e459
; 3e489 ; 3e489
BattleMenu_Run: ; 3e489
Function3e489: ; 3e489
call Function30b4 call Function30b4
ld a, $3 ld a, $3
ld [$cfa9], a ld [$cfa9], a
@@ -5520,11 +5533,10 @@ Function3e489: ; 3e489
ld a, [$d0ec] ld a, [$d0ec]
and a and a
ret nz ret nz
jp Function3e139 jp BattleMenu
; 3e4a8 ; 3e4a8
CheckAmuletCoin: ; 3e4a8 CheckAmuletCoin: ; 3e4a8
ld a, [BattleMonItem] ld a, [BattleMonItem]
ld b, a ld b, a
@@ -5538,7 +5550,7 @@ CheckAmuletCoin: ; 3e4a8
; 3e4bc ; 3e4bc
Function3e4bc: ; 3e4bc Function3e4bc: ; 3e4bc
call Function3d2f1 call IsMobileBattle
jr nz, .asm_3e4c8 jr nz, .asm_3e4c8
callba Function100b9f callba Function100b9f
ret ret

30
battle/effect_commands.asm
View File

@@ -6753,7 +6753,7 @@ BattleCommandaf: ; 365a7
; curl ; curl
ld a, BATTLE_VARS_SUBSTATUS2 ld a, BATTLE_VARS_SUBSTATUS2
call GetBattleVarAddr call GetBattleVarAddr
set 0, [hl] set SUBSTATUS_CURLED, [hl]
ret ret
; 365af ; 365af
@@ -7046,20 +7046,20 @@ BattleCommand3d: ; 36751
; No rampage during Sleep Talk. ; No rampage during Sleep Talk.
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
call GetBattleVar call GetBattleVar
and 7 and SLP
ret nz ret nz
ld de, PlayerRolloutCount ld de, PlayerRolloutCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_36764 ; 3675f $3 jr z, .ok
ld de, EnemyRolloutCount ld de, EnemyRolloutCount
.asm_36764 .ok
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr call GetBattleVarAddr
set 1, [hl] set SUBSTATUS_ROLLOUT, [hl]
call BattleRandom call BattleRandom
and $1 and 1
inc a inc a
ld [de], a ld [de], a
ld a, 1 ld a, 1
@@ -7073,24 +7073,24 @@ BattleCommanda0: ; 36778
ld a, [BattleType] ld a, [BattleType]
cp BATTLETYPE_SHINY cp BATTLETYPE_SHINY
jr z, .asm_367b9 jr z, .failed
cp $9 cp BATTLETYPE_TRAP
jr z, .asm_367b9 jr z, .failed
cp BATTLETYPE_CELEBI cp BATTLETYPE_CELEBI
jr z, .asm_367b9 jr z, .failed
cp BATTLETYPE_SUICUNE cp BATTLETYPE_SUICUNE
jr z, .asm_367b9 jr z, .failed
ld a, BATTLE_VARS_SUBSTATUS5_OPP ld a, BATTLE_VARS_SUBSTATUS5_OPP
call GetBattleVar call GetBattleVar
bit SUBSTATUS_CANT_RUN, a bit SUBSTATUS_CANT_RUN, a
jr nz, .asm_367b9 jr nz, .failed
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr nz, .asm_367bf jr nz, .asm_367bf
ld a, [IsInBattle] ld a, [IsInBattle]
dec a dec a
jr nz, .asm_367b9 jr nz, .failed
ld a, [$d143] ld a, [$d143]
ld b, a ld b, a
ld a, [BattleMonLevel] ld a, [BattleMonLevel]
@@ -7108,14 +7108,14 @@ BattleCommanda0: ; 36778
cp b cp b
jr nc, .asm_367df ; 367b7 $26 jr nc, .asm_367df ; 367b7 $26
.asm_367b9 .failed
call AnimateFailedMove call AnimateFailedMove
jp PrintButItFailed jp PrintButItFailed
.asm_367bf .asm_367bf
ld a, [IsInBattle] ld a, [IsInBattle]
dec a dec a
jr nz, .asm_367b9 ; 367c3 $f4 jr nz, .failed
ld a, [BattleMonLevel] ld a, [BattleMonLevel]
ld b, a ld b, a
ld a, [$d143] ld a, [$d143]

4
battle/effects/curse.asm
View File

@@ -67,10 +67,10 @@ BattleCommand54: ; 37588
ld a, BATTLE_VARS_SUBSTATUS1_OPP ld a, BATTLE_VARS_SUBSTATUS1_OPP
call GetBattleVarAddr call GetBattleVarAddr
bit 1, [hl] bit SUBSTATUS_CURSE, [hl]
jr nz, .failed jr nz, .failed
set 1, [hl] set SUBSTATUS_CURSE, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, GetHalfMaxHP ld hl, GetHalfMaxHP
call CallBattleCore call CallBattleCore

13
battle/effects/rollout.asm
View File

@@ -1,3 +1,6 @@
MAX_ROLLOUT_COUNT EQU 5
BattleCommand5b: ; 37718 BattleCommand5b: ; 37718
; checkcurl ; checkcurl
@@ -28,7 +31,7 @@ BattleCommand5c: ; 37734
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
call GetBattleVar call GetBattleVar
and 7 and SLP
ret nz ret nz
ld hl, PlayerRolloutCount ld hl, PlayerRolloutCount
@@ -58,23 +61,23 @@ BattleCommand5c: ; 37734
inc [hl] inc [hl]
ld a, [hl] ld a, [hl]
ld b, a ld b, a
cp $5 cp MAX_ROLLOUT_COUNT
jr c, .asm_3776e jr c, .asm_3776e
ld a, BATTLE_VARS_SUBSTATUS1 ld a, BATTLE_VARS_SUBSTATUS1
call GetBattleVarAddr call GetBattleVarAddr
res 6, [hl] res SUBSTATUS_ENCORED, [hl]
jr .asm_37775 jr .asm_37775
.asm_3776e .asm_3776e
ld a, BATTLE_VARS_SUBSTATUS1 ld a, BATTLE_VARS_SUBSTATUS1
call GetBattleVarAddr call GetBattleVarAddr
set 6, [hl] set SUBSTATUS_ENCORED, [hl]
.asm_37775 .asm_37775
ld a, BATTLE_VARS_SUBSTATUS2 ld a, BATTLE_VARS_SUBSTATUS2
call GetBattleVar call GetBattleVar
bit 0, a bit SUBSTATUS_CURLED, a
jr z, .asm_3777f jr z, .asm_3777f
inc b inc b
.asm_3777f .asm_3777f

1
constants/battle_constants.asm
View File

@@ -46,6 +46,7 @@ BATTLETYPE_CANLOSE EQU $01
BATTLETYPE_TUTORIAL EQU $03 BATTLETYPE_TUTORIAL EQU $03
BATTLETYPE_FISH EQU $04 BATTLETYPE_FISH EQU $04
BATTLETYPE_ROAMING EQU $05 BATTLETYPE_ROAMING EQU $05
BATTLETYPE_CONTEST EQU $06
BATTLETYPE_SHINY EQU $07 BATTLETYPE_SHINY EQU $07
BATTLETYPE_TREE EQU $08 BATTLETYPE_TREE EQU $08
BATTLETYPE_TRAP EQU $09 BATTLETYPE_TRAP EQU $09

6
engine/scripting.asm
View File

@@ -1544,7 +1544,7 @@ Script_catchtutorial: ; 0x97447
; byte (SingleByteParam) ; byte (SingleByteParam)
call GetScriptByte call GetScriptByte
ld [$d230], a ld [BattleType], a
call Function2879 call Function2879
callba Function4e554 callba Function4e554
jp Script_reloadmap jp Script_reloadmap
@@ -1572,8 +1572,8 @@ Script_returnafterbattle: ; 0x97459
ld a, [$d0ee] ld a, [$d0ee]
bit 7, a bit 7, a
jr z, .asm_9748e ; 0x97481 $b jr z, .asm_9748e ; 0x97481 $b
ld b, $24 ld b, BANK(UnknownScript_0x90255)
ld de, $4255 ld de, UnknownScript_0x90255
callba Function97c4f callba Function97c4f
.asm_9748e .asm_9748e
jp Script_reloadmap jp Script_reloadmap

46
main.asm
View File

@@ -14669,7 +14669,7 @@ UnknownText_0xfa06: ; 0xfa06
SECTION "bank4", ROMX, BANK[$4] SECTION "bank4", ROMX, BANK[$4]
Function10000: ; 10000 Pack: ; 10000
ld hl, Options ld hl, Options
set 4, [hl] set 4, [hl]
call Function1068a call Function1068a
@@ -15333,7 +15333,7 @@ Function10492: ; 10492
; 10493 ; 10493
Function10493: ; 10493 BattlePack: ; 10493
ld hl, Options ld hl, Options
set 4, [hl] set 4, [hl]
call Function1068a call Function1068a
@@ -19499,7 +19499,7 @@ StartMenu_Pokegear: ; 1294c
StartMenu_Pack: ; 1295b StartMenu_Pack: ; 1295b
call FadeToMenu call FadeToMenu
callba Function10000 callba Pack
ld a, [$cf66] ld a, [$cf66]
and a and a
jr nz, .asm_12970 jr nz, .asm_12970
@@ -21441,7 +21441,7 @@ Function135db: ; 135db
; 135eb ; 135eb
UnknownScript_0x135eb:: ; 0x135eb UnknownScript_0x135eb:: ; 0x135eb
writecode $3, $6 writecode $3, BATTLETYPE_CONTEST
battlecheck battlecheck
startbattle startbattle
returnafterbattle returnafterbattle
@@ -33442,7 +33442,7 @@ MenuData2_0x24edc: ; 24edc
; 24ef2 ; 24ef2
LoadBattleMenuDataHeader: ; 24ef2 LoadBattleMenu: ; 24ef2
ld hl, BattleMenuDataHeader ld hl, BattleMenuDataHeader
call LoadMenuDataHeader call LoadMenuDataHeader
ld a, [$d0d2] ld a, [$d0d2]
@@ -33455,15 +33455,14 @@ LoadBattleMenuDataHeader: ; 24ef2
; 24f0b ; 24f0b
Function24f0b: ; 24f0b SafariBattleMenu: ; 24f0b
; Safari battle menu (untranslated). ; untranslated
ld hl, MenuDataHeader_0x24f4e ld hl, MenuDataHeader_0x24f4e
call LoadMenuDataHeader call LoadMenuDataHeader
jr Function24f19 jr Function24f19
; 24f13 ; 24f13
Function24f13: ; 24f13 ContestBattleMenu: ; 24f13
; Park battle menu.
ld hl, MenuDataHeader_0x24f89 ld hl, MenuDataHeader_0x24f89
call LoadMenuDataHeader call LoadMenuDataHeader
; 24f19 ; 24f19
@@ -57309,6 +57308,7 @@ Function4e53f: ; 4e53f
ret ret
; 4e554 ; 4e554
Function4e554:: ; 4e554 Function4e554:: ; 4e554
ld a, [BattleType] ld a, [BattleType]
dec a dec a
@@ -57323,39 +57323,39 @@ Function4e554:: ; 4e554
jp [hl] jp [hl]
; 4e564 ; 4e564
; no known jump sources
Jumptable_4e564: ; 4e564 (13:6564) Jumptable_4e564: ; 4e564 (13:6564)
dw Function4e56a dw Function4e56a
dw Function4e56a dw Function4e56a
dw Function4e56a dw Function4e56a
; no known jump sources
Function4e56a: ; 4e56a (13:656a) Function4e56a: ; 4e56a (13:656a)
ld hl, PlayerName ; $d47d ld hl, PlayerName ; $d47d
ld de, MomsName ; $d488 ld de, MomsName ; $d488
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
ld hl, String_4e5da
ld hl, DudeString
ld de, PlayerName ; $d47d ld de, PlayerName ; $d47d
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
call Function4e5b7 call Function4e5b7
xor a xor a
ld [hJoyDown], a ; $ff00+$a8 ld [hJoyDown], a
ld [hJoyPressed], a ; $ff00+$a7 ld [hJoyPressed], a
ld a, [Options] ; $cfcc ld a, [Options]
push af push af
and $f8 and $f8
add $3 add $3
ld [Options], a ; $cfcc ld [Options], a
ld hl, AutoInput_4e5df ld hl, AutoInput_4e5df
ld a, BANK(AutoInput_4e5df) ld a, BANK(AutoInput_4e5df)
call StartAutoInput call StartAutoInput
callab StartBattle callab StartBattle
call StopAutoInput call StopAutoInput
pop af pop af
ld [Options], a ; $cfcc ld [Options], a ; $cfcc
ld hl, MomsName ; $d488 ld hl, MomsName ; $d488
ld de, PlayerName ; $d47d ld de, PlayerName ; $d47d
@@ -57387,7 +57387,7 @@ Function4e5b7: ; 4e5b7 (13:65b7)
ret ret
; 4e5da (13:65da) ; 4e5da (13:65da)
String_4e5da: ; 4e5da DudeString: ; 4e5da
db "DUDE@" db "DUDE@"
; 4e5df ; 4e5df
@@ -79440,7 +79440,7 @@ UnknownScript_0x90241: ; 0x90241
end end
; 0x90255 ; 0x90255
UnknownScript_0x90255: ; 0x90255 UnknownScript_0x90255:: ; 0x90255
3callasm Function9025c 3callasm Function9025c
2jump UnknownScript_0x90241 2jump UnknownScript_0x90241
; 0x9025c ; 0x9025c
@@ -102924,11 +102924,11 @@ INCBIN "baserom.gbc",$100b0a,$100b12 - $100b0a
Function100b12: ; 100b12 Function100b12: ; 100b12
call Function100dd8 call Function100dd8
ret c ret c
ld hl, $4f2c ld hl, BattleMenuDataHeader
ld a, $9 ld a, BANK(BattleMenuDataHeader)
ld de, LoadMenuDataHeader ld de, LoadMenuDataHeader
call FarCall_de call FarCall_de
ld a, $9 ld a, BANK(BattleMenuDataHeader)
ld [$cf94], a ld [$cf94], a
ld a, [$d0d2] ld a, [$d0d2]
ld [$cf88], a ld [$cf88], a

6
maps/Route29.asm
View File

@@ -52,7 +52,7 @@ UnknownScript_0x1a0f6d: ; 0x1a0f6d
applymovement $2, MovementData_0x1a109a applymovement $2, MovementData_0x1a109a
stopfollow stopfollow
loadpokedata RATTATA, 5 loadpokedata RATTATA, 5
catchtutorial $3 catchtutorial BATTLETYPE_TUTORIAL
spriteface $2, $1 spriteface $2, $1
loadfont loadfont
2writetext UnknownText_0x1a114d 2writetext UnknownText_0x1a114d
@@ -78,7 +78,7 @@ UnknownScript_0x1a0fa3: ; 0x1a0fa3
applymovement $2, MovementData_0x1a10a1 applymovement $2, MovementData_0x1a10a1
stopfollow stopfollow
loadpokedata RATTATA, 5 loadpokedata RATTATA, 5
catchtutorial $3 catchtutorial BATTLETYPE_TUTORIAL
spriteface $2, $1 spriteface $2, $1
loadfont loadfont
2writetext UnknownText_0x1a114d 2writetext UnknownText_0x1a114d
@@ -121,7 +121,7 @@ CooltrainerMScript_0x1a0ff1: ; 0x1a0ff1
iffalse UnknownScript_0x1a1022 iffalse UnknownScript_0x1a1022
loadmovesprites loadmovesprites
loadpokedata RATTATA, 5 loadpokedata RATTATA, 5
catchtutorial $3 catchtutorial BATTLETYPE_TUTORIAL
loadfont loadfont
2writetext UnknownText_0x1a114d 2writetext UnknownText_0x1a114d
closetext closetext