diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/engine_flags.asm | 10 | ||||
| -rw-r--r-- | engine/pokedex.asm | 2 | ||||
| -rw-r--r-- | engine/scripting.asm | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm index 0d4c27e51..414604661 100644 --- a/engine/engine_flags.asm +++ b/engine/engine_flags.asm @@ -3,11 +3,11 @@ ; location, bit ; pokegear - dwb wd957, %00000010 ; radio card ; $0 - dwb wd957, %00000001 ; map card - dwb wd957, %00000100 ; phone card - dwb wd957, %00001000 ; expn card - dwb wd957, %10000000 ; on/off + dwb wPokegearFlags, %00000010 ; radio card ; $0 + dwb wPokegearFlags, %00000001 ; map card + dwb wPokegearFlags, %00000100 ; phone card + dwb wPokegearFlags, %00001000 ; expn card + dwb wPokegearFlags, %10000000 ; on/off ; wDaycareMan, %10000000 ; daycare 1 on dwb wDaycareMan, %01000000 ; monster 1 and 2 are compatible diff --git a/engine/pokedex.asm b/engine/pokedex.asm index dcbc1832e..8ca68ce30 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -1778,7 +1778,7 @@ Function40f08: ; 40f08 (10:4f08) hlcoord 0, 12 ld bc, $412 call Function40ad5 - ld de, $4f32 + ld de, String_40f32 hlcoord 1, 14 call PlaceString ld a, $1 diff --git a/engine/scripting.asm b/engine/scripting.asm index 3835f458d..6999d624d 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -472,7 +472,7 @@ Script_loadmenudata: ; 0x96efa ld l, a call GetScriptByte ld h, a - ld de, $1d35 + ld de, LoadMenuDataHeader ld a, [ScriptBank] call Function26b7 call Function1ad2 @@ -1465,9 +1465,9 @@ EarthquakeMovementEnd Script_loadpikachudata: ; 0x973f0 ; script command 0x5a - ld a, $19 + ld a, PIKACHU ld [wd22e], a - ld a, $5 + ld a, 5 ld [CurPartyLevel], a ret ; 0x973fb @@ -2214,7 +2214,7 @@ Script_trainerclassname: ; 0x9772b ; id (SingleByteParam) ; memory (SingleByteParam) - ld a, $7 + ld a, TRAINER_NAME ld [wcf61], a jr Unknown_9771c ; 0x97730 $ea ; 0x97732 |