Label BattleTowerRoomMenu

All of the functions called by it are prefixed with BattleTowerRoomMenu,
but a bunch of them seem more generic than that, since they're part of
different mobile menus. Also called another menu jumptable
BattleTowerRoomMenu2 for the lack of a better name (only the Yes/No menu
functions are used in western crystal).
The names of the more generic functions should be fixed when we start
labelling other menus.
This commit is contained in:
mid-kid 2017-11-25 17:03:20 +01:00
parent c28be02a19
commit afc92eadc1
5 changed files with 234 additions and 229 deletions

View File

@ -138,7 +138,7 @@ SpecialsPointers:: ; c029
add_special Function11b879
add_special Function11b920
add_special Function11b93b
add_special Function1700b0
add_special BattleTowerRoomMenu
add_special Function1700ba
add_special Function170114
add_special BattleTowerBattle

View File

@ -89,7 +89,7 @@ Script_ChoseChallenge: ; 0x9e40f
dotrigger $1
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [s1_be4f]
special BattleTowerAction
special Function1700b0
special BattleTowerRoomMenu
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, UnknownScript_0x9e550
writebyte BATTLETOWERACTION_11

View File

@ -1,7 +1,7 @@
Function1700b0: ; 1700b0
BattleTowerRoomMenu: ; 1700b0
; special
call InitBattleTowerChallengeRAM
callba Function118121
callba _BattleTowerRoomMenu
ret
; 1700ba

File diff suppressed because it is too large Load Diff

View File

@ -324,7 +324,7 @@ Function1719c8: ; 1719c8 (5c:59c8)
ret
Function1719d6: ; 1719d6 (5c:59d6)
callba Function1183cb
callba BattleTowerRoomMenu_InitRAM
call Function1719ed
ld a, [rSVBK]
push af
@ -412,7 +412,7 @@ Function171a5d: ; 171a5d (5c:5a5d)
push af
ld a, $1
ld [rSVBK], a
callba Function118452
callba BattleTowerRoomMenu_Cleanup
pop af
ld [rSVBK], a
ld a, $a
@ -457,7 +457,7 @@ Function171aec: ; 171aec (5c:5aec)
push af
ld a, $1
ld [rSVBK], a
callba Function118452
callba BattleTowerRoomMenu_Cleanup
pop af
ld [rSVBK], a
hlcoord 2, 6