ref: a99a205b28b65a36a382142668850c972c001a4e
parent: 07612257ccf21e0b5a4be28d7b5d9b7d9917d613
author: Bryan Bishop <[email protected]>
date: Mon Nov 11 19:29:26 EST 2013
labels for some battle menus
--- a/main.asm
+++ b/main.asm
@@ -33795,29 +33795,34 @@
; 24ef2
-Function24ef2: ; 4ef2
- ld hl, MenuDataHeader_0x24f2c
+LoadBattleMenuDataHeader: ; 4ef2
+ ld hl, BattleMenuDataHeader
call LoadMenuDataHeader
+
+ ; store a
ld a, [$d0d2]
ld [$cf88], a
+
call Function2039
+
+ ; restore a
ld a, [$cf88]
ld [$d0d2], a
+
call Function1c07
ret
; 24f0b
-Function24f0b: ; 24f0b
+LoadSafariBattleMenuDataHeader: ; 24f0b
; Safari battle menu (untranslated).
- ld hl, MenuDataHeader_0x24f4e
+ ld hl, SafariBattleMenuDataHeader
call LoadMenuDataHeader
jr Function24f19
; 24f13
-Function24f13: ; 24f13
-; Park battle menu.
- ld hl, MenuDataHeader_0x24f89
+LoadParkBattleMenuDataHeader: ; 24f13
+ ld hl, ParkBattleMenuDataHeader
call LoadMenuDataHeader
; 24f19
@@ -33832,23 +33837,23 @@
; 24f2c
-MenuDataHeader_0x24f2c: ; 24f2c
+BattleMenuDataHeader: ; 24f2c
db $40 ; flags
db 12, 08 ; start coords
db 17, 19 ; end coords
- dw MenuData_0x24f34
+ dw BattleMenuData
db 1 ; default option
; 24f34
-MenuData_0x24f34: ; 0x24f34
+BattleMenuData: ; 0x24f34
db $81 ; flags
dn 2, 2 ; rows, columns
db 6 ; spacing
- dbw BANK(Strings24f3d), Strings24f3d
+ dbw BANK(BattleMenuStrings), BattleMenuStrings
dbw $09, $0000
; 0x24f3d
-Strings24f3d: ; 0x24f3d
+BattleMenuStrings: ; 0x24f3d
db "FIGHT@"
db $4a, "@"
db "PACK@"
@@ -33856,23 +33861,23 @@
; 24f4e
-MenuDataHeader_0x24f4e: ; 24f4e
+SafariBattleMenuDataHeader: ; 24f4e
db $40 ; flags
db 12, 00 ; start coords
db 17, 19 ; end coords
- dw MenuData_0x24f56
+ dw SafariBattleMenuData
db 1 ; default option
; 24f56
-MenuData_0x24f56: ; 24f56
+SafariBattleMenuData: ; 24f56
db $81 ; flags
dn 2, 2 ; rows, columns
db 11 ; spacing
- dbw BANK(Strings24f5f), Strings24f5f
+ dbw BANK(SafariBattleMenuStrings), SafariBattleMenuStrings
dbw BANK(Function24f7c), Function24f7c
; 24f5f
-Strings24f5f: ; 24f5f
+SafariBattleMenuStrings: ; 24f5f
db "サファりボール× @" ; "SAFARI BALL× @"
db "エサをなげる@" ; "THROW BAIT"
db "いしをなげる@" ; "THROW ROCK"
@@ -33888,23 +33893,23 @@
; 24f89
-MenuDataHeader_0x24f89: ; 24f89
+ParkBattleMenuDataHeader: ; 24f89
db $40 ; flags
db 12, 02 ; start coords
db 17, 19 ; end coords
- dw MenuData_0x24f91
+ dw ParkBattleMenuData
db 1 ; default option
; 24f91
-MenuData_0x24f91: ; 24f91
+ParkBattleMenuData: ; 24f91
db $81 ; flags
dn 2, 2 ; rows, columns
db 12 ; spacing
- dbw BANK(Strings24f9a), Strings24f9a
+ dbw BANK(ParkBattleMenuStrings), ParkBattleMenuStrings
dbw BANK(Function24fb2), Function24fb2
; 24f9a
-Strings24f9a: ; 24f9a
+ParkBattleMenuStrings: ; 24f9a
db "FIGHT@"
db $4a, "@"
db "PARKBALL× @"
@@ -36017,7 +36022,7 @@
ld [rIE], a
pop af
ld [rIF], a
- ld a, $16
+ ld a, PREDEF_START_BATTLE
call Predef
ld a, [rIF]
ld h, a
@@ -47484,7 +47489,7 @@
ld a, [BattleType]
cp $6
jr nz, .asm_3e165
- callba Function24f13
+ callba LoadParkBattleMenuDataHeader
jr .asm_3e175
.asm_3e165
@@ -47522,7 +47527,7 @@
Function3e19b: ; 3e19b
call Function3d2f1
jr z, .asm_3e1a8
- callba Function24ef2
+ callba LoadBattleMenuDataHeader
and a
ret