Name all functions in event/

This commit is contained in:
pikalaxalt 2016-05-10 12:59:34 -04:00
parent ae36ef2c7f
commit 46ecd5b869
6 changed files with 44 additions and 54 deletions

View File

@ -821,7 +821,7 @@ PrintUnownStamp: ; 84560
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
callba Function16dac callba PlaceUnownPrinterFrontpic
ld a, $0 ld a, $0
call Function84419 call Function84419
call Call_LoadTempTileMapToTileMap call Call_LoadTempTileMapToTileMap

View File

@ -148,9 +148,9 @@ Special_BankOfMom: ; 16218
ld a, $5 ld a, $5
ld [wcf64], a ld [wcf64], a
call LoadStandardMenuDataHeader call LoadStandardMenuDataHeader
call Function16517 call Mom_SetUpDepositMenu
call Function1656b call Mom_Wait10Frames
call Function16571 call Mom_WithdrawDepositMenuJoypad
call CloseWindow call CloseWindow
jr c, .CancelDeposit jr c, .CancelDeposit
ld hl, StringBuffer2 ld hl, StringBuffer2
@ -215,9 +215,9 @@ Special_BankOfMom: ; 16218
ld a, $5 ld a, $5
ld [wcf64], a ld [wcf64], a
call LoadStandardMenuDataHeader call LoadStandardMenuDataHeader
call Function16512 call Mom_SetUpWithdrawMenu
call Function1656b call Mom_Wait10Frames
call Function16571 call Mom_WithdrawDepositMenuJoypad
call CloseWindow call CloseWindow
jr c, .CancelWithdraw jr c, .CancelWithdraw
ld hl, StringBuffer2 ld hl, StringBuffer2
@ -441,14 +441,13 @@ DSTChecks: ; 16439
db "@" db "@"
; 0x16512 ; 0x16512
Function16512: ; 16512 Mom_SetUpWithdrawMenu: ; 16512
ld de, String_1669f ld de, Mon_WithdrawString
jr Function1651a jr Mom_ContinueMenuSetup
Function16517: ; 16517 Mom_SetUpDepositMenu: ; 16517
ld de, String_166a8 ld de, Mom_DepositString
Mom_ContinueMenuSetup: ; 1651a
Function1651a: ; 1651a
push de push de
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
@ -456,14 +455,14 @@ Function1651a: ; 1651a
lb bc, 6, 18 lb bc, 6, 18
call TextBox call TextBox
hlcoord 1, 2 hlcoord 1, 2
ld de, String_16699 ld de, Mom_SavedString
call PlaceString call PlaceString
hlcoord 12, 2 hlcoord 12, 2
ld de, wMomsMoney ld de, wMomsMoney
lb bc, PRINTNUM_MONEY | 3, 6 lb bc, PRINTNUM_MONEY | 3, 6
call PrintNum call PrintNum
hlcoord 1, 4 hlcoord 1, 4
ld de, String_166b0 ld de, Mom_HeldString
call PlaceString call PlaceString
hlcoord 12, 4 hlcoord 12, 4
ld de, Money ld de, Money
@ -481,13 +480,13 @@ Function1651a: ; 1651a
ret ret
; 1656b ; 1656b
Function1656b: ; 1656b Mom_Wait10Frames: ; 1656b
ld c, 10 ld c, 10
call DelayFrames call DelayFrames
ret ret
; 16571 ; 16571
Function16571: ; 16571 Mom_WithdrawDepositMenuJoypad: ; 16571
.loop .loop
call JoyTextDelay call JoyTextDelay
ld hl, hJoyPressed ld hl, hJoyPressed
@ -529,9 +528,8 @@ Function16571: ; 16571
.pressedA .pressedA
and a and a
ret ret
; 165b9
.dpadaction ; 165b9 .dpadaction
ld hl, hJoyLast ld hl, hJoyLast
ld a, [hl] ld a, [hl]
and D_UP and D_UP
@ -581,9 +579,8 @@ Function16571: ; 16571
ld de, StringBuffer2 ld de, StringBuffer2
callba TakeMoney callba TakeMoney
ret ret
; 16607
.getdigitquantity ; 16607 .getdigitquantity
ld a, [wMomBankDigitCursorPosition] ld a, [wMomBankDigitCursorPosition]
push de push de
ld e, a ld e, a
@ -714,19 +711,19 @@ UnknownText_0x16694: ; 0x16694
db "@" db "@"
; 0x16699 ; 0x16699
String_16699: ; 16699 Mom_SavedString: ; 16699
db "SAVED@" db "SAVED@"
; 1669f ; 1669f
String_1669f: ; 1669f Mon_WithdrawString: ; 1669f
db "WITHDRAW@" db "WITHDRAW@"
; 166a8 ; 166a8
String_166a8: ; 166a8 Mom_DepositString: ; 166a8
db "DEPOSIT@" db "DEPOSIT@"
; 166b0 ; 166b0
String_166b0: ; 166b0 Mom_HeldString: ; 166b0
db "HELD@" db "HELD@"
; 166b5 ; 166b5

View File

@ -219,7 +219,7 @@ UnownDexBTile: ; 16da4
INCBIN "gfx/unknown/016da4.1bpp" INCBIN "gfx/unknown/016da4.1bpp"
; 16dac ; 16dac
Function16dac: ; 16dac PlaceUnownPrinterFrontpic: ; 16dac
hlcoord 0, 0 hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, " " ld a, " "

View File

@ -1,50 +1,46 @@
_Squirtbottle: ; 50730 _Squirtbottle: ; 50730
ld hl, UnknownScript_0x5073c ld hl, .SquirtbottleScript
call QueueScript call QueueScript
ld a, $1 ld a, $1
ld [wItemEffectSucceeded], a ld [wItemEffectSucceeded], a
ret ret
; 5073c
UnknownScript_0x5073c: ; 0x5073c .SquirtbottleScript:
reloadmappart reloadmappart
special UpdateTimePals special UpdateTimePals
callasm Function50753 callasm .CheckCanUseSquirtbottle
iffalse UnknownScript_0x5074b iffalse .NothingHappenedScript
farjump WateredWeirdTreeScript farjump WateredWeirdTreeScript
; 0x5074b
UnknownScript_0x5074b: ; 0x5074b .NothingHappenedScript:
jumptext UnknownText_0x5074e jumptext .NothingHappenedText
; 0x5074e
UnknownText_0x5074e: ; 0x5074e .NothingHappenedText:
; sprinkled water. But nothing happened… ; sprinkled water. But nothing happened…
text_jump UnknownText_0x1c0b3b text_jump UnknownText_0x1c0b3b
db "@" db "@"
; 0x50753
Function50753: ; 50753 .CheckCanUseSquirtbottle:
ld a, [MapGroup] ld a, [MapGroup]
cp GROUP_ROUTE_36 cp GROUP_ROUTE_36
jr nz, .asm_50774 jr nz, .nope
ld a, [MapNumber] ld a, [MapNumber]
cp MAP_ROUTE_36 cp MAP_ROUTE_36
jr nz, .asm_50774 jr nz, .nope
callba GetFacingObject callba GetFacingObject
jr c, .asm_50774 jr c, .nope
ld a, d ld a, d
cp $17 cp SPRITEMOVEDATA_SUDOWOODO
jr nz, .asm_50774 jr nz, .nope
ld a, $1 ld a, 1
ld [ScriptVar], a ld [ScriptVar], a
ret ret
.asm_50774 .nope
xor a xor a
ld [ScriptVar], a ld [ScriptVar], a
ret ret

View File

@ -49,13 +49,6 @@ Function2d43:: ; 2d43
INCLUDE "home/farcall.asm" INCLUDE "home/farcall.asm"
INCLUDE "home/predef.asm" INCLUDE "home/predef.asm"
INCLUDE "home/window.asm" INCLUDE "home/window.asm"
Function2e4e:: ; 2e4e
; Unreferenced.
scf
ret
; 2e50
INCLUDE "home/flag.asm" INCLUDE "home/flag.asm"
Function2ebb:: ; 2ebb Function2ebb:: ; 2ebb

View File

@ -98,4 +98,8 @@ SafeUpdateSprites:: ; 2e31
pop af pop af
ld [hOAMUpdate], a ld [hOAMUpdate], a
ret ret
; 2e4e
; XXX
scf
ret
; 2e50