mirror of https://github.com/pret/pokecrystal.git
Label map trigger functions in home.asm.
This commit is contained in:
parent
60e19487a7
commit
7ab8f76117
|
@ -1884,7 +1884,7 @@ Script_checkmaptriggers: ; 0x975d1
|
|||
ld b, a
|
||||
call GetScriptByte
|
||||
ld c, a
|
||||
call Function2147
|
||||
call GetMapTrigger
|
||||
ld a, d
|
||||
or e
|
||||
jr z, .asm_975e5 ; 0x975de $5
|
||||
|
@ -1923,7 +1923,7 @@ Script_domaptrigger: ; 0x975f5
|
|||
; fallthrough
|
||||
|
||||
Unknown_975fd: ; 0x975fd
|
||||
call Function2147
|
||||
call GetMapTrigger
|
||||
ld a, d
|
||||
or e
|
||||
jr z, .asm_97608 ; 0x97602 $4
|
||||
|
|
10
home/map.asm
10
home/map.asm
|
@ -24,7 +24,7 @@ Function211b:: ; 211b
|
|||
ret
|
||||
; 212a
|
||||
|
||||
Function212a:: ; 212a
|
||||
GetCurrentMapTrigger:: ; 212a
|
||||
ld a, [MapGroup]
|
||||
ld b, a
|
||||
ld a, [MapNumber]
|
||||
|
@ -32,7 +32,7 @@ Function212a:: ; 212a
|
|||
xor a
|
||||
ld [$dbf7], a
|
||||
ld [$dbf8], a
|
||||
call Function2147
|
||||
call GetMapTrigger
|
||||
ret c
|
||||
ld a, e
|
||||
ld [$dbf7], a
|
||||
|
@ -42,14 +42,14 @@ Function212a:: ; 212a
|
|||
ret
|
||||
; 2147
|
||||
|
||||
Function2147:: ; 2147
|
||||
GetMapTrigger:: ; 2147
|
||||
push bc
|
||||
ld a, [hROMBank]
|
||||
push af
|
||||
ld a, BANK(Unknown_4d01e)
|
||||
ld a, BANK(MapTriggers)
|
||||
rst Bankswitch
|
||||
|
||||
ld hl, Unknown_4d01e
|
||||
ld hl, MapTriggers
|
||||
.asm_2151
|
||||
push hl
|
||||
ld a, [hli]
|
||||
|
|
6
main.asm
6
main.asm
|
@ -53815,7 +53815,7 @@ Function4cffe:: ; 4cffe
|
|||
ret
|
||||
; 4d01e
|
||||
|
||||
Unknown_4d01e:: ; 4d01e
|
||||
MapTriggers:: ; 4d01e
|
||||
; Map triggers
|
||||
|
||||
trigger_def: MACRO
|
||||
|
@ -92098,7 +92098,7 @@ Function1045b0: ; 1045b0
|
|||
call Function210f
|
||||
call Function2e50
|
||||
call Function2e5d
|
||||
call Function212a
|
||||
call GetCurrentMapTrigger
|
||||
call Function2e56
|
||||
ld a, $5
|
||||
call Function263b
|
||||
|
@ -98752,7 +98752,7 @@ Function11b7e5: ; 11b7e5
|
|||
ld b, a
|
||||
ld a, [MapNumber]
|
||||
ld c, a
|
||||
call Function2147
|
||||
call GetMapTrigger
|
||||
ld a, d
|
||||
or e
|
||||
jr z, .asm_11b872
|
||||
|
|
Loading…
Reference in New Issue