Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
This commit is contained in:
@@ -487,7 +487,7 @@ BattleTowerRoomMenu_InitRAM: ; 1183cb
|
||||
ld [hMobileReceive], a
|
||||
ld [hMobile], a
|
||||
ei
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
farcall Function115d99
|
||||
farcall Function11615a
|
||||
@@ -1559,8 +1559,7 @@ IndexDownloadURL: ; 0x118ce5
|
||||
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0
|
||||
|
||||
|
||||
Function118d35: ; 118d35
|
||||
; unreferenced
|
||||
Unreferenced_Function118d35: ; 118d35
|
||||
ld hl, $d200
|
||||
ld a, [wcd38]
|
||||
and a
|
||||
@@ -1673,7 +1672,7 @@ Function118ded: ; 118ded
|
||||
push af
|
||||
ld a, $1
|
||||
ld [rSVBK], a
|
||||
farcall Function11b93b
|
||||
farcall Special_Function11b93b
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
|
||||
@@ -4460,7 +4459,7 @@ Function11a00e: ; 11a00e
|
||||
call PushWindow
|
||||
farcall Function11765d
|
||||
farcall Function117ab4
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
call ExitMenu
|
||||
farcall ReloadMapPart
|
||||
@@ -4483,7 +4482,7 @@ Function11a0ca: ; 11a0ca
|
||||
call PushWindow
|
||||
farcall Function11765d
|
||||
farcall Function17d3f6
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
call ExitMenu
|
||||
farcall ReloadMapPart
|
||||
@@ -5573,7 +5572,7 @@ Function11a9ce: ; 11a9ce
|
||||
call ClearBGPalettes
|
||||
call ReloadTilesetAndPalettes
|
||||
call Call_ExitMenu
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
call ret_d90
|
||||
farcall FinishExitMenu
|
||||
@@ -5725,7 +5724,7 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f
|
||||
done
|
||||
; 0x11ac3e
|
||||
|
||||
Function11ac3e: ; 11ac3e
|
||||
Special_Function11ac3e: ; 11ac3e
|
||||
call SpeechTextBox
|
||||
call FadeToMenu
|
||||
callfar ClearSpriteAnims2
|
||||
@@ -6689,7 +6688,7 @@ Function11b242: ; 11b242
|
||||
call PlaceString
|
||||
xor a
|
||||
ld [MonType], a
|
||||
farcall GetGender
|
||||
farcall Predef_GetGender
|
||||
hlcoord 1, 4
|
||||
ld a, [CurPartySpecies]
|
||||
ld bc, wcd2f
|
||||
@@ -6949,8 +6948,7 @@ Function11b397: ; 11b397
|
||||
jr .loop
|
||||
; 11b3b6
|
||||
|
||||
Function11b3b6: ; 11b3b6
|
||||
; unreferenced
|
||||
Unreferenced_Function11b3b6: ; 11b3b6
|
||||
.loop
|
||||
ld a, [hl]
|
||||
cp -1
|
||||
@@ -7054,7 +7052,7 @@ Function11b3d9: ; 11b3d9
|
||||
ret
|
||||
; 11b444
|
||||
|
||||
Function11b444: ; 11b444
|
||||
Special_Function11b444: ; 11b444
|
||||
; special
|
||||
call Mobile46_InitJumptable
|
||||
call Mobile46_RunJumptable
|
||||
@@ -7148,7 +7146,7 @@ Function11b483: ; 11b483
|
||||
pop de
|
||||
push de
|
||||
ld b, OTPARTYMON
|
||||
predef CalcPkmnStats
|
||||
predef Predef_CalcPkmnStats
|
||||
pop de
|
||||
ld h, d
|
||||
ld l, e
|
||||
@@ -7343,7 +7341,7 @@ Function11b5e7: ; 11b5e7
|
||||
ret
|
||||
; 11b5e8
|
||||
|
||||
Function11b5e8: ; 11b5e8
|
||||
Special_Function11b5e8: ; 11b5e8
|
||||
ld a, $0
|
||||
call GetSRAMBank
|
||||
ld hl, wRTC
|
||||
@@ -7567,7 +7565,7 @@ Function11b6b4: ; 11b6b4
|
||||
ld hl, $c60d + MON_STAT_EXP - 1
|
||||
ld de, $c60d + MON_MAXHP
|
||||
ld b, $1
|
||||
predef CalcPkmnStats
|
||||
predef Predef_CalcPkmnStats
|
||||
ld de, $c60d + MON_MAXHP
|
||||
ld hl, $c60d + MON_HP
|
||||
ld a, [de]
|
||||
@@ -7579,7 +7577,7 @@ Function11b6b4: ; 11b6b4
|
||||
ret
|
||||
; 11b7e5
|
||||
|
||||
Function11b7e5: ; 11b7e5
|
||||
Special_Function11b7e5: ; 11b7e5
|
||||
ld a, [$c60d] ; species
|
||||
ld [wOTTrademonSpecies], a
|
||||
ld [CurPartySpecies], a
|
||||
@@ -7638,7 +7636,7 @@ Function11b7e5: ; 11b7e5
|
||||
ret
|
||||
; 11b879
|
||||
|
||||
Function11b879: ; 11b879
|
||||
Special_Function11b879: ; 11b879
|
||||
farcall BattleTower_CheckSaveFileExistsAndIsYours
|
||||
ld a, [ScriptVar]
|
||||
and a
|
||||
@@ -7731,7 +7729,7 @@ Function11b879: ; 11b879
|
||||
ret
|
||||
; 11b920
|
||||
|
||||
Function11b920: ; 11b920
|
||||
Special_Function11b920: ; 11b920
|
||||
call Mobile46_InitJumptable
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
@@ -7744,7 +7742,7 @@ Function11b920: ; 11b920
|
||||
ret
|
||||
; 11b93b
|
||||
|
||||
Function11b93b: ; 11b93b
|
||||
Special_Function11b93b: ; 11b93b
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
xor a
|
||||
@@ -7888,7 +7886,7 @@ AddMobileMonToParty: ; 11b98f
|
||||
ret
|
||||
; 11ba38
|
||||
|
||||
Function11ba38: ; 11ba38
|
||||
Special_Function11ba38: ; 11ba38
|
||||
farcall CheckCurPartyMonFainted
|
||||
ret c
|
||||
xor a
|
||||
|
Reference in New Issue
Block a user