Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent pointer labels in WRAM

This commit is contained in:
Remy Oukaour 2017-12-09 22:24:43 -05:00
parent e29a1f8f94
commit 59ee673775
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engine/phone.asm
View File

@ -381,11 +381,11 @@ Function90199: ; 90199 (24:4199)
.DoPhoneCall: .DoPhoneCall:
ld a, b ld a, b
ld [wd002], a ld [PhoneScriptBank], a
ld a, l ld a, l
ld [wd003], a ld [PhoneCaller], a
ld a, h ld a, h
ld [wd004], a ld [PhoneCaller + 1], a
ld b, BANK(UnknownScript_0x90205) ld b, BANK(UnknownScript_0x90205)
ld de, UnknownScript_0x90205 ld de, UnknownScript_0x90205
call ExecuteCallbackScript call ExecuteCallbackScript
@ -495,9 +495,9 @@ PhoneCall:: ; 9029a
ld a, b ld a, b
ld [PhoneScriptBank], a ld [PhoneScriptBank], a
ld a, e ld a, e
ld [PhoneCallerLo], a ld [PhoneCaller], a
ld a, d ld a, d
ld [PhoneCallerHi], a ld [PhoneCaller + 1], a
call Phone_FirstOfTwoRings call Phone_FirstOfTwoRings
call Phone_FirstOfTwoRings call Phone_FirstOfTwoRings
callba TrainerRankings_PhoneCalls callba TrainerRankings_PhoneCalls
@ -523,9 +523,9 @@ Phone_CallerTextboxWithName2: ; 902c9
inc hl inc hl
ld a, [PhoneScriptBank] ld a, [PhoneScriptBank]
ld b, a ld b, a
ld a, [PhoneCallerLo] ld a, [PhoneCaller]
ld e, a ld e, a
ld a, [PhoneCallerHi] ld a, [PhoneCaller + 1]
ld d, a ld d, a
call FarPlaceString call FarPlaceString
ret ret

10
event/elevator.asm
View File

@ -21,9 +21,9 @@ Elevator:: ; 1342d
ld a, b ld a, b
ld [wElevatorPointerBank], a ld [wElevatorPointerBank], a
ld a, e ld a, e
ld [wElevatorPointerLo], a ld [wElevatorPointer], a
ld a, d ld a, d
ld [wElevatorPointerHi], a ld [wElevatorPointer + 1], a
call .LoadFloors call .LoadFloors
ret ret
; 1345a ; 1345a
@ -31,7 +31,7 @@ Elevator:: ; 1342d
.LoadFloors: ; 1345a .LoadFloors: ; 1345a
ld de, CurElevator ld de, CurElevator
ld bc, 4 ld bc, 4
ld hl, wElevatorPointerLo ld hl, wElevatorPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -52,7 +52,7 @@ Elevator:: ; 1342d
; 1347d ; 1347d
.FindCurrentFloor: ; 1347d .FindCurrentFloor: ; 1347d
ld hl, wElevatorPointerLo ld hl, wElevatorPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -102,7 +102,7 @@ Elevator:: ; 1342d
Elevator_GoToFloor: ; 134c0 Elevator_GoToFloor: ; 134c0
push af push af
ld hl, wElevatorPointerLo ld hl, wElevatorPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a

9
wram.asm
View File

@ -1565,8 +1565,7 @@ ENDU
NEXTU ; d002 NEXTU ; d002
; phone call data ; phone call data
PhoneScriptBank:: db PhoneScriptBank:: db
PhoneCallerLo:: db PhoneCaller:: dw
PhoneCallerHi:: db
NEXTU ; d002 NEXTU ; d002
; radio data ; radio data
@ -1685,8 +1684,7 @@ CurFruit:: db
NEXTU ; d03e NEXTU ; d03e
; elevator data ; elevator data
wElevatorPointerBank:: db wElevatorPointerBank:: db
wElevatorPointerLo:: db wElevatorPointer:: dw
wElevatorPointerHi:: db
wElevatorOriginFloor:: db wElevatorOriginFloor:: db
NEXTU ; d03e NEXTU ; d03e
@ -1716,8 +1714,7 @@ NEXTU ; d03e
; trainer data ; trainer data
ds 3 ds 3
wTempTrainerHeader:: wTempTrainerHeader::
wTempTrainerEventFlagLo:: db wTempTrainerEventFlag:: dw
wTempTrainerEventFlagHi:: db
wTempTrainerClass:: db wTempTrainerClass:: db
wTempTrainerID:: db wTempTrainerID:: db
wSeenTextPointer:: dw wSeenTextPointer:: dw