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

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff