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

MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)

Browse Source
This commit is contained in:
Rangi
2018-01-23 16:08:43 -05:00
parent 8f2878c37e
commit ead103d2c6
76 changed files with 774 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/battle/core.asm
View File

@@ -2781,7 +2781,7 @@ AskUseNextPokemon: ; 3d1f8
ForcePlayerMonChoice: ; 3d227
call EmptyBattleTextBox
call LoadStandardMenuDataHeader
call LoadStandardMenuHeader
call SetUpBattlePartyMenu_NoLoop
call ForcePickPartyMonInBattle
ld a, [wLinkMode]
@@ -3300,7 +3300,7 @@ ResetEnemyBattleVars: ; 3d557
ld a, 8
call SlideBattlePicOut
call EmptyBattleTextBox
jp LoadStandardMenuDataHeader
jp LoadStandardMenuHeader
; 3d57a
ResetBattleParticipants: ; 3d57a
@@ -5107,7 +5107,7 @@ BattleMenu_Pack: ; 3e1c7
and a
jp nz, .ItemsCantBeUsed
call LoadStandardMenuDataHeader
call LoadStandardMenuHeader
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
@@ -5202,10 +5202,10 @@ BattleMenu_Pack: ; 3e1c7
; 3e28d
BattleMenu_PKMN: ; 3e28d
call LoadStandardMenuDataHeader
call LoadStandardMenuHeader
BattleMenuPKMN_ReturnFromStats:
call ExitMenu
call LoadStandardMenuDataHeader
call LoadStandardMenuHeader
call ClearBGPalettes
BattleMenuPKMN_Loop:
call SetUpBattlePartyMenu
@@ -5345,7 +5345,7 @@ PlayerSwitch: ; 3e3ad
ld a, [wLinkMode]
and a
jr z, .not_linked
call LoadStandardMenuDataHeader
call LoadStandardMenuHeader
call LinkBattleSendReceiveAction
call CloseWindow

6
engine/battle/effect_commands.asm
View File

@@ -8973,7 +8973,7 @@ BattleCommand_BatonPass: ; 379c9
call DelayFrames
; Transition into switchmon menu
call LoadStandardMenuDataHeader
call LoadStandardMenuHeader
farcall SetUpBattlePartyMenu_NoLoop
farcall ForcePickSwitchMonInBattle
@@ -9048,7 +9048,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
ld a, 1
ld [wPlayerAction], a
call LoadStandardMenuDataHeader
call LoadStandardMenuHeader
ld hl, LinkBattleSendReceiveAction
call CallBattleCore
call CloseWindow
@@ -9065,7 +9065,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
and a
ret z
call LoadStandardMenuDataHeader
call LoadStandardMenuHeader
ld hl, LinkBattleSendReceiveAction
call CallBattleCore

18
engine/battle/menu.asm
View File

@@ -1,6 +1,6 @@
LoadBattleMenu: ; 24ef2
ld hl, BattleMenuDataHeader
call LoadMenuDataHeader
ld hl, BattleMenuHeader
call LoadMenuHeader
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
call InterpretBattleMenu
@@ -12,14 +12,14 @@ LoadBattleMenu: ; 24ef2
SafariBattleMenu: ; 24f0b
; untranslated
ld hl, MenuDataHeader_0x24f4e
call LoadMenuDataHeader
ld hl, MenuHeader_0x24f4e
call LoadMenuHeader
jr Function24f19
; 24f13
ContestBattleMenu: ; 24f13
ld hl, MenuDataHeader_0x24f89
call LoadMenuDataHeader
ld hl, MenuHeader_0x24f89
call LoadMenuHeader
; 24f19
Function24f19: ; 24f19
@@ -32,7 +32,7 @@ Function24f19: ; 24f19
ret
; 24f2c
BattleMenuDataHeader: ; 24f2c
BattleMenuHeader: ; 24f2c
db MENU_BACKUP_TILES ; flags
menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f34
@@ -54,7 +54,7 @@ Strings24f3d: ; 0x24f3d
db "RUN@"
; 24f4e
MenuDataHeader_0x24f4e: ; 24f4e
MenuHeader_0x24f4e: ; 24f4e
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f56
@@ -84,7 +84,7 @@ Function24f7c: ; 24f7c
ret
; 24f89
MenuDataHeader_0x24f89: ; 24f89
MenuHeader_0x24f89: ; 24f89
db MENU_BACKUP_TILES ; flags
menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f91

2
engine/battle/returntobattle_useball.asm
View File

@@ -14,6 +14,6 @@ _ReturnToBattle_UseBall: ; 2715c
farcall _LoadBattleFontsHPBar
call GetMemSGBLayout
call CloseWindow
call LoadStandardMenuDataHeader
call LoadStandardMenuHeader
call WaitBGMap
jp SetPalettes