Leahnaya/pokegold-spaceworld
1
0
Fork 0
mirror of https://github.com/pret/pokegold-spaceworld.git synced 2026-04-25 15:39:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

this is how you fix conflicts, right?

Browse Source
This commit is contained in:
2Tie 2018-06-18 22:53:06 -06:00
parent b44077ed31
commit 2f0b152e5a
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
constants/wram_constants.asm
View File

@ -7,6 +7,22 @@
const RIGHT ; 3
NUM_DIRECTIONS EQU const_value
; wMonType:: ; cb5a
const_def
const PARTYMON ; 0
const OTPARTYMON ; 1
const BOXMON ; 2
const TEMPMON ; 3
const WILDMON ; 4
; wPlayerState:: ; d95d
PLAYER_NORMAL EQU 0
PLAYER_BIKE EQU 1
PLAYER_SKATE EQU 2
PLAYER_SURF EQU 4
PLAYER_SURF_PIKA EQU 8
; wDebugFlags:: ; ce63
const_def
const DEBUG_BATTLE_F
const DEBUG_FIELD_F

16
data/predef_pointers.inc
View File

@ -16,14 +16,14 @@ PredefPointers:: ; 1:62d3
add_predef Function6713
add_predef Function66b1
add_predef DebugMenu
add_predef Functionce10
add_predef Functioncd6f
add_predef Functioncde3
add_predef Functioncde3_2 ; 8
add_predef Functioncde3_3
add_predef Functioncdf9
add_predef Functionce10_2
add_predef Functioncd33
add_predef GetItemAmount
add_predef HealParty
add_predef AddBCD
dba AddBCD ; 8
dba AddBCD
add_predef SubBCD
dba GetItemAmount
add_predef SmallFarFlagAction
GiveItemPredef::
dbw 3, GiveItem
add_predef Functionce3c

3
wram.asm
View File

@ -595,7 +595,8 @@ wDebugFlags:: db ; ce63
; | \-- debug field indicator
; \---- loaded/continued game
SECTION "Player And Mom Names", WRAM0[$CE67]
ds 3
wPlayerName:: ds 6 ; ce67
wMomsName:: ds 6 ; ce6d