diff options
| author | Andrew Martinek <andrewrmartinek@gmail.com> | 2019-10-06 23:00:27 -0400 |
|---|---|---|
| committer | Andrew Martinek <andrewrmartinek@gmail.com> | 2019-10-06 23:00:27 -0400 |
| commit | a44f17b9a15cf1a572d5e8056a69c368265729f2 (patch) | |
| tree | e8137a71e6c6fb2cbb56d3d58be084f3958ba39e /src/wram.asm | |
| parent | fda59356c20813bb57d59de8d9b2b100f0fe275d (diff) | |
Fixed a few macros that were giving weird code. Updated tcgdisasm
Diffstat (limited to 'src/wram.asm')
| -rw-r--r-- | src/wram.asm | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/wram.asm b/src/wram.asm index 0259c7a..fd24dbd 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -1819,11 +1819,9 @@ wd0c4:: ; d0c4 wd0c5:: ; d0c5 ds $1 -wd0c6:: ; d0c6 - ds $1 - -wd0c7:: ; d0c7 - ds $1 +; used to store the location of an overworld sequence, which is jumped to later +wNextOWSequence:: ; d0c6 + ds $2 wCurrentNPCNameTx:: ; d0c8 ds $2 @@ -1998,7 +1996,7 @@ wd332:: ; d332 wd333:: ; d333 ds $1 -wd334:: ; d334 +wPlayerDirection:: ; d334 ds $1 wd335:: ; d335 @@ -2063,11 +2061,17 @@ wd348:: ; d348 wd349:: ; d349 ds $1 -; some kind of array with 8 sets of c data -wd34a:: ; d34a - ds $60 +wLoadedNPCs:: ; d34a + loaded_npc_struct wLoadedNPC1 + loaded_npc_struct wLoadedNPC2 + loaded_npc_struct wLoadedNPC3 + loaded_npc_struct wLoadedNPC4 + loaded_npc_struct wLoadedNPC5 + loaded_npc_struct wLoadedNPC6 + loaded_npc_struct wLoadedNPC7 + loaded_npc_struct wLoadedNPC8 -wd3aa:: ; d3aa +wLoadedNPCTempIndex:: ; d3aa ds $1 wTempNPC:: ; d3ab |