diff options
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/battle_tower_5c.asm | 2 | ||||
| -rwxr-xr-x | misc/mobile_12_2.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_40.asm | 4 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 2 | ||||
| -rwxr-xr-x | misc/mobile_5b.asm | 368 | ||||
| -rwxr-xr-x | misc/mobile_menu.asm | 2 |
6 files changed, 6 insertions, 374 deletions
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index b437cae83..8f8114f95 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -482,7 +482,7 @@ endr ld e, l push hl push de - ld hl, MON_EXP + 2 + ld hl, MON_STAT_EXP - 1 add hl, bc ld b, $1 predef CalcPkmnStats diff --git a/misc/mobile_12_2.asm b/misc/mobile_12_2.asm index 0e86a75d1..454c936b3 100755 --- a/misc/mobile_12_2.asm +++ b/misc/mobile_12_2.asm @@ -490,7 +490,7 @@ Function4ab1a: ; 4ab1a ld a, $fb ld [wMenuJoypadFilter], a ld a, $26 - ld [w2DMenuFlags3], a + ld [w2DMenuCursorOffsets], a ld a, $2 ld [w2DMenuNumCols], a call Function4adf7 diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index e52c62cf3..ade57cabb 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -6830,7 +6830,7 @@ Function102dd3: ; 102dd3 ld hl, VTiles0 lb bc, BANK(GFX_1032a2), 4 call Get2bpp - callba Function16d421 + callba __LoadTradeScreenBorder call EnableLCD ret ; 102dec @@ -6889,7 +6889,7 @@ String_102e48: ; 102e48 Function102e4f: ; 102e4f callba Function16d42e - callba Function49797 + callba _InitMG_Mobile_LinkTradePalMap ld de, PlayerName hlcoord 4, 0 call PlaceString diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 22d0f8fe2..ebfd9c759 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -7278,7 +7278,7 @@ Function11b483: ; 11b483 ld hl, MON_MAXHP add hl, de push hl - ld hl, MON_EXP + 2 + ld hl, MON_STAT_EXP - 1 add hl, de pop de push de diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm index 8fcfd3876..1385a3204 100755 --- a/misc/mobile_5b.asm +++ b/misc/mobile_5b.asm @@ -866,371 +866,3 @@ Unknown_16cfb9: GFX_16cfc1: INCBIN "gfx/unknown/16cfc1.2bpp" - -Function16d421: ; 16d421 - ld de, GFX_16cfc1 - ld hl, VTiles2 - lb bc, BANK(GFX_16cfc1), $46 - call Get2bpp - ret -; 16d42e - -Function16d42e: ; 16d42e - ld hl, Tilemap_16d465 - decoord 0, 0 - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - call CopyBytes - ret -; 16d43b - -Function16d43b: ; 16d43b - call LoadStandardMenuDataHeader - call ClearBGPalettes - call ClearTileMap - call ClearSprites - callba Function16d421 - callba Function16d42e - ld b, SCGB_08 - call GetSGBLayout - call SetPalettes - call WaitBGMap - call JoyWaitAorB - call Call_ExitMenu - ret -; 16d465 - -Tilemap_16d465: -INCBIN "gfx/unknown/16d465.tilemap" - -Tilemap_16d5cd: -INCBIN "gfx/unknown/16d5cd.tilemap" - -Tilemap_16d5f5: -INCBIN "gfx/unknown/16d5f5.tilemap" - -_LinkTextbox: ; 16d61d - ld h, d - ld l, e - push bc - push hl - call .draw_border - pop hl - pop bc - - ld de, AttrMap - TileMap - add hl, de - inc b - inc b - inc c - inc c - ld a, $7 -.loop - push bc - push hl -.loop2 - ld [hli], a - dec c - jr nz, .loop2 - pop hl - ld de, SCREEN_WIDTH - add hl, de - pop bc - dec b - jr nz, .loop - ret -; 16d640 - -.draw_border: ; 16d640 - push hl - ld a, $30 - ld [hli], a - inc a - call .fill_row - inc a - ld [hl], a - pop hl - ld de, SCREEN_WIDTH - add hl, de -.loop3 - push hl - ld a, $33 - ld [hli], a - ld a, " " - call .fill_row - ld [hl], $34 - pop hl - ld de, SCREEN_WIDTH - add hl, de - dec b - jr nz, .loop3 - - ld a, $35 - ld [hli], a - ld a, $36 - call .fill_row - ld [hl], $37 - ret -; 16d66d - -.fill_row: ; 16d66d - ld d, c -.loop4 - ld [hli], a - dec d - jr nz, .loop4 - ret -; 16d673 - -Function16d673: ; 16d673 - call Function16d696 - call Function16d6ae - callba Function49856 - callba Functionfb60d - hlcoord 10, 17 - ld de, String_16d68f - call PlaceString - ret -; 16d68f - -String_16d68f: ; 16d68f - db "CANCEL@" -; 16d696 - -Function16d696: ; 16d696 - call Function16d421 - ret -; 16d69a - - -Function16d69a: ; 16d69a - ld de, GFX_16cfc1 + $300 - ld hl, VTiles2 tile $76 - lb bc, BANK(GFX_16cfc1), 8 - call Get2bpp - ret -; 16d6a7 - -Function16d6a7: ; 16d6a7 - callba Function49811 - ret -; 16d6ae - -Function16d6ae: ; 16d6ae - call Function16d42e - ld hl, Tilemap_16d5cd - decoord 0, 0 - ld bc, $0028 - call CopyBytes - ld hl, Tilemap_16d5f5 - decoord 0, 16 - ld bc, $0028 - call CopyBytes - ret -; 16d6ca - -LinkTextbox: ; 16d6ca - call _LinkTextbox - ret -; 16d6ce - -Function16d6ce: ; 16d6ce - call LoadStandardMenuDataHeader - call Function16d6e1 - callba Function87d - call Call_ExitMenu - call WaitBGMap2 - ret -; 16d6e1 - -Function16d6e1: ; 16d6e1 - hlcoord 4, 10 - ld b, 1 - ld c, 10 - predef Predef_LinkTextbox - hlcoord 5, 11 - ld de, .Waiting - call PlaceString - call WaitBGMap - call WaitBGMap2 - ld c, $32 - jp DelayFrames -; 16d701 - -.Waiting: ; 16d701 - db "WAITING..!@" -; 16d70c - -Function16d70c: ; 16d70c - call Function16d725 - call Function16d713 - ret -; 16d713 - -Function16d713: ; 16d713 - push bc - push af - ld a, [hJoyLast] - and $f0 - ld b, a - ld a, [hJoyPressed] - and $f - or b - ld b, a - pop af - ld a, b - pop bc - ld d, a - ret -; 16d725 - -Function16d725: ; 16d725 - ld hl, w2DMenuFlags2 - res 7, [hl] - ld a, [hBGMapMode] - push af - call Function16d734 - pop af - ld [hBGMapMode], a - ret -; 16d734 - -Function16d734: ; 16d734 -.asm_16d734 - call Function16d77a - call Function16d759 - call Function16d76a - jr nc, .asm_16d758 - callba _2DMenuInterpretJoypad - jr c, .asm_16d758 - ld a, [w2DMenuFlags1] - bit 7, a - jr nz, .asm_16d758 - call Function16d713 - ld b, a - ld a, [wMenuJoypadFilter] - and b - jr z, .asm_16d734 - -.asm_16d758 - ret -; 16d759 - -Function16d759: ; 16d759 - ld a, [hOAMUpdate] - push af - ld a, $1 - ld [hOAMUpdate], a - call WaitBGMap - pop af - ld [hOAMUpdate], a - xor a - ld [hBGMapMode], a - ret -; 16d76a - -Function16d76a: ; 16d76a -.asm_16d76a - call RTC - call Function16d7e7 - ret c - ld a, [w2DMenuFlags1] - bit 7, a - jr z, .asm_16d76a - and a - ret -; 16d77a - -Function16d77a: ; 16d77a - ld hl, wCursorCurrentTile - ld a, [hli] - ld h, [hl] - ld l, a - ld a, [hl] - cp $1f - jr nz, .asm_16d792 - ld a, [wCursorOffCharacter] - ld [hl], a - push hl - push bc - ld bc, $000b - add hl, bc - ld [hl], a - pop bc - pop hl - -.asm_16d792 - ld a, [w2DMenuCursorInitY] - ld b, a - ld a, [w2DMenuCursorInitX] - ld c, a - call Coord2Tile - ld a, [w2DMenuFlags3] - swap a - and $f - ld c, a - ld a, [wMenuCursorY] - ld b, a - xor a - dec b - jr z, .asm_16d7b1 -.asm_16d7ad - add c - dec b - jr nz, .asm_16d7ad - -.asm_16d7b1 - ld c, $14 - call AddNTimes - ld a, [w2DMenuFlags3] - and $f - ld c, a - ld a, [wMenuCursorX] - ld b, a - xor a - dec b - jr z, .asm_16d7c8 -.asm_16d7c4 - add c - dec b - jr nz, .asm_16d7c4 - -.asm_16d7c8 - ld c, a - add hl, bc - ld a, [hl] - cp $1f - jr z, .asm_16d7de - ld [wCursorOffCharacter], a - ld [hl], $1f - push hl - push bc - ld bc, $000b - add hl, bc - ld [hl], $1f - pop bc - pop hl - -.asm_16d7de - ld a, l - ld [wCursorCurrentTile], a - ld a, h - ld [wCursorCurrentTile + 1], a - ret -; 16d7e7 - -Function16d7e7: ; 16d7e7 - ld a, [w2DMenuFlags1] - bit 6, a - jr z, .asm_16d7f4 - callba PlaySpriteAnimationsAndDelayFrame - -.asm_16d7f4 - call JoyTextDelay - call Function16d713 - and a - ret z - scf - ret -; 16d7fe - - diff --git a/misc/mobile_menu.asm b/misc/mobile_menu.asm index 7b88a073a..0286921c2 100755 --- a/misc/mobile_menu.asm +++ b/misc/mobile_menu.asm @@ -153,7 +153,7 @@ MobileMenu_InitMenuBuffers: ; 4a071 (12:6071) inc hl xor a ; w2DMenuFlags2 ld [hli], a - ld a, $20 ; w2DMenuFlags3 + ld a, $20 ; w2DMenuCursorOffsets ld [hli], a ; this is a stupid way to load $c3 ld a, A_BUTTON |