diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-05-15 16:59:55 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-15 18:59:55 -0500 |
commit | f402e46cd3c8b7236673d6edbae77903a7cc0618 (patch) | |
tree | 37a19f3ab35a73c29d4d6da565741beaf7bb547f /src/main.c | |
parent | f65dee5a143bd543c74c010d7252eb76893ee243 (diff) |
Sese's April/May Dump (#37)
* splitting lots of pokemon square and labeling lots of other things
* actually commit this stuff
* more moving data and things
* more screen work
* split out some pokemon dungeon data
* lots of data work
* push more data work
* split kecleon, decomp another kanghaskhan func, and try to doc UpdateBGControl more
* lots of item work
* label more item things
* subtype -> category and doc types/category
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -53,7 +53,7 @@ extern void Hang(void); extern void VBlank_CB(void); extern void nullsub_17(void); -extern void sub_800BD08(void); // music initializer +extern void InitMusic(void); // music initializer extern void sub_800D6AC(void); extern void sub_800D7D0(void); @@ -135,9 +135,9 @@ void sub_800B540(void) } nullsub_17(); - sub_800BD08(); // initialize music and stop DMAs + InitMusic(); // initialize music and stop DMAs - while(REG_VCOUNT <= 159){} + while(REG_VCOUNT < 160){} REG_IE ^= INTR_FLAG_TIMER3 | INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT; // 0x45 @@ -156,7 +156,7 @@ void sub_800B540(void) gInterruptsEnabled = 1; EnableInterrupts(); - while(REG_VCOUNT <= 159){} + while(REG_VCOUNT < 160){} } bool8 EnableInterrupts(void) |