summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Add-a-new-Pack-pocket.md8
-rw-r--r--Add-a-new-Unown-form.md2
-rw-r--r--Add-a-new-radio-channel.md4
-rw-r--r--Code-cleanup.md1
4 files changed, 7 insertions, 8 deletions
diff --git a/Add-a-new-Pack-pocket.md b/Add-a-new-Pack-pocket.md
index 5ccef4a..f57b1d5 100644
--- a/Add-a-new-Pack-pocket.md
+++ b/Add-a-new-Pack-pocket.md
@@ -442,7 +442,7 @@ Here's the first jumptable corresponding to those constants. It's the "core" jum
.InitBallsPocket:
ld a, BALL_POCKET
- ld [wCurrPocket], a
+ ld [wCurPocket], a
call ClearPocketList
call DrawPocketName
call WaitBGMap_DrawPackGFX
@@ -471,7 +471,7 @@ Here's the first jumptable corresponding to those constants. It's the "core" jum
+
+.InitBerryPocket:
+ ld a, BERRY_POCKET
-+ ld [wCurrPocket], a
++ ld [wCurPocket], a
+ call ClearPocketList
+ call DrawPocketName
+ call WaitBGMap_DrawPackGFX
@@ -542,7 +542,7 @@ This is another jumptable, but for using the Pack during battle. Again, we add p
.InitBallsPocket:
ld a, BALL_POCKET
- ld [wCurrPocket], a
+ ld [wCurPocket], a
call ClearPocketList
call DrawPocketName
call WaitBGMap_DrawPackGFX
@@ -571,7 +571,7 @@ This is another jumptable, but for using the Pack during battle. Again, we add p
+
+.InitBerryPocket:
+ ld a, BERRY_POCKET
-+ ld [wCurrPocket], a
++ ld [wCurPocket], a
+ call ClearPocketList
+ call DrawPocketName
+ call WaitBGMap_DrawPackGFX
diff --git a/Add-a-new-Unown-form.md b/Add-a-new-Unown-form.md
index 2a52aed..77ab899 100644
--- a/Add-a-new-Unown-form.md
+++ b/Add-a-new-Unown-form.md
@@ -379,7 +379,7 @@ Edit [engine/pokedex/pokedex.asm](../blob/master/engine/pokedex/pokedex.asm):
```diff
Pokedex_UnownModePlaceCursor:
- ld a, [wDexCurrentUnownIndex]
+ ld a, [wDexCurUnownIndex]
- ld c, $5a ; diamond cursor
+ ld c, $5c ; diamond cursor
diff --git a/Add-a-new-radio-channel.md b/Add-a-new-radio-channel.md
index 557e329..805b7a1 100644
--- a/Add-a-new-radio-channel.md
+++ b/Add-a-new-radio-channel.md
@@ -117,7 +117,7 @@ Continue to edit [engine/pokegear/pokegear.asm](../blob/master/engine/pokegear/p
```diff
LoadStation_UnownRadio:
ld a, UNOWN_RADIO
- ld [wCurrentRadioLine], a
+ ld [wCurRadioLine], a
xor a
ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow)
@@ -128,7 +128,7 @@ Continue to edit [engine/pokegear/pokegear.asm](../blob/master/engine/pokegear/p
+
+LoadStation_NationalPark:
+ ld a, NATIONAL_PARK_RADIO
-+ ld [wCurrentRadioLine], a
++ ld [wCurRadioLine], a
+ xor a
+ ld [wNumRadioLinesPrinted], a
+ ld a, BANK(PlayRadioShow)
diff --git a/Code-cleanup.md b/Code-cleanup.md
index 8162347..aa457a3 100644
--- a/Code-cleanup.md
+++ b/Code-cleanup.md
@@ -51,7 +51,6 @@ The convention that should be used is as follows:
### WRAM label style
-- `Curr` -> `Cur`
- `wMapObjects` and friends to be re-formatted to `wObjectEvents`
- `wObjectStructs` and friends to be re-formatted to `wMapObjects`
- Removal of struct macros which include only a partial label definition (e.g. `wNorthMapConnection:: map_connection_struct wNorth`)