pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

more 3pt macro labels; shorten 3pt macros to take just a label

Browse Source 
static addresses should be avoided anyway
This commit is contained in:
yenatch 2013-12-02 14:18:03 -05:00
parent ce37f0f970
commit 3de254f7a2
8 changed files with 368 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
battle/effect_commands.asm
View File

@ -9687,33 +9687,33 @@ BattleCommand67: ; 379c9
ld c, 50 ld c, 50
call DelayFrames call DelayFrames
call $1d6e call Function1d6e
callba Function3d2f7 callba Function3d2f7
callba Function3d380 callba Function3d380
call $3317 call ClearPalettes
callba Function3ed9f callba Function3ed9f
call $1c17 call Function1c17
call $300b call ClearSprites
ld hl, $c4a1 ld hl, $c4a1
ld bc, $040a ld bc, $040a
call ClearBox call ClearBox
ld b, 1 ld b, 1
call $3340 call GetSGBLayout
call $32f9 call Function32f9
call Function0x37a67 call Function0x37a67
callba Function3d2e0 callba Function3d2e0
jp c, EndMoveEffect jp c, EndMoveEffect
ld hl, $6459 ld hl, Function3e459
call CallBankF call CallBankF
call Function0x37ab1 call Function0x37ab1

8
engine/events.asm
View File

@ -920,12 +920,12 @@ CheckMenuOW: ; 96b30
StartMenuScript: ; 96b58 StartMenuScript: ; 96b58
3callasm BANK(StartMenu), StartMenu 3callasm StartMenu
2jump StartMenuCallback 2jump StartMenuCallback
; 96b5f ; 96b5f
SelectMenuScript: ; 96b5f SelectMenuScript: ; 96b5f
3callasm BANK(SelectMenu), SelectMenu 3callasm SelectMenu
2jump SelectMenuCallback 2jump SelectMenuCallback
; 96b66 ; 96b66
@ -1072,7 +1072,7 @@ UnknownScript_0x96c2e: ; 96c2e
; 96c2f ; 96c2f
UnknownScript_0x96c2f: ; 96c2f UnknownScript_0x96c2f: ; 96c2f
3callasm BANK(Function16f5e), Function16f5e 3callasm Function16f5e
end end
; 96c34 ; 96c34
@ -1107,7 +1107,7 @@ UnknownScript_0x96c4d: ; 96c4d
UnknownScript_0x96c4f: ; 96c4f UnknownScript_0x96c4f: ; 96c4f
deactivatefacing $3 deactivatefacing $3
3callasm BANK(Function96706), Function96706 3callasm Function96706
end end
; 96c56 ; 96c56

8
engine/fruit_trees.asm
View File

@ -1,12 +1,12 @@
FruitTreeScript: ; 44000 FruitTreeScript: ; 44000
3callasm BANK(GetCurTreeFruit), GetCurTreeFruit 3callasm GetCurTreeFruit
loadfont loadfont
copybytetovar CurFruit copybytetovar CurFruit
itemtotext $0, $0 itemtotext $0, $0
2writetext FruitBearingTreeText 2writetext FruitBearingTreeText
keeptextopen keeptextopen
3callasm BANK(TryResetFruitTrees), TryResetFruitTrees 3callasm TryResetFruitTrees
3callasm BANK(CheckFruitTree), CheckFruitTree 3callasm CheckFruitTree
iffalse .fruit iffalse .fruit
2writetext NothingHereText 2writetext NothingHereText
closetext closetext
@ -19,7 +19,7 @@ FruitTreeScript: ; 44000
iffalse .packisfull iffalse .packisfull
keeptextopen keeptextopen
2writetext ObtainedFruitText 2writetext ObtainedFruitText
3callasm BANK(PickedFruitTree), PickedFruitTree 3callasm PickedFruitTree
specialsound specialsound
itemnotify itemnotify
2jump .end 2jump .end

2
engine/scripting.asm
View File

@ -573,7 +573,7 @@ Function96f76: ; 96f76
; 96f77 ; 96f77
GiveItemScript: ; 96f77 GiveItemScript: ; 96f77
3callasm BANK(Function96f76), Function96f76 3callasm Function96f76
2writetext ReceivedItemText 2writetext ReceivedItemText
iffalse .Full iffalse .Full
waitbutton waitbutton

594
engine/std_scripts.asm
View File

File diff suppressed because it is too large Load Diff

96
main.asm
View File

@ -9294,10 +9294,10 @@ Unknown_c7fe: ; c7fe
INCBIN "baserom.gbc",$c7fe,$c802 - $c7fe INCBIN "baserom.gbc",$c7fe,$c802 - $c7fe
UnknownScript_0xc802: ; 0xc802 UnknownScript_0xc802: ; 0xc802
3callasm BANK(GetPartyNick), GetPartyNick 3callasm GetPartyNick
2writetext UnknownText_0xc7c4 2writetext UnknownText_0xc7c4
reloadmappart reloadmappart
3callasm BANK(Functionc810), Functionc810 3callasm Functionc810
loadmovesprites loadmovesprites
end end
; 0xc810 ; 0xc810
@ -9398,7 +9398,7 @@ UnknownScript_0xc8e6: ; 0xc8e6
reloadmappart reloadmappart
special $0035 special $0035
2writetext UnknownText_0xc8f3 2writetext UnknownText_0xc8f3
3callasm BANK(Function8c7e1), Function8c7e1 3callasm Function8c7e1
loadmovesprites loadmovesprites
end end
; 0xc8f3 ; 0xc8f3
@ -9507,7 +9507,7 @@ UsedSurfScript: ; c986
closetext closetext
loadmovesprites loadmovesprites
3callasm BANK(Functionc9a2), Functionc9a2 ; empty function 3callasm Functionc9a2 ; empty function
copybytetovar Buffer2 copybytetovar Buffer2
writevarcode VAR_MOVEMENT writevarcode VAR_MOVEMENT
@ -9732,17 +9732,17 @@ Functionca9d: ; ca9d
UnknownScript_0xcaa3: ; 0xcaa3 UnknownScript_0xcaa3: ; 0xcaa3
reloadmappart reloadmappart
3callasm BANK(HideSprites), HideSprites 3callasm HideSprites
special $0035 special $0035
3callasm BANK(Function8caed), Function8caed 3callasm Function8caed
3call BANK(UnknownScript_0x122c1), UnknownScript_0x122c1 3call UnknownScript_0x122c1
special $0000 special $0000
3callasm BANK(Function154f1), Function154f1 3callasm Function154f1
writecode $8, $0 writecode $8, $0
newloadmap $fc newloadmap $fc
3callasm BANK(Function8cb33), Function8cb33 3callasm Function8cb33
special $003b special $003b
3callasm BANK(Functioncacb), Functioncacb 3callasm Functioncacb
end end
; 0xcacb ; 0xcacb
@ -9801,14 +9801,14 @@ UnknownScript_0xcb1c: ; 0xcb1c
special $0035 special $0035
UnknownScript_0xcb20: ; 0xcb20 UnknownScript_0xcb20: ; 0xcb20
3callasm BANK(GetPartyNick), GetPartyNick 3callasm GetPartyNick
2writetext UnknownText_0xcb51 2writetext UnknownText_0xcb51
closetext closetext
loadmovesprites loadmovesprites
playsound SFX_BUBBLEBEAM playsound SFX_BUBBLEBEAM
.loop .loop
applymovement $0, WaterfallStep applymovement $0, WaterfallStep
3callasm BANK(Functioncb38), Functioncb38 3callasm Functioncb38
iffalse .loop iffalse .loop
end end
; 0xcb38 ; 0xcb38
@ -10004,7 +10004,7 @@ UnknownScript_0xcc3c: ; 0xcc3c
loadmovesprites loadmovesprites
playsound SFX_WARP_TO playsound SFX_WARP_TO
applymovement $0, MovementData_0xcc59 applymovement $0, MovementData_0xcc59
3call BANK(UnknownScript_0x122c1), UnknownScript_0x122c1 3call UnknownScript_0x122c1
special $0000 special $0000
writecode $8, $0 writecode $8, $0
newloadmap $f5 newloadmap $f5
@ -10145,7 +10145,7 @@ UnknownScript_0xcd29: ; 0xcd29
special $0035 special $0035
UnknownScript_0xcd2d: ; 0xcd2d UnknownScript_0xcd2d: ; 0xcd2d
3callasm BANK(Functioncd12), Functioncd12 3callasm Functioncd12
2writetext UnknownText_0xcd41 2writetext UnknownText_0xcd41
copybytetovar $d1ef copybytetovar $d1ef
cry $0000 cry $0000
@ -10166,7 +10166,7 @@ UnknownText_0xcd46: ; 0xcd46
; 0xcd4b ; 0xcd4b
UnknownScript_0xcd4b: ; 0xcd4b UnknownScript_0xcd4b: ; 0xcd4b
3callasm BANK(Functioncd78), Functioncd78 3callasm Functioncd78
iffalse UnknownScript_0xcd5f iffalse UnknownScript_0xcd5f
if_equal $1, UnknownScript_0xcd59 if_equal $1, UnknownScript_0xcd59
2jump UnknownScript_0xcd5c 2jump UnknownScript_0xcd5c
@ -10280,10 +10280,10 @@ Functioncdde: ; cdde
INCBIN "baserom.gbc",$ce0b,$ce0f - $ce0b INCBIN "baserom.gbc",$ce0b,$ce0f - $ce0b
UnknownScript_0xce0f: ; 0xce0f UnknownScript_0xce0f: ; 0xce0f
3callasm BANK(GetPartyNick), GetPartyNick 3callasm GetPartyNick
2writetext UnknownText_0xcdd9 2writetext UnknownText_0xcdd9
reloadmappart reloadmappart
3callasm BANK(Functionce1d), Functionce1d 3callasm Functionce1d
loadmovesprites loadmovesprites
end end
; 0xce1d ; 0xce1d
@ -10387,11 +10387,11 @@ UnknownText_0xcea2: ; 0xcea2
UnknownScript_0xcea7: ; 0xcea7 UnknownScript_0xcea7: ; 0xcea7
reloadmappart reloadmappart
special $0035 special $0035
3callasm BANK(GetPartyNick), GetPartyNick 3callasm GetPartyNick
2writetext UnknownText_0xce9d 2writetext UnknownText_0xce9d
reloadmappart reloadmappart
3callasm BANK(Function8c80a), Function8c80a 3callasm Function8c80a
3callasm BANK(Functionb81ea), Functionb81ea 3callasm Functionb81ea
iffalse UnknownScript_0xcec3 iffalse UnknownScript_0xcec3
loadmovesprites loadmovesprites
battlecheck battlecheck
@ -10475,7 +10475,7 @@ UnknownScript_0xcf2e: ; 0xcf2e
special $0035 special $0035
UnknownScript_0xcf32: ; cf32 UnknownScript_0xcf32: ; cf32
3callasm BANK(GetPartyNick), GetPartyNick 3callasm GetPartyNick
2writetext UnknownText_0xcf58 2writetext UnknownText_0xcf58
loadmovesprites loadmovesprites
special $003b special $003b
@ -10483,7 +10483,7 @@ UnknownScript_0xcf32: ; cf32
earthquake 84 earthquake 84
applymovement2 MovementData_0xcf55 applymovement2 MovementData_0xcf55
disappear $fe disappear $fe
3callasm BANK(Functionb8219), Functionb8219 3callasm Functionb8219
copybytetovar $d22e copybytetovar $d22e
iffalse .done iffalse .done
battlecheck battlecheck
@ -10503,7 +10503,7 @@ UnknownText_0xcf58: ; 0xcf58
; 0xcf5d ; 0xcf5d
UnknownScript_0xcf5d: ; 0xcf5d UnknownScript_0xcf5d: ; 0xcf5d
3callasm BANK(Functioncf7c), Functioncf7c 3callasm Functioncf7c
if_equal $1, UnknownScript_0xcf6f if_equal $1, UnknownScript_0xcf6f
loadfont loadfont
2writetext UnknownText_0xcf77 2writetext UnknownText_0xcf77
@ -10680,7 +10680,7 @@ UnknownScript_0xd1a9: ; 0xd1a9
2writetext UnknownText_0xd1c8 2writetext UnknownText_0xd1c8
yesorno yesorno
iffalse .script_d1b8 iffalse .script_d1b8
3callasm BANK(Functiond1ba), Functiond1ba 3callasm Functiond1ba
iftrue UnknownScript_0xc802 iftrue UnknownScript_0xc802
.script_d1b8 .script_d1b8
loadmovesprites loadmovesprites
@ -17731,7 +17731,7 @@ UnknownScript_0x122c1: ; 0x122c1
; 0x122ce ; 0x122ce
UnknownScript_0x122ce: ; 0x122ce UnknownScript_0x122ce: ; 0x122ce
3callasm BANK(Function122f8), Function122f8 3callasm Function122f8
iffalse UnknownScript_0x122e3 iffalse UnknownScript_0x122e3
disappear $fe disappear $fe
loadfont loadfont
@ -18009,7 +18009,7 @@ INCBIN "baserom.gbc",$124c1,$124c8 - $124c1
UnknownScript_0x124c8: ; 0x124c8 UnknownScript_0x124c8: ; 0x124c8
refreshscreen $0 refreshscreen $0
3callasm BANK(Function124fa), Function124fa 3callasm Function124fa
2writetext UnknownText_0x124f5 2writetext UnknownText_0x124f5
closetext closetext
special $002e special $002e
@ -18017,9 +18017,9 @@ UnknownScript_0x124c8: ; 0x124c8
special $001b special $001b
checkflag $0011 checkflag $0011
iftrue .script_64f2 iftrue .script_64f2
3callasm BANK(HalveMoney), HalveMoney 3callasm HalveMoney
3callasm BANK(Function12527), Function12527 3callasm Function12527
3call BANK(UnknownScript_0x122c1), UnknownScript_0x122c1 3call UnknownScript_0x122c1
special $0000 special $0000
newloadmap $f1 newloadmap $f1
resetfuncs resetfuncs
@ -61450,16 +61450,16 @@ Function50658: ; 50658
; 50669 ; 50669
UnknownScript_0x50669: ; 50669 UnknownScript_0x50669: ; 50669
3callasm BANK(Function50658), Function50658 3callasm Function50658
loadfont loadfont
3callasm BANK(Function5067b), Function5067b 3callasm Function5067b
iffalse UnknownScript_0x50677 iffalse UnknownScript_0x50677
loadmovesprites loadmovesprites
end end
; 50677 ; 50677
UnknownScript_0x50677: ; 50677 UnknownScript_0x50677: ; 50677
3jump BANK(UnknownScript_0x124c8), UnknownScript_0x124c8 3jump UnknownScript_0x124c8
; 5067b ; 5067b
Function5067b: ; 5067b Function5067b: ; 5067b
@ -61514,10 +61514,10 @@ Function506bc: ; 506bc
UnknownScript_0x506c8: ; 0x506c8 UnknownScript_0x506c8: ; 0x506c8
reloadmappart reloadmappart
special $0035 special $0035
3callasm BANK(GetPartyNick), GetPartyNick 3callasm GetPartyNick
2writetext UnknownText_0x50726 2writetext UnknownText_0x50726
closetext closetext
3callasm BANK(Function506ef), Function506ef 3callasm Function506ef
iffalse UnknownScript_0x506e9 iffalse UnknownScript_0x506e9
checkflag $0011 checkflag $0011
iftrue UnknownScript_0x506e5 iftrue UnknownScript_0x506e5
@ -61528,7 +61528,7 @@ UnknownScript_0x506c8: ; 0x506c8
; 0x506e5 ; 0x506e5
UnknownScript_0x506e5: ; 0x506e5 UnknownScript_0x506e5: ; 0x506e5
3jump BANK(UnknownScript_0x135eb), UnknownScript_0x135eb 3jump UnknownScript_0x135eb
; 0x506e9 ; 0x506e9
UnknownScript_0x506e9: ; 0x506e9 UnknownScript_0x506e9: ; 0x506e9
@ -61589,9 +61589,9 @@ _Squirtbottle: ; 50730
UnknownScript_0x5073c: ; 0x5073c UnknownScript_0x5073c: ; 0x5073c
reloadmappart reloadmappart
special $0035 special $0035
3callasm BANK(Function50753), Function50753 3callasm Function50753
iffalse UnknownScript_0x5074b iffalse UnknownScript_0x5074b
3jump BANK(WateredWeirdTreeScript), WateredWeirdTreeScript 3jump WateredWeirdTreeScript
; 0x5074b ; 0x5074b
UnknownScript_0x5074b: ; 0x5074b UnknownScript_0x5074b: ; 0x5074b
@ -61666,7 +61666,7 @@ _CardKey: ; 50779
UnknownScript_0x507af: ; 0x507af UnknownScript_0x507af: ; 0x507af
loadmovesprites loadmovesprites
3jump BANK(MapRadioTower3FSignpost2Script), MapRadioTower3FSignpost2Script 3jump MapRadioTower3FSignpost2Script
; 0x507b4 ; 0x507b4
@ -61701,7 +61701,7 @@ _BasementKey: ; 507b4
UnknownScript_0x507e1: ; 0x507e1 UnknownScript_0x507e1: ; 0x507e1
loadmovesprites loadmovesprites
3jump BANK(MapWarehouseEntranceSignpost0Script), MapWarehouseEntranceSignpost0Script 3jump MapWarehouseEntranceSignpost0Script
; 0x507e6 ; 0x507e6
@ -74029,7 +74029,7 @@ Function8c7e1: ; 8c7e1
callba Function8c0e5 callba Function8c0e5
callba Function8c001 callba Function8c001
ld b, $9 ld b, $9
call Function3340 call GetSGBLayout
callba Function49409 callba Function49409
callba Function8c079 callba Function8c079
ret ret
@ -74057,9 +74057,9 @@ Function8c80a: ; 8c80a
call Function8c913 call Function8c913
ld a, $20 ld a, $20
ld [$cf64], a ld [$cf64], a
call Function3c55 call WaitSFX
ld de, $006d ld de, $006d
call Function3c23 call PlaySFX
.asm_8c852 .asm_8c852
ld hl, $cf64 ld hl, $cf64
ld a, [hl] ld a, [hl]
@ -74074,14 +74074,14 @@ Function8c80a: ; 8c80a
.asm_8c86a .asm_8c86a
call Function2173 call Function2173
call Function31f6 call WaitBGMap
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
callba Function8cf53 callba Function8cf53
ld hl, $c490 ld hl, $c490
ld bc, $0010 ld bc, $0010
xor a xor a
call Function3041 call ByteFill
ld de, $4200 ld de, $4200
ld hl, VTiles1 ld hl, VTiles1
ld bc, $3e0c ld bc, $3e0c
@ -74112,7 +74112,7 @@ Function8c913: ; 8c913
add hl, bc add hl, bc
ld [hli], a ld [hli], a
ld [hld], a ld [hld], a
call Function31f6 call WaitBGMap
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
@ -82037,9 +82037,9 @@ Functionb81ea: ; b81ea
ld [$d22e], a ld [$d22e], a
ld [CurPartyLevel], a ld [CurPartyLevel], a
ld hl, $425e ld hl, $425e
call Functionb823f call GetTreeMonEncounterTable
jr nc, .asm_b8214 jr nc, .asm_b8214
call Functionb82d2 call LoadTreeMonData
jr nc, .asm_b8214 jr nc, .asm_b8214
call Functionb83e5 call Functionb83e5
jr nc, .asm_b8214 jr nc, .asm_b8214
@ -84035,7 +84035,7 @@ UnknownScript_0xbe675: ; 0xbe675
loadtrainerdata loadtrainerdata
playrammusic playrammusic
showemote $0, $fe, 30 showemote $0, $fe, 30
3callasm BANK(Function831e), Function831e 3callasm Function831e
applymovement2 $d007 applymovement2 $d007
writepersonxy $fe writepersonxy $fe
faceperson $0, $fe faceperson $0, $fe

9
maps/BattleTowerBattleRoom.asm
View File

@ -30,9 +30,12 @@ UnknownScript_0x9f425: ; 0x9f425
waitbutton waitbutton
applymovement $2, MovementData_0x9e592 applymovement $2, MovementData_0x9e592
loadfont loadfont
storetext 1, UnknownText_0x9f930 + 37 - $3000, $f storetext 1
follownotexact $0, $f keeptextopen
giveegg 0, 123 loadmovesprites
special $0077
special $002e
reloadmap
if_not_equal $0, UnknownScript_0x9f4c2 if_not_equal $0, UnknownScript_0x9f4c2
copybytetovar $cf64 copybytetovar $cf64
if_equal $7, UnknownScript_0x9f4d9 if_equal $7, UnknownScript_0x9f4d9

2
maps/BattleTowerHallway.asm
View File

@ -21,7 +21,7 @@ UnknownScript_0x9f5c0: ; 0x9f5c0
UnknownScript_0x9f5c1: ; 0x9f5c1 UnknownScript_0x9f5c1: ; 0x9f5c1
follow $2, $0 follow $2, $0
3callasm BANK(Function_0x9f5cb), Function_0x9f5cb 3callasm Function_0x9f5cb
2jump UnknownScript_0x9f5dc 2jump UnknownScript_0x9f5dc
; 0x9f5cb ; 0x9f5cb