diff options
Diffstat (limited to 'mobile/mobile_46.asm')
| -rwxr-xr-x | mobile/mobile_46.asm | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 0298c075b..e8a69a7de 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1184,8 +1184,8 @@ BattleTowerRoomMenu_PlacePickLevelMenu: ld a, [$c31a] and a ret nz - ld hl, MenuDataHeader_119cf7 - call LoadMenuDataHeader + ld hl, MenuHeader_119cf7 + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile call ApplyTilemap @@ -1199,15 +1199,15 @@ BattleTowerRoomMenu_PlacePickLevelMenu: ld a, $1 ld [rSVBK], a ld a, [wStatusFlags] - bit 6, a ; Hall Of Fame + bit STATUSFLAGS_HALL_OF_FAME_F, a jr nz, .asm_11896b - ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels - ld a, 5 ; 4 levels to choose from, including 'Cancel'-option + ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels + ld a, 5 ; 4 levels to choose from, including 'Cancel'-option jr .asm_118970 .asm_11896b - ld hl, Strings_L10ToL100 ; Address to list of strings with the choosable levels - ld a, 11 ; 10 levels to choose from, including 'Cancel'-option + ld hl, Strings_L10ToL100 ; Address to list of strings with the choosable levels + ld a, 11 ; 10 levels to choose from, including 'Cancel'-option .asm_118970 ld [wcd4a], a @@ -1672,7 +1672,7 @@ Function118ded: ; 118ded push af ld a, $1 ld [rSVBK], a - farcall Special_Function11b93b + farcall Function11b93b pop af ld [rSVBK], a @@ -3953,7 +3953,7 @@ BattleTowerRoomMenu_UpdateYesNoMenu: ret ; 119cf7 -MenuDataHeader_119cf7: ; 119cf7 +MenuHeader_119cf7: ; 119cf7 db MENU_BACKUP_TILES ; flags menu_coords 12, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL @@ -4105,12 +4105,10 @@ BattleTowerRoomMenu_IncrementJumptable: ; 119e2e (46:5e2e) XGameCodePrefix: ; 119e33 INCBIN "data/mobile/x-game-code-prefix.txt" -XGameCodePrefixEnd: ;119e40 XGameResultPrefix: ; 119e40 INCBIN "data/mobile/x-game-result-prefix.txt" -XGameResultPrefixEnd: ; 119e4f Function119e4f: ; 119e4f @@ -4637,8 +4635,8 @@ Function11a1ff: ; 11a1ff ; 11a207 BattleTowerRoomMenu2_PlaceYesNoMenu: ; 11a207 - ld hl, MenuDataHeader_11a2de - call LoadMenuDataHeader + ld hl, MenuHeader_11a2de + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile call ApplyTilemap @@ -4753,14 +4751,14 @@ String_11a2d3: ; 11a2d3 db "NO@" ; 11a2d6 -MenuDataHeader_11a2d6: ; 11a2d6 +MenuHeader_11a2d6: ; 11a2d6 db MENU_BACKUP_TILES ; flags menu_coords 14, 6, SCREEN_WIDTH - 1, 10 dw NULL db 0 ; default option ; 11a2de -MenuDataHeader_11a2de: ; 11a2de +MenuHeader_11a2de: ; 11a2de db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL @@ -5323,7 +5321,7 @@ String_11a7f4: ; 11a7f4 db " @" ; 11a804 -MenuDataHeader_11a804: ; 11a804 +MenuHeader_11a804: ; 11a804 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, 5 dw NULL @@ -5724,7 +5722,7 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f done ; 0x11ac3e -Special_Function11ac3e: ; 11ac3e +Function11ac3e: ; 11ac3e call SpeechTextBox call FadeToMenu callfar ClearSpriteAnims2 @@ -5902,8 +5900,8 @@ Function11ad8f: ; 11ad8f ; 11ad95 Function11ad95: ; 11ad95 - ld hl, MenuDataHeader_11ae38 - call LoadMenuDataHeader + ld hl, MenuHeader_11ae38 + call LoadMenuHeader call MenuBox hlcoord 12, 12 ld de, String_11ae40 @@ -5994,7 +5992,7 @@ Function11adc4: ret ; 11ae38 -MenuDataHeader_11ae38: ; 11ae38 +MenuHeader_11ae38: ; 11ae38 db MENU_BACKUP_TILES ; flags menu_coords 10, 10, 17, SCREEN_HEIGHT - 1 dw NULL @@ -6009,14 +6007,14 @@ String_11ae40: ; 11ae40 ; 11ae4e Function11ae4e: ; 11ae4e - ld hl, MenuDataHeader_11afe8 - call LoadMenuDataHeader + ld hl, MenuHeader_11afe8 + call LoadMenuHeader call MenuBox hlcoord 10, 14 ld de, String_11aff0 call PlaceString - ld hl, MenuDataHeader_11b013 - call LoadMenuDataHeader + ld hl, MenuHeader_11b013 + call LoadMenuHeader call MenuBox hlcoord 16, 8 ld de, String_11b01b @@ -6100,14 +6098,14 @@ Function11ae98: ; 11af04 Function11af04: ; 11af04 - ld hl, MenuDataHeader_11afe8 - call LoadMenuDataHeader + ld hl, MenuHeader_11afe8 + call LoadMenuHeader call MenuBox hlcoord 10, 14 ld de, String_11b003 call PlaceString - ld hl, MenuDataHeader_11b013 - call LoadMenuDataHeader + ld hl, MenuHeader_11b013 + call LoadMenuHeader call MenuBox hlcoord 16, 8 ld de, String_11b01b @@ -6240,7 +6238,7 @@ Function11afd6: ; 11afd6 ret ; 11afe8 -MenuDataHeader_11afe8: ; 11afe8 +MenuHeader_11afe8: ; 11afe8 db MENU_BACKUP_TILES ; flags menu_coords 9, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL @@ -6257,7 +6255,7 @@ String_11b003: ; 11b003 next "ちゅうししますか？@" ; 11b013 -MenuDataHeader_11b013: ; 11b013 +MenuHeader_11b013: ; 11b013 db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL @@ -7052,7 +7050,7 @@ Function11b3d9: ; 11b3d9 ret ; 11b444 -Special_Function11b444: ; 11b444 +Function11b444: ; 11b444 ; special call Mobile46_InitJumptable call Mobile46_RunJumptable @@ -7341,7 +7339,7 @@ Function11b5e7: ; 11b5e7 ret ; 11b5e8 -Special_Function11b5e8: ; 11b5e8 +Function11b5e8: ; 11b5e8 ld a, $0 call GetSRAMBank ld hl, wRTC @@ -7577,7 +7575,7 @@ Function11b6b4: ; 11b6b4 ret ; 11b7e5 -Special_Function11b7e5: ; 11b7e5 +Function11b7e5: ; 11b7e5 ld a, [$c60d] ; species ld [wOTTrademonSpecies], a ld [wCurPartySpecies], a @@ -7636,7 +7634,7 @@ Special_Function11b7e5: ; 11b7e5 ret ; 11b879 -Special_Function11b879: ; 11b879 +Function11b879: ; 11b879 farcall BattleTower_CheckSaveFileExistsAndIsYours ld a, [wScriptVar] and a @@ -7729,7 +7727,7 @@ Special_Function11b879: ; 11b879 ret ; 11b920 -Special_Function11b920: ; 11b920 +Function11b920: ; 11b920 call Mobile46_InitJumptable ld a, $5 call GetSRAMBank @@ -7742,7 +7740,7 @@ Special_Function11b920: ; 11b920 ret ; 11b93b -Special_Function11b93b: ; 11b93b +Function11b93b: ; 11b93b ld a, $5 call GetSRAMBank xor a @@ -7886,7 +7884,7 @@ AddMobileMonToParty: ; 11b98f ret ; 11ba38 -Special_Function11ba38: ; 11ba38 +Function11ba38: ; 11ba38 farcall CheckCurPartyMonFainted ret c xor a |